The Unified and Autonomous Development Platform
feat: Upgrade various libraries to use jakarta namespace
Robin Shen9ae8e694f756
diff --git a/.trivyignore b/.trivyignoreindex 9799b723fd..4339ca5631 100644--- a/.trivyignore+++ b/.trivyignore@@ -1,9 +1,13 @@-CVE-2026-0603-CVE-2024-53299-CVE-2024-57699-CVE-2026-2332-CVE-2026-49268-CVE-2026-10050+# Hazelcast maintainers report that their shipped JSON paths do not use polymorphic+# typing with a configured type validator, required by CVE-2026-54512 and CVE-2026-54513.+# See https://github.com/hazelcast/hazelcast/issues/26597+# Reviewed Hazelcast 5.7.0 sources and packaged callers: no use of its shaded databind.+# OneDev's own ObjectMapper uses patched Jackson 2.22.2.+CVE-2026-54512+CVE-2026-54513-GHSA-72hv-8253-57qq+# Hazelcast 5.7.0 shades jackson-core 2.21.2 and 3.1.2; fixed in 2.21.4 and 3.1.4.+# Reviewed JSON paths use synchronous createParser calls (including jackson-jr);+# no callers of the affected non-blocking parsers were found in the packaged build.+# Reassess these exceptions when changing Hazelcast or its JSON usage.GHSA-r7wm-3cxj-wff9diff --git a/dev.sh b/dev.shindex ce2ec151d5..c137e2879b 100755--- a/dev.sh+++ b/dev.sh@@ -327,7 +327,8 @@ usage() {echoecho "Commands:"echo " run Build, start the dev server, and rebuild automatically when files change"- echo " stop Stop the running development server"+ echo " prod Build and start with Wicket production mode, without hot loading or watching"+ echo " stop Stop the server started by run or prod"echo " build Build with Maven when needed, otherwise compile changed files with ECJ"echo " rebuild Clean and build all modules while preserving the development sandbox"echo " test Run tests with Maven"@@ -340,7 +341,7 @@ usage() {is_command() {case "$1" in- build|rebuild|clean|install|test|package|run|stop) return 0 ;;+ build|rebuild|clean|install|test|package|run|prod|stop) return 0 ;;*) return 1 ;;esac}@@ -361,6 +362,7 @@ fimaven_commands=()maven_arguments=()run_requested=false+run_mode=runrun_arguments=()while [ "$#" -gt 0 ]; docommand=$1@@ -390,9 +392,10 @@ while [ "$#" -gt 0 ]; doflush_maven_commandsstop_server;;- run)+ run|prod)flush_maven_commandsrun_requested=true+ run_mode=$commandrun_arguments=("$@")break;;@@ -413,29 +416,40 @@ if running_server; thenecho "Development server is already running (PID $server_pid). Use ./dev.sh stop first." >&2exit 1fi-watch_reference=$(mktemp "${TMPDIR:-/tmp}/onedev-watch.XXXXXX")-touch "$watch_reference"-trap 'rm -f "$watch_reference"' EXIT+watch_reference=+watcher_pid=+if [ "$run_mode" = run ]; then+ watch_reference=$(mktemp "${TMPDIR:-/tmp}/onedev-watch.XXXXXX")+ touch "$watch_reference"+ trap 'rm -f "$watch_reference"' EXIT+fibuild_projectif [ -z "${classpath:-}" ]; thenbuild_classpathfi-hotswap_agent=$(ensure_artifact org.hotswapagent hotswap-agent "$HOTSWAP_AGENT_VERSION")--hotswap_options="-javaagent:$hotswap_agent=autoHotswap=true"-if java -XX:+AllowEnhancedClassRedefinition -version >/dev/null 2>&1; then- hotswap_options="-XX:+AllowEnhancedClassRedefinition $hotswap_options"+if [ "$run_mode" = prod ]; then+ java_options="-Dprod=true"+ echo "Production mode enabled. Hot loading and automatic rebuilding are disabled." >&2else- echo "Warning: this JVM only supports hot loading method-body changes." >&2- echo "Use a JetBrains Runtime with AllowEnhancedClassRedefinition for structural changes." >&2+ hotswap_agent=$(ensure_artifact org.hotswapagent hotswap-agent "$HOTSWAP_AGENT_VERSION")+ # Jackson's HotswapAgent hook calls hashCode before Wicket's ByteBuddy proxy is initialized.+ java_options="-javaagent:$hotswap_agent=autoHotswap=true,disablePlugin=JacksonPlugin"+ if java -XX:+AllowEnhancedClassRedefinition -version >/dev/null 2>&1; then+ java_options="-XX:+AllowEnhancedClassRedefinition $java_options"+ else+ echo "Warning: this JVM only supports hot loading method-body changes." >&2+ echo "Use a JetBrains Runtime with AllowEnhancedClassRedefinition for structural changes." >&2+ fi+ echo "HotswapAgent enabled. Watching source files for changes." >&2+ watch_and_build "$watch_reference" &+ watcher_pid=$!fi-echo "HotswapAgent enabled. Watching source files for changes." >&2-watch_and_build "$watch_reference" &-watcher_pid=$!cleanup_run() {- kill "$watcher_pid" 2>/dev/null || true+ if [ -n "$watcher_pid" ]; then+ kill "$watcher_pid" 2>/dev/null || true+ fiif [ -n "${java_pid:-}" ]; thenkill "$java_pid" 2>/dev/null || truewait "$java_pid" 2>/dev/null || true@@ -443,14 +457,18 @@ cleanup_run() {rm -f "$SERVER_PID_FILE"fifi- wait "$watcher_pid" 2>/dev/null || true- rm -f "$watch_reference"+ if [ -n "$watcher_pid" ]; then+ wait "$watcher_pid" 2>/dev/null || true+ fi+ if [ -n "$watch_reference" ]; then+ rm -f "$watch_reference"+ fi}trap cleanup_run EXITtrap 'exit 130' INTtrap 'exit 143' TERM-java $MAVEN_OPTS $hotswap_options "-Donedev.dev.root=$ROOT" -cp "$classpath" \+java $MAVEN_OPTS $java_options "-Donedev.dev.root=$ROOT" -cp "$classpath" \io.onedev.commons.bootstrap.Bootstrap "$@" <&0 &java_pid=$!echo "$java_pid" > "$SERVER_PID_FILE"diff --git a/doc/hibernate-customizations.md b/doc/hibernate-customizations.mdindex 75575647ce..62a7f4227c 100644--- a/doc/hibernate-customizations.md+++ b/doc/hibernate-customizations.md@@ -1,49 +1,46 @@# Why OneDev overrides Hibernate-OneDev overrides seven Hibernate classes in `server-core/src/main/java/org/hibernate`.+OneDev overrides eight Hibernate classes in `server-core/src/main/java/org/hibernate`.The reasons below were checked against Git history and the source jars for the-versions in `pom.xml`: Hibernate ORM 5.4.24.Final and Hibernate Validator 6.2.5.Final.+versions in `pom.xml`: Hibernate ORM 7.4.8.Final and Hibernate Validator 9.1.3.Final.+The [library override audit](library-customizations.md) also covers the Jakarta+web stack and the removal of the now-redundant Commons Lang proxy-cloning patch.| Customized class | Why OneDev needs it | Regression coverage || --- | --- | --- |-| `cache.spi.support.SimpleTimestamper` | Replace the clock-based busy loop with an atomic counter to prevent excessive CPU usage during cache timestamp generation. Introduced in `8de9b24808` for #711. | `SimpleTimestamperTest`: a counter ahead of the wall clock still advances; concurrent cache users get unique, increasing timestamps. The clock regression uses an isolated counter, not the machine clock. |+| `cache.spi.support.SimpleTimestamper` | Replace the clock-based busy loop with an atomic maximum of wall-clock time and the previous counter plus one to prevent excessive CPU usage during cache timestamp generation. Introduced in `8de9b24808` for #711. | `SimpleTimestamperTest`: a counter ahead of the wall clock still advances; concurrent cache users get unique, increasing timestamps. The clock regression uses an isolated counter, not the machine clock. || `proxy.pojo.BasicLazyInitializer` | Apply `AbstractEntity` ID equality and hashing without loading the entity. Added with the large-user-count performance improvements in `a32c76862a` (#875). Collection membership checks should not fetch every referenced user. | `BasicLazyInitializerTest`: detached references with equal/different IDs, loaded entities, null/unrelated values, unsaved identity semantics, and ordinary method delegation. Calls the interceptor directly because `AbstractEntity`'s final methods can bypass interception on real proxies. || `validator.internal.metadata.aggregated.MetaDataBuilder` | Let editable subclasses replace constraint attributes instead of combining parent and child annotations of the same type. Introduced in `de278c1554`. | `HibernateValidationInheritanceTest`: metadata contains the child's `@Size`, and value validation uses its limit and message. || `validator.internal.engine.MethodValidationConfiguration` | Permit `@Valid` on both overridden and overriding getters, consistent with OneDev's getter replacement semantics. Added in `e3b23bd5ba` for Kaniko build-spec validation, OD-2564. | `HibernateValidationInheritanceTest`: redeclared object and collection cascades build metadata successfully and still report invalid children. || `validator.internal.engine.ValidatorImpl` | Respect removed/overridden getter constraints and cascades; skip fields and nested beans hidden by `@DependsOn` or `@ShowCondition`; validate properties and nested beans before `@ClassValidating`, and suppress class validation after failures. The changes span `de278c1554`, `8ac7615738`, `77cf1da58c`, and `e3b23bd5ba`. Display-name lookup fixes hidden parameters (OD-2560, `0defe8b62a`); repeated dependencies support multiple visibility conditions (OD-2884, `91457af05e`). | `HibernateValidationInheritanceTest`, `HibernateValidationVisibilityTest`, and `HibernateValidationOrderTest`: inherited/replaced/removed annotations, visible and hidden scalar/object/list properties, repeated/inverse dependencies, display-name lookup, edit-context cleanup, and successful/failing recursive validation through default groups, explicit groups, and sequences. || `validator.internal.engine.constraintvalidation.ConstraintTree` | Validate the shape of interpolative settings before runtime variables are available: substitute `@Interpolative.exampleVar` and unescape `@@` before other validators run. Apply this to strings and collections, while leaving syntax errors to `InterpolativeValidator`. Introduced with #222 in `0dd7555781`; the real create-tag scenario was added in #1242 (`52dca1aab9`). | `HibernateValidationInterpolationTest`: real `CreateTagStep` names, escaped at signs, custom example values, invalid literals, malformed interpolation, null values, and collections. Assertions also ensure validation does not modify the bean or the reported invalid value. || `validator.internal.metadata.core.MetaConstraint` | Expose the active constraint's getter metadata to `ConstraintTree` with a thread-local stack. Added alongside interpolation in `0dd7555781`; nested validation must restore the previous constraint and exceptions must clean it up. | `HibernateValidationInterpolationTest`: interpolation through the public validator API, nested validation, exception cleanup, and isolation between concurrent validation threads. |+| `validator.internal.engine.valuecontext.BeanValueContext` | Share processed-constraint bookkeeping within one validation context tree. Hibernate 9 otherwise repeats cascaded constraints across group sequences when OneDev separates property, cascade, and class validation. The map is confined to one validation call and is discarded with its context. | `HibernateValidationOrderTest`: nested class validators run once across a group sequence; existing concurrent and nested validation tests remain in place. |The validation tests are in `server-core/src/test/java/io/onedev/server/validation`.They use a real`ValidatorFactory` and small beans so they need neither a running OneDev servernor a database. These behaviors intentionally differ from standard Bean Validation.-## Existing behavior preserved by the tests+`HibernateValidationContainerCascadeTest` also covers cascades declared on getter+return type arguments, including nested containers and inherited/redeclared/removed+cascades. The override check in `ValidatorImpl` recognizes these annotations so+`BranchProtection#getFileProtections()` can use `List<@Valid FileProtection>` without+losing property or class validation of its entries.-The tests also record two distinctions in the existing `ValidatorImpl` behavior:+## Consistent validation across entry points-- A child annotation replaces the parent in property metadata, `validateValue`,- and explicit-group validation, but default-group bean/property validation still- checks the parent's attributes when the child redeclares the same annotation type.- Parent getter annotations whose types are absent from the overriding getter- are skipped.-- Default-group validation bypasses the class-validation failure guard: class- validators still run after property or nested validation failures. Explicit- non-default groups suppress them; sequences stop after a failing group.--These cases are covered in the inheritance and ordering tests. No production-Hibernate classes are changed.--## Running the tests+The inheritance and ordering tests enforce these rules in `ValidatorImpl`:-From the repository root:--```sh-./dev.sh test -pl server-core '-Dtest=SimpleTimestamperTest,BasicLazyInitializerTest,HibernateValidation*Test'-```--Each customization was also disabled individually in a temporary classpath to-verify that this suite detects its removal. For `MetaConstraint`, the accessor API-was retained while disabling push/pop, so the check exercises context propagation-rather than a missing-method error. The other six checks used the upstream class.+- A child annotation replaces the parent in property metadata, `validateValue`,+ and bean/property validation, including the default group. Overriding a getter+ removes its parent's getter constraints; annotations redeclared on the child+ use the child's attributes. Getters inherited without an override retain their+ constraints.+- `@ClassValidating` runs after properties and nested beans and is skipped when+ earlier validation has reported a violation, for both default and explicit+ non-default groups. Sequences stop after a failing group.++The tests include ordinary validation without explicit groups, as well as explicit+groups and group sequences. These rules replace the previous default-group behavior+that also checked overridden parent attributes and ran class validators after failures.diff --git a/doc/wicket-customizations.md b/doc/wicket-customizations.mdindex 9d65a0d46b..072872cee0 100644--- a/doc/wicket-customizations.md+++ b/doc/wicket-customizations.md@@ -1,175 +1,174 @@-# Why OneDev overrides Wicket 7.18.0+# Why OneDev overrides Wicket 10.11.0-The files in `server-core/src/main/java/org/apache/wicket` shadow classes and-resources from the Wicket dependencies. Replacing them with a newer upstream-copy can silently remove application behavior even when compilation succeeds.+The 17 Java classes and two resources under+`server-core/src/main/java/org/apache/wicket` shadow the Wicket dependencies.+They were compared with the 10.11.0 release source jars, and their application+patches were checked against the former 7.18.0 overrides and Git history.+Formatting, import ordering, and warning suppressions are not customizations.-This audit compares all 22 tracked files in that directory with the **7.18.0-release sources**, the version declared by `wicket.version` in the root POM.-Formatting, import ordering, warning suppressions, wording changes, and removed-TODOs are not behavioral customizations. Historical changes already present in-7.18.0 (for example, form parameter selection by HTTP method) are not counted-as OneDev patches.+Baselines are the `wicket-core`, `wicket-extensions`, `wicket-request`,+`wicket-util`, `wicket-native-websocket-core`, and `wicket-guice` source jars in+[Maven Central](https://repo.maven.apache.org/maven2/org/apache/wicket/), at+`<artifact>/10.11.0/<artifact>-10.11.0-sources.jar`.+Paths below are relative to `server-core/src/main/java/org/apache/wicket`.-## Comparison baseline+## Component context and forms-The baseline is the Apache source jars published in-[Maven Central](https://repo.maven.apache.org/maven2/org/apache/wicket/).-For each artifact below, the source archive is-`<artifact>/7.18.0/<artifact>-7.18.0-sources.jar` relative to that URL.-These SHA-1 values identify the archives used for comparison:--| Artifact | Source jar SHA-1 |+| Override | Retained behavior || --- | --- |-| wicket-core | `79e376fd58bb30c064a9a96f18b9191b9e12dd80` |-| wicket-extensions | `c6af7ed32da7f2d8cabf0b69863568a2d360a515` |-| wicket-request | `d25defd74f28a7ebc156c82988aa1c8179226c1a` |-| wicket-util | `1fbe4064b18f75debb6b879b985eea1b961dff6d` |-| wicket-native-websocket-core | `07d34c7ae08f1cfe88d7e954e252be0d6f297e68` |-| wicket-guice | `2733ad290e2a48b761eba660dddcabdb8a118d05` |--All paths below are relative to `server-core/src/main/java/org/apache/wicket`.-Except for the JavaScript resource noted below, the archive entry has the same-`org/apache/wicket/...` path. To repeat an individual comparison, for example:--```sh-unzip -p ~/.m2/repository/org/apache/wicket/wicket-core/7.18.0/wicket-core-7.18.0-sources.jar \- org/apache/wicket/markup/html/form/FormComponent.java > /tmp/FormComponent.upstream.java-diff -u /tmp/FormComponent.upstream.java \- server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java-```--Reasons identified as **inferred** are supported by current callers or the-effect of the diff; available commit messages do not establish a more specific-original incident. Commit IDs below refer to this repository's history.+| `Component.java` | Push/pop OneDev's `HierarchicalContext` around initialization/re-addition, before-render, render/after-render, and header rendering. Contextual choices, defaults, and visibility resolve against the current editor, with cleanup on exceptions. |+| `core/request/handler/ListenerRequestHandler.java` | Scope both component and behavior callbacks, including authorization, to the originating component. This replaces the removed Wicket 7 `RequestListenerInterface` override. |+| `extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java` | Scope the separately scheduled suggestions response to its owning component. The listener's context has already ended at that point. |+| `markup/html/form/FormComponent.java` | Initialize converted input from the model, retain it through detach and serialization, and include errors on ordinary child components when determining validity. Dependent editors can read uncommitted values, and composite editors fail validation when their labels/containers have errors. |-## Context for configurable editors--OneDev's `HierarchicalContext` lets code find the current editor, its enclosing-bean, project, and other component ancestors. In upstream Wicket these callback-boundaries do not establish this OneDev context.--| Override | Difference and motivation |-| --- | --- |-| `Component.java` | Pushes a `ComponentHierarchical(this)` context around initialization/re-addition, before-render, render (including after-render cleanup), and header rendering. Always pops it in `finally`. This makes contextual choices, defaults, and visibility logic resolve against the component being processed and prevents a child callback from leaving its context active for a sibling. |-| `RequestListenerInterface.java` | Applies the same scope to both component and behavior callbacks, including their authorization checks. Click/Ajax processing needs the originating editor's context just as rendering does; cleanup must also happen on rejection or failure. |-| `extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java` | Establishes the owning component's context while the separately scheduled response obtains and renders suggestions. The listener's context has already ended by this stage. |--The editor rationale is inferred from `HierarchicalContext`, `ComponentHierarchical`,-and `web/editable/BeanEditor#getInputValue` and visibility evaluation. Commit-`cfc94c05d0` records a context refactoring, not the original reason for every hook.`ComponentContextCustomizationTest` covers initialization/ancestor lookup,-listener failure, behavior authorization, and restoration of an enclosing context.-Before-render, render/head, and autocomplete response integration remain documented-contracts rather than separately exercised by these tests.--## Form values and validation--`markup/html/form/FormComponent.java` changes three related contracts:--* `convertedInput` starts with the supplied model value. Upstream leaves it null- until conversion occurs.-* It is no longer transient or cleared during detach, so an uncommitted converted- value survives subsequent requests and page serialization independently of the- model value.-* `isValid()` visits ordinary child components as well as form components.- Feedback errors placed on a label/container inside a composite editor therefore- invalidate the editor. Warnings still do not invalidate it.--The retained-value motivation is inferred from dependent editor logic such as-`BeanEditor#getInputValue` and list editors reading child `getConvertedInput()`-values before the whole form is committed. Initializing once does not imply that-every later model change automatically synchronizes converted input. The broader-validation reason is explicitly stated in the source comment about errors on-ordinary components inside `FormComponentPanel`.--`FormComponentCustomizationTest` protects initial values, detach/serialization-without committing the model, and nested feedback validity.+listener failure, authorization, and restoration of enclosing context.+`FormComponentCustomizationTest` covers initial and uncommitted values,+serialization, and nested feedback. Rendering/head and autocomplete callback+scopes remain source-audited contracts, rather than separate integration tests.## Dynamic classes and dependency injection-| Override | Difference and motivation |+| Override | Retained behavior || --- | --- |-| `application/AbstractClassResolver.java` | Resolves both generated issue-field bean names through `FieldUtils.getFieldBeanClass`, and generated parameter beans through `ParamUtils.loadBeanClass`, before consulting Wicket's normal weak class cache/classloaders. These classes come from runtime configuration rather than fixed classpath entries. Inferred motivation: restore generated editor state and select the current generated class instead of a cached obsolete definition. Ordinary classes still use upstream resolution. |-| `guice/GuiceProxyTargetLocator.java` | Obtains the injector from `AppLoader.injector` instead of `Application.get().getMetaData(GuiceInjectorHolder.INJECTOR_KEY)`. Inferred motivation: lazy injected proxies can resolve OneDev services when no Wicket application is bound to the thread. `WebApplication` also installs its component injector with this same application-wide injector. Added in `59315b3f81`, whose broad “Usability improvements” message does not establish a specific failing background operation. |+| `application/AbstractClassResolver.java` | Resolve generated issue-field and parameter beans through `FieldUtils`/`ParamUtils` before Wicket's weak class cache. Generated classes follow the current configuration instead of an obsolete cached definition. |+| `guice/GuiceProxyTargetLocator.java` | Resolve lazy injections using `AppLoader.injector`, including when no Wicket application is bound to the thread. |-These contracts need OneDev's generated configuration/injector lifecycle to test-end to end; they are documented here rather than covered by mocks that merely-repeat the added calls.+These behaviors still differ from Wicket 10 and depend on OneDev's runtime class+and injector lifecycle. The rationale is inferred from the callers; the available+history does not establish a separate original incident for each hook.-## Page storage and request performance+## Page storage and request processing-| Override | Difference and motivation |+| Override | Retained behavior || --- | --- |-| `page/RequestAdapter.java` | Commits all touched pages without calling `isPageStateless()`. The source explicitly explains that inspecting a partially initialized page containing `wicket:enclosure` caused errors when anonymous access redirected to sign-in. The tradeoff is storing touched pages that upstream would filter out as stateless. `RequestAdapterCustomizationTest` verifies storage without invoking that unsafe inspection. |-| `page/PageStoreManager.java` | Removes the session-local page list and its custom serialization/deserialization. `SessionEntry.getPage()` goes directly to `IPageStore`; `setSessionCache()` remains as a no-op. Inferred motivation: avoid retaining/serializing a second copy of page state in the HTTP session and let the page store own it. This older change is already present at the earliest available import; a specific clustering/performance incident is not established. Separately, touched-page storage suppresses only `IllegalStateException` messages containing `Response is committed`, logging at debug. Commits `740f4ba5be` and `70052bc21c` document the case of trying to create a session after response commitment. Other such exceptions still propagate. |-| `request/cycle/RequestCycle.java` | Caches rendered resource and bookmarkable-page URLs in each request cycle, keyed by reference/page class and parameters. Commit `017e7e7e8d` ties caching to page-loading performance (#429); `5f3d6616a4` records support without a session. The current implementation is request-scoped even when a session exists. Also removes the extra development-mode exception banner and logs nested Jetty `EofException` at debug when error-response processing itself fails, reducing duplicate/disconnect noise. |--`RequestCycleCustomizationTest` checks cache reuse, different parameters/resources,-and a fresh cache in another request. The cache retains the supplied mutable-`PageParameters`, so these tests do not promise correctness if a caller mutates-parameters or changes the URL renderer's base after caching a URL. Page-store-lifecycle and exception logging are documented, not covered by these tests.--## URLs, login, and browser behavior--| Override | Difference and motivation |+| `pageStore/RequestPageStore.java` | Store touched pages without inspecting `isPageStateless()`, which can evaluate an uninitialized enclosure during a login redirect. Suppress only `IllegalStateException` messages containing `Response is committed` during session binding/page storage, with debug logging. Clear pending pages after this failure so detach cannot retry session creation. Other failures propagate. These behaviors replace the former `RequestAdapter` and part of `PageStoreManager`. |+| `request/cycle/RequestCycle.java` | Cache rendered resource and bookmarkable-page URLs within each request (#429), suppress the extra development-mode exception banner, and log nested Jetty EOF failures at debug when error-response handling fails. |++The old `PageStoreManager` session-cache customization is implemented through+OneDev's `web/page/store/PageManagerProvider`: it omits Wicket's session cache of+live pages and writes serialized pages synchronously to disk, loading them on+demand. No serialized-page cache or asynchronous write queue is retained in heap;+page objects and serialization buffers still exist while processing requests.+Requests wait for disk writes to complete. This uses Wicket 10's store extension+points instead of copying its old page manager.+`RequestAdapterCustomizationTest` covers both lifecycle phases,+committed responses, unexpected exceptions (including null messages), and avoiding+statelessness checks.++The Chromium comparison in `e2e-test/tests/login-redirect.spec.js` also reproduces+the enclosure problem with real anonymous requests to system settings. Restoring+Wicket 10.11.0's original `isPageStateless` helper produces+`Could not find child with id: ingressUrl in the wicket:enclosure` in both `end()`+and `detach()`. Wicket catches these exceptions and assumes the page is stateful,+so login can still complete. OneDev's default Wicket log level (`ERROR`) hides+the warnings. The override prevents the exceptions; the optional+`E2E_SERVER_LOG` assertion detects them with the page-store logger at `WARN`.+See `e2e-test/README.md` for the command and logging setup.++`RequestCycleCustomizationTest` covers cache reuse and request/parameter isolation.+The URL caches retain mutable `PageParameters`; their existing contract does not+promise correctness if callers mutate parameters or the renderer's base URL after+caching. Exception logging is source-audited, not asserted by those tests.++## URLs and login++| Override | Retained behavior || --- | --- |-| `core/request/mapper/BasicResourceReferenceMapper.java` | Emits the resource scope class name in lowercase and remembers the original name in a static reverse map. Decoding uses that map, falling back to the supplied name. The explicit reason in both code and `d642b2383f` is that some agents lowercase URLs. This only normalizes the class-name segment; it does not make every resource path case-insensitive. Mapping depends on the URL having been generated in the process, and lowercasing uses the default locale. |-| `request/http/handler/RedirectRequestHandler.java` | Sends every target through `UrlRenderer.renderRelativeUrl(Url.parse(...))`, replacing upstream's special handling for leading `/`. Inferred motivation: render redirects relative to the current request, avoiding dependence on servlet-container conversion to an absolute backend URL. The original incident is not established by the available history. |-| `RestartResponseAtInterceptPageException.java` | Clears host, port, and protocol on the saved original URL, so login does not retain the backend origin exposed by a reverse proxy (#137, `5621ed17eb`). Before redirecting back, removes query parameter names containing `.IBehaviorListener.` so an expired Ajax callback does not become the post-login destination (#1301, `ce535c2842`). Other destination parameters are retained. |-| `protocol/http/servlet/ServletWebResponse.java` | For normal non-Ajax browser redirects, writes a script that saves the current fragment in `sessionStorage`, restores it for the matching destination when that destination has no explicit fragment, and navigates with `location.replace`. URL fragments never reach the server; this preserves notification links to comments across login (#114, `55ac3833c6` and `4138bd7cb5`). Agents matching bot/crawler/spider/crawling still receive a servlet redirect for SEO (`41d49e8734`); Ajax retains upstream's Ajax redirect response. The proxy fix also changes how fragment storage keys are formed. |--Browser verification when changing this group: follow a comment notification-while logged out, sign in behind a proxy/context path, and check both the returned-page and anchor. Also check an expired Ajax interaction, an explicit destination-fragment, and a crawler request. The new Java unit tests do not execute these-browser flows.--## WebSocket integration--| Override | Difference and motivation |+| `core/request/mapper/BasicResourceReferenceMapper.java` | Lowercase the scope class segment for agents that lowercase URLs, and maintain the reverse class-name map (`d642b2383f`). The port uses `Locale.ROOT`. The map still depends on the URL having been generated in the process. |+| `request/http/handler/RedirectRequestHandler.java` | Rebase application-relative redirect destinations against the current request with `UrlRenderer.renderRelativeUrl` (`59b517746c`). |+| `RestartResponseAtInterceptPageException.java` | Remove the backend host/port/protocol from the saved URL (#137), and remove behavior callback metadata before returning from login (#1301). Wicket 10 encodes numeric behavior IDs, so the patch now uses `MapperUtils.parsePageComponentInfoParameter` instead of searching for `.IBehaviorListener.`. Page-version and ordinary valued query parameters survive. |+| `protocol/http/servlet/ServletWebResponse.java` | Preserve browser fragments across login using session storage and a scripted redirect (#114). Crawlers retain servlet redirects; Ajax retains upstream Ajax redirects. |++`RedirectRequestHandler` was introduced in `59b517746c` ("Fix the issue that page+redirecting works abnormally"). Wicket 10.11.0 leaves destinations without a+leading slash unchanged. For example, `ProjectSiteFileResource` redirects+`project/~site` to the application-relative `project/~site/`. Passing that string+directly to the browser resolves it as `project/project/~site/`; rendering it+relative to the current request produces the intended `project/~site/` URL.+`e2e-test/tests/redirect-request-handler.spec.js` verifies this using a newly+created project's empty site, including both scripted browser redirects+and crawler HTTP redirects. The destination's directory listing also confirms+that the redirect reaches the correct resource. Replacing only the URL-rendering+customization with Wicket 10.11.0's implementation makes both cases fail with a+duplicated project path; restoring the customization makes both pass.++`InterceptRedirectCustomizationTest` generates callback metadata using Wicket 10's+encoder and verifies removal, ordinary/duplicate parameters, page versions, and+backend-origin removal. It reproduces the old string-matching patch's failure.+`e2e-test/tests/login-redirect.spec.js` verifies a logged-out private issue+comment link through login, including fragment storage/restoration, scrolling+to the comment, and consuming the saved fragment. Proxy/context paths, explicit+destination fragments, and crawler/Ajax requests still need verification when+the redirect script changes.++OneDev's `LoginPage` calls+`RestartResponseAtInterceptPageException.replaceSessionPreservingOriginalDestination()`.+This helper saves only the intercepted URL and POST parameters, calls the normal+`WebSession.replaceSession()`, and restores that one metadata entry. Replacing+the session destroys the old HTTP session, runs WebSocket/chat cleanup listeners,+and clears OneDev's session fields and unrelated metadata. Plain ID rotation+would bypass this cleanup. Wicket 10's unwrapped `replaceSession()` loses the+intercepted destination and returns users to the home page after login.++`InterceptRedirectCustomizationTest` verifies the preserved request and removal+of unrelated metadata, servlet attributes, and OneDev session fields; ordinary+session replacement still clears the destination. The browser tests cover+fresh/existing anonymous sessions, a rejected password followed by successful+login, page reloads, closure of an old tab's WebSocket, and rejection of the old+session cookie after login.++## WebSockets++| Override | Retained behavior || --- | --- |-| `protocol/ws/api/ServletRequestCopy.java` | Does not call `getCharacterEncoding()`, `getContentType()`, or `getRequestedSessionId()` on the upgrade request; saves null for each. The source comment records `UnsupportedOperationException` during connection. It also implements newer Servlet API methods (`getContentLengthLong`, `changeSessionId`, `upgrade`) with placeholder return values so the copied request satisfies the interface. Those placeholders are not a real session-rotation/upgrade implementation. |-| `protocol/ws/api/AbstractWebSocketProcessor.java` | Calls OneDev's `WebSocketService.onConnect` after the Wicket connected event. `DefaultWebSocketService` explicitly explains that this replays recent observable changes missed between page rendering and connection establishment. Processing exceptions send `WebSocketMessages.ERROR_MESSAGE` to the client in addition to logging. Exposes `getRegistryKey()` to the OneDev processor to construct its `PageKey`. Removes Wicket's `onError`/`WebSocketErrorPayload` broadcast path; the OneDev Jetty processor handles transport errors itself. These changes integrate the application notification/error lifecycle; a separate original incident for each is not established. |-| `protocol/ws/api/WebSocketRequestHandler.java` | Includes session feedback in partial updates, triggers OneDev's `beforeElementReplace`/`afterElementReplace` events for replaced elements, and re-registers page observables after component replacements. This keeps client widgets and observation subscriptions consistent with the newly rendered component tree (`91f6c8dbfe`, and current `WebSocketService.observe` usage). It assumes the page is a OneDev `BasePage`. |-| `protocol/ws/api/WicketWebSocketJQueryResourceReference.java` | Selects the adjacent customized JavaScript resource instead of upstream's `res/js/wicket-websocket-jquery.js`. It must be considered together with the following file. |-| `protocol/ws/api/wicket-websocket-jquery.js` | Compared against `org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js` in the source jar. Defers an XML Ajax response while `onedev.server.ajaxRequests.count > 0`, retrying after 100 ms before entering Wicket's message channel. Commit `49e16799e2` fixes the revision-indexing message remaining visible after CI/CD spec editing (OD-2661): an in-flight Ajax update could otherwise race the pushed DOM update. Non-XML messages retain upstream publication behavior. |-| `protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java` | **No behavioral customization relative to 7.18.0**; the only difference is an extra blank line. It is a candidate for removal in a separate cleanup, not a contract that needs a regression test. |--WebSocket tests should eventually exercise the Jetty upgrade request, changes-arriving before connection, DOM updates overlapping Ajax, feedback rendering, and-subscription changes after replacement. None of these integration flows is claimed-as covered by the Java tests added for this audit. Current keep-alive handling in-OneDev's `WebSocketProcessor` is outside the upstream diff; the historical-keep-alive branch removed by `99f08a7edb` is not a current customization here.+| `protocol/ws/api/AbstractWebSocketProcessor.java` | Replay observable changes missed between rendering and connection through `WebSocketService.onConnect`, and send OneDev's error message when processing fails. Wicket 10 already exposes `getRegistryKey()` to the subclass. Its transport error API can remain: OneDev's Jetty listener handles transport errors directly without calling that broadcast path. |+| `protocol/ws/api/WebSocketRequestHandler.java` | Include session feedback, emit `beforeElementReplace`/`afterElementReplace`, and re-register observables after replacing components. The customization now extends `XmlPartialPageUpdate`; it still assumes a OneDev `BasePage`. |+| `protocol/ws/api/WicketWebSocketJQueryResourceReference.java` | Select the adjacent customized JavaScript instead of the upstream `res/js/` path. |+| `protocol/ws/api/wicket-websocket-jquery.js` | Defer pushed XML Ajax responses while a OneDev Ajax request is in flight (OD-2661), preserving Wicket 10's channel handling and non-XML messages. |++`e2e-test/tests/websocket-request-handler.spec.js` exercises all three+`WebSocketRequestHandler` patches with real browser connections: replacement+events surround an issue row's DOM change, a newly rendered linked-issue badge+receives subsequent state changes, and pending session feedback appears in a+pushed update. REST changes trigger the pushes without an Ajax request or page+reload in the receiving tab.++`e2e-test/tests/websocket-resource-reference.spec.js` checks the selected+JavaScript resource and its Ajax coordination: a received WebSocket update+waits until a held issue-query response completes, then applies the newer+title. Both responses come from the server; the test controls their delivery+order to reproduce the OD-2661 race.++The `ServletRequestCopy` override was removed. `WebSocketProcessor` now passes+Jetty 12's real `HttpServletRequest` to Wicket; the old Jetty adapter that threw+on character encoding, content type, and requested session ID is gone. Wicket 10's+copy implements Jakarta Servlet. `JakartaJettyIntegrationTest` verifies those+metadata getters with a real Jetty request. It does not claim to test the entire+browser WebSocket reconnect/DOM lifecycle.++`protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java` was removed:+it was identical to Wicket 10.11.0 apart from whitespace, and had no behavioral+patch relative to 7.18.0 either.## Navigation and diagnostics-| Override | Difference and motivation |+| Override | Retained behavior || --- | --- |-| `extensions/markup/html/repeater/data/table/NavigationToolbar.java` | Recreates the paging navigator before each render rather than once in the constructor, and omits the upstream navigator label. Inferred reason for recreation: use current table state when constructing OneDev's navigator. Label removal is recorded in `dd1599c6a5` (OD-1965); `DefaultDataTable` now chooses a separate `ListNavigationToolbar` when a count is requested. |-| `extensions/markup/html/repeater/data/table/NavigationToolbar.html` | Removes the separate label and renders the navigator as a `ul`, matching `OnePagingNavigator` and OneDev's pagination styling. Keep markup and Java overrides together. Validate by changing result/page counts and checking pagination with and without the count toolbar. |-| `util/string/Strings.java` | The substantial text diff is mostly indentation. The only runtime change is `outputThrowable` using `cause.getMessage()` instead of `cause.toString()`. The source explicitly says this avoids including the whole HTML template in diagnostics. Messages and stack frames remain; exception-class text from `toString()` is also omitted. `StringsCustomizationTest` covers a nested exception with template-producing `toString()`. |+| `extensions/markup/html/repeater/data/table/NavigationToolbar.java` | Recreate the navigator before rendering and omit the separate count label (OD-1965). OneDev selects a different toolbar when a count is wanted. |+| `extensions/markup/html/repeater/data/table/NavigationToolbar.html` | Render the navigator as a `ul`, matching `OnePagingNavigator` and OneDev's pagination styling. |+| `util/string/Strings.java` | Use `cause.getMessage()` instead of `cause.toString()` when printing exceptions, avoiding whole HTML templates in diagnostics. Stack frames remain. |++`StringsCustomizationTest` covers nested exceptions with template-producing+`toString()`. Pagination state changes remain a UI verification scenario.-## Running the focused regression tests+## Verification```sh-./dev.sh test -pl server-core -Dtest='*CustomizationTest'+./dev.sh test -pl server-core '-Dtest=*CustomizationTest,JakartaJettyIntegrationTest'```-Validation at the time of this audit: all 10 tests passed with OneDev classes.-Running the same tests with the original `wicket-core` and `wicket-util` 7.18.0-binary jars ahead of OneDev classes on the test classpath produced 10 expected-behavioral failures. No production source was changed for that comparison.--The local managed JVM blocked Mockito's automatic agent attachment. The successful-Maven run supplied the cached Byte Buddy agent explicitly via-`-DargLine=-javaagent:/path/to/byte-buddy-agent.jar` (version 1.12.19 for that run);-no project build settings were changed.--The tests deliberately exercise behavior that differs from 7.18.0. They complement-the motivations and verification scenarios above; they are not a complete Wicket-compatibility suite. During an upgrade, compare against the new release, keep-each customization whose application contract still applies, and retire overrides-that have become equivalent to upstream.+On JVMs that disallow Mockito self-attachment, set `JAVA_TOOL_OPTIONS` to+`-javaagent:/absolute/path/to/byte-buddy-agent.jar` for the command. The local audit+used the cached 1.12.19 agent. See [the library audit](library-customizations.md)+for the other libraries and retired overrides.diff --git a/e2e-test/README.md b/e2e-test/README.mdindex 9259901e01..7179d133eb 100644--- a/e2e-test/README.md+++ b/e2e-test/README.md@@ -43,3 +43,81 @@ E2E_SKIP_WEBSERVER=1 E2E_BASE_URL=https://onedev.example.com npm testFor local debugging, `npm run test:headed` opens the browser and`npm run test:ui` starts Playwright's interactive test runner.++## Application-relative redirects++`tests/redirect-request-handler.spec.js` exercises `RedirectRequestHandler` via+the project site's missing-trailing-slash redirect. It verifies that the project+path is not duplicated when resolving the application-relative destination,+for both normal browsers (JavaScript redirect) and crawlers (HTTP redirect).+The fixture's empty site must display its directory listing at the canonical+URL, rather than an unrelated project-not-found page.++## Login redirects and page-store warnings++`tests/login-redirect.spec.js` checks protected system settings and private+projects with fresh and existing anonymous sessions. It verifies session+replacement, return to the requested URL with its query parameters, recovery+from an incorrect password, and authenticated access after reload. A second-tab+login must close the previous session's WebSocket; replaying the old session+cookie after login must still require authentication.++It also opens a private issue comment link while logged out, verifies the+fragment is saved during login and restored afterward, and checks that the+comment is scrolled into view. The saved fragment is consumed, so a later visit+without a fragment does not jump back to the comment.++Wicket catches exceptions from its page-store statelessness check, so the+browser can complete a redirect while the server logs an uninitialized+`wicket:enclosure` error. To include this regression check, add the following+logger to the test server's `conf/logback.xml` and restart it:++```xml+<logger name="org.apache.wicket.pageStore.RequestPageStore" level="WARN"/>+```++The default `org.apache.wicket` logger is set to `ERROR`, which hides these+warnings. Pass the server's local log file when running the test:++```bash+E2E_SKIP_WEBSERVER=1 \+E2E_SERVER_LOG=../server-product/target/sandbox/logs/server.log \+npm test -- tests/login-redirect.spec.js+```++The test attaches the log entries written during each case and fails on+statelessness-check or enclosure errors. Use a dedicated test server and a log+file that will not rotate during the run. Without `E2E_SERVER_LOG`, only the+browser assertions run, which also supports remote test servers.++## WebSocket partial updates++`tests/websocket-request-handler.spec.js` covers the OneDev customizations in+Wicket's `WebSocketRequestHandler` through real browser WebSocket connections:++- An issue title change made through REST replaces its list row, with+ `beforeElementReplace` seeing the attached old node and `afterElementReplace`+ seeing the attached replacement.+- A link added after the issue page loads introduces a new state badge through+ a WebSocket update. Changing only the linked issue then updates that badge+ twice on the same connection, exercising subscription registration after rendering.+- Submitting the iteration form in the same browser session, without following+ its redirect, leaves a pending success message. An independent issue change+ delivers that message in the WebSocket response and displays the feedback panel.++`tests/websocket-resource-reference.spec.js` checks that+`WicketWebSocketJQueryResourceReference` selects OneDev's adjacent JavaScript+and that its Ajax coordination works. It holds a real issue-query Ajax response,+changes the issue through REST, and waits for the resulting WebSocket frame.+The DOM must retain the old title while Ajax is pending, then show the newer+pushed title after the held response completes. This protects against an older+Ajax response overwriting a newer WebSocket update (OD-2661).++The tests create and clean up their own projects and use the default `Related`+issue link and `Open`/`Closed` states. They do not require changes to server code+or logging configuration. For an existing server, set `E2E_ADMIN_USER` and+`E2E_ADMIN_PASSWORD` if its credentials differ from `admin`/`admin`.++```bash+npm test -- tests/websocket-*.spec.js+```diff --git a/e2e-test/tests/api.js b/e2e-test/tests/api.jsindex 431ea3407f..9eba9a5dd5 100644--- a/e2e-test/tests/api.js+++ b/e2e-test/tests/api.js@@ -63,6 +63,14 @@ export class FixturesApi {return { id, title, url: `${project.name}/~issues/${issue.number}` };}+ async createIssueComment(issue, content) {+ const user = await this.json('get', '~api/users/me');+ const id = await this.json('post', '~api/issue-comments', {+ data: { issueId: issue.id, userId: user.id, content },+ });+ return { id, content, url: `${issue.url}#IssueComment-${id}` };+ }+async authorizeIssueUser(issue, user, authorizer = admin) {return this.json('post', '~api/issue-authorizations', {data: { issueId: issue.id, userId: user.id },diff --git a/e2e-test/tests/diff-symbol-context.spec.js b/e2e-test/tests/diff-symbol-context.spec.jsindex d6031363e9..f0738de535 100644--- a/e2e-test/tests/diff-symbol-context.spec.js+++ b/e2e-test/tests/diff-symbol-context.spec.js@@ -247,6 +247,7 @@ for (const mode of ['UNIFIED', 'SPLIT']) {await waitForContext(page, `${project.name}/~commits/${second.commitHash}`, 'run');// Only the in-function hunk has context. The unscoped change gets no row.await expect(diff.locator('.diff-symbol-hunk')).toHaveCount(1);- await expect(diff.locator('.diff-symbol-hunk .symbol-context-label')).toHaveText('run');+ // Indexing can briefly render separate old/new labels before both revisions are ready.+ await expect(diff.locator('.diff-symbol-hunk .symbol-context-label')).toHaveText(['run']);});}diff --git a/e2e-test/tests/login-redirect.spec.js b/e2e-test/tests/login-redirect.spec.jsnew file mode 100644index 0000000000..8b06151c59--- /dev/null+++ b/e2e-test/tests/login-redirect.spec.js@@ -0,0 +1,181 @@+import { readFile, stat } from 'node:fs/promises';+import { admin, expect, test as base } from './fixtures.js';++const test = base.extend({+ pageStoreLog: [async ({}, use, testInfo) => {+ // Wicket catches statelessness-check failures, so the browser can succeed+ // while request teardown logs an enclosure error. See README for logging.+ const logPath = process.env.E2E_SERVER_LOG;+ const offset = logPath ? (await stat(logPath)).size : 0;+ await use();+ if (logPath) {+ const log = (await readFile(logPath)).subarray(offset).toString();+ await testInfo.attach('server-log', { body: log, contentType: 'text/plain' });+ const errors = log.split(/\r?\n/).filter(line =>+ line.includes('An error occurred while checking whether a page is stateless')+ || /Could not find child with id: .* in the wicket:enclosure/.test(line));+ expect(errors, 'Page-store errors during the login redirect').toEqual([]);+ }+ }, { auto: true }],+});++test('restores a private issue comment fragment after login', async ({ page, api, baseURL }) => {+ const project = await api.createProject();+ const issue = await api.createIssue(project, {+ // Keep the comment below the initial viewport so restoring the URL alone+ // is insufficient: the browser must also scroll to the linked comment.+ description: Array.from({ length: 40 }, (_, index) => `Context paragraph ${index + 1}.`).join('\n\n'),+ });+ const comment = await api.createIssueComment(issue, 'The comment linked from a notification.');+ const target = new URL(comment.url, baseURL);+ target.searchParams.set('login-redirect-test', 'fragment');+ const storageKey = target.pathname + target.search;++ // Fixture requests authenticate independently; this page starts logged out.+ await page.goto(target.href);+ await expect(page).toHaveURL(/\/~login(?:[;?#]|$)/);+ await expect(page.getByRole('button', { name: 'Sign in', exact: true })).toBeVisible();+ expect(new URL(page.url()).hash).toBe('');+ expect(await page.evaluate(key => sessionStorage.getItem(key), storageKey)).toBe(target.hash);++ // Submit the intercepted login form without navigating away from it.+ await page.getByPlaceholder('Login name or email address', { exact: true }).fill(admin.name);+ await page.locator('form input[type="password"]').fill(admin.password);+ await page.getByRole('button', { name: 'Sign in', exact: true }).click();+ await expect(page).toHaveURL(target.href);++ const linkedComment = page.locator(target.hash);+ await expect(linkedComment).toContainText(comment.content);+ await expect(linkedComment).toBeInViewport();+ expect(await page.evaluate(key => sessionStorage.getItem(key), storageKey)).toBeNull();++ // An ordinary visit must not reuse the consumed fragment. This also verifies+ // that the fixture requires scrolling to reach the comment.+ await page.goto('~administration/settings/system');+ target.hash = '';+ await page.goto(target.href);+ await expect(page).toHaveURL(target.href);+ await expect(linkedComment).toBeVisible();+ await expect(linkedComment).not.toBeInViewport();+});++// Administration pages are intercepted during onInitialize(), before their+// wicket:enclosure children exist. Private projects are intercepted earlier,+// in ProjectPage's constructor. Exercise both with real anonymous sessions.+for (const existingSession of [false, true]) {+ for (const destination of ['system settings', 'private project']) {+ test(`returns to ${destination} after login with ${existingSession ? 'an existing' : 'a fresh'} anonymous session`, async ({ page, api, baseURL }, testInfo) => {+ const project = destination === 'private project' ? await api.createProject() : null;+ const path = project ? project.name : '~administration/settings/system';+ const target = `${path}?login-redirect-test=retained`;+ const failures = [];+ const navigation = [];+ page.on('pageerror', error => failures.push(error.message));+ page.on('response', response => {+ if (response.status() >= 500)+ failures.push(`${response.status()} ${response.url()}`);+ if (response.request().isNavigationRequest())+ navigation.push({ status: response.status(), url: response.url() });+ });++ try {+ let originalSessionId;+ if (existingSession) {+ await page.goto('~login');+ await expect(page.getByRole('button', { name: 'Sign in', exact: true })).toBeVisible();+ originalSessionId = (await page.context().cookies()).find(cookie => /JSESSIONID/i.test(cookie.name))?.value;+ expect(originalSessionId).toBeTruthy();+ }++ await page.goto(target);+ await expect(page).toHaveURL(/\/~login(?:[;?#]|$)/);+ const userName = page.getByPlaceholder('Login name or email address', { exact: true });+ const password = page.locator('form input[type="password"]');+ const signIn = page.getByRole('button', { name: 'Sign in', exact: true });+ await expect(signIn).toBeVisible();+ if (existingSession) {+ const rotatedSessionId = (await page.context().cookies()).find(cookie => /JSESSIONID/i.test(cookie.name))?.value;+ expect(rotatedSessionId).toBeTruthy();+ expect(rotatedSessionId).not.toBe(originalSessionId);+ }++ await userName.fill(admin.name);+ if (existingSession) {+ // A rejected submission must also retain the intercepted destination.+ await password.fill(`${admin.password}-incorrect`);+ await signIn.click();+ await expect(page.getByText('Invalid account or incorrect credentials', { exact: true })).toBeVisible();+ await expect(page).toHaveURL(/\/~login(?:[;?#]|$)/);+ }+ // Submit this form directly: navigating to ~login again would lose the+ // opportunity to test the original intercepted request.+ await password.fill(admin.password);+ await signIn.click();+ await page.waitForURL(url => !url.pathname.includes('~login'));+ const returnedUrl = new URL(page.url());+ expect(returnedUrl.pathname).toBe(new URL(target, baseURL).pathname);+ expect(returnedUrl.searchParams.get('login-redirect-test')).toBe('retained');++ const content = project+ ? page.locator('.project-overview')+ : page.getByRole('button', { name: 'Save Settings', exact: true });+ await expect(content).toBeVisible();+ // Make another request to verify the authenticated session survives.+ await page.reload();+ await expect(content).toBeVisible();+ expect(failures).toEqual([]);+ } finally {+ await testInfo.attach('navigation', {+ body: JSON.stringify({ navigation, failures }, null, 2),+ contentType: 'application/json',+ });+ }+ });+ }+}++test('replacing the login session closes old WebSockets and rejects the old cookie', async ({ page, browser, baseURL }) => {+ await page.goto('~login');+ await page.waitForFunction(() => window.Wicket?.WebSocket?.INSTANCE?.ws?.readyState === WebSocket.OPEN);+ await page.evaluate(() => {+ window.sessionSocketClose = null;+ Wicket.WebSocket.INSTANCE.ws.addEventListener('close', event => {+ window.sessionSocketClose = { code: event.code, reason: event.reason };+ });+ });+ const originalCookie = (await page.context().cookies()).find(cookie => /JSESSIONID/i.test(cookie.name));+ expect(originalCookie).toBeTruthy();++ // Keep the first tab open: a close here must come from session destruction,+ // not from navigating away from the page that owns the connection.+ const loginTab = await page.context().newPage();+ try {+ await loginTab.goto('~administration/settings/system?login-redirect-test=retained');+ await expect(loginTab).toHaveURL(/\/~login(?:[;?#]|$)/);+ await expect.poll(() => page.evaluate(() => window.sessionSocketClose), { timeout: 10000 })+ .toEqual({ code: 1000, reason: 'Session destroyed' });+ const replacementCookie = (await page.context().cookies()).find(cookie => /JSESSIONID/i.test(cookie.name));+ expect(replacementCookie?.value).toBeTruthy();+ expect(replacementCookie.value).not.toBe(originalCookie.value);++ await loginTab.getByPlaceholder('Login name or email address', { exact: true }).fill(admin.name);+ await loginTab.locator('form input[type="password"]').fill(admin.password);+ await loginTab.getByRole('button', { name: 'Sign in', exact: true }).click();+ await expect(loginTab.getByRole('button', { name: 'Save Settings', exact: true })).toBeVisible();+ expect(new URL(loginTab.url()).searchParams.get('login-redirect-test')).toBe('retained');++ const staleContext = await browser.newContext({ baseURL });+ try {+ await staleContext.addCookies([originalCookie]);+ const stalePage = await staleContext.newPage();+ await stalePage.goto('~administration/settings/system');+ await expect(stalePage).toHaveURL(/\/~login(?:[;?#]|$)/);+ await expect(stalePage.getByRole('button', { name: 'Sign in', exact: true })).toBeVisible();+ await expect(stalePage.getByRole('button', { name: 'Save Settings', exact: true })).toHaveCount(0);+ } finally {+ await staleContext.close();+ }+ } finally {+ await loginTab.close();+ }+});diff --git a/e2e-test/tests/redirect-request-handler.spec.js b/e2e-test/tests/redirect-request-handler.spec.jsnew file mode 100644index 0000000000..7fbd9aef6d--- /dev/null+++ b/e2e-test/tests/redirect-request-handler.spec.js@@ -0,0 +1,33 @@+import { expect, test } from './fixtures.js';++for (const crawler of [false, true]) {+ test.describe(crawler ? 'crawler redirect' : 'browser redirect', () => {+ if (crawler) test.use({ userAgent: 'OneDev E2E crawler' });++ test('adds the site trailing slash without duplicating the project path', async ({ page, api, baseURL }) => {+ const project = await api.createProject();+ const siteUrl = new URL(`${project.name}/~site`, baseURL).href;+ const canonicalUrl = `${siteUrl}/`;+ const navigation = [];+ page.on('response', response => {+ if (response.request().isNavigationRequest() && response.frame() === page.mainFrame())+ navigation.push({ url: response.url(), status: response.status() });+ });++ // ProjectSiteFileResource passes "project/~site/" to RedirectToUrlException.+ // RedirectRequestHandler must rebase it against the current request;+ // leaving it unchanged sends the browser to "project/project/~site/".+ await page.goto(siteUrl);+ await expect(page).toHaveURL(canonicalUrl);++ // A new project's site has an empty directory listing. Verify that the+ // redirect reaches it instead of an unrelated project-not-found page.+ await expect(page.getByRole('heading', { name: 'Index of /', exact: true })).toBeVisible();+ expect(navigation).toEqual([+ // ServletWebResponse uses JavaScript for browsers and HTTP for crawlers.+ { url: siteUrl, status: crawler ? 302 : 200 },+ { url: canonicalUrl, status: 200 },+ ]);+ });+ });+}diff --git a/e2e-test/tests/websocket-request-handler.spec.js b/e2e-test/tests/websocket-request-handler.spec.jsnew file mode 100644index 0000000000..689090a10d--- /dev/null+++ b/e2e-test/tests/websocket-request-handler.spec.js@@ -0,0 +1,153 @@+import { admin, expect, test } from './fixtures.js';+import { login } from './helpers.js';++test.afterEach(async ({ page }, testInfo) => {+ if (testInfo.status !== testInfo.expectedStatus && !page.isClosed()) {+ await testInfo.attach('websocket-updates', {+ body: JSON.stringify(await page.evaluate(() => ({+ updates: window.socketUpdates, replacements: window.replacements,+ })), null, 2),+ contentType: 'application/json',+ });+ }+});++async function watchWebSocketUpdates(page) {+ await page.waitForFunction(() => window.Wicket?.WebSocket?.INSTANCE?.ws?.readyState === WebSocket.OPEN);+ await page.waitForFunction(() => onedev.server.ajaxRequests.count === 0);+ await page.evaluate(() => {+ window.socketUpdates = [];+ window.observedSocket = Wicket.WebSocket.INSTANCE.ws;+ observedSocket.addEventListener('message', event => {+ if (typeof event.data === 'string' && event.data.includes('<ajax-response>'))+ socketUpdates.push(event.data);+ });+ });+}++async function recordReplacements(page, component) {+ const id = await component.getAttribute('id');+ expect(id).toBeTruthy();+ await page.evaluate(id => {+ window.replacements = [];+ let previous;+ $(document).on('beforeElementReplace.e2e afterElementReplace.e2e', (event, componentId) => {+ if (componentId !== id) return;+ const element = document.getElementById(id);+ if (event.type === 'beforeElementReplace') previous = element;+ replacements.push({+ type: event.type,+ text: element?.textContent.trim(),+ connected: element?.isConnected === true,+ replaced: previous != null && previous !== element && !previous.isConnected,+ });+ });+ }, id);+}++async function postIssueChange(api, issue, path, data) {+ const response = await api.request.post(`~api/issues/${issue.id}/${path}`, {+ data: JSON.stringify(data), headers: { 'Content-Type': 'application/json' },+ });+ expect(response.ok(), await response.text()).toBeTruthy();+}++test('WebSocket replacements fire lifecycle events around the actual DOM change', async ({ page, api }) => {+ const project = await api.createProject();+ const issue = await api.createIssue(project, { title: 'Original WebSocket title' });+ await login(page, admin.name, admin.password);+ await page.goto(`${project.name}/~issues`);+ const row = page.locator('tr.issue');+ await expect(row).toContainText(issue.title);+ await watchWebSocketUpdates(page);+ await recordReplacements(page, row);++ // REST changes the issue independently of this browser. No Ajax response or+ // page reload can supply the replacement events tested here.+ const updatedTitle = 'Updated through a WebSocket push';+ await postIssueChange(api, issue, 'title', updatedTitle);+ await expect(row).toContainText(updatedTitle);+ await expect.poll(() => page.evaluate(() => socketUpdates.some(xml => xml.includes('Updated through a WebSocket push'))))+ .toBe(true);+ await expect.poll(() => page.evaluate(title => replacements.some(event =>+ event.type === 'afterElementReplace' && event.text.includes(title)), updatedTitle)).toBe(true);+ const events = await page.evaluate(() => replacements);+ const after = events.findIndex(event => event.type === 'afterElementReplace' && event.text.includes(updatedTitle));+ expect(after).toBeGreaterThan(0);+ expect(events[after - 1]).toMatchObject({+ type: 'beforeElementReplace', text: expect.stringContaining(issue.title), connected: true, replaced: false,+ });+ expect(events[after]).toMatchObject({ connected: true, replaced: true });+});++test('WebSocket replacements subscribe newly rendered linked-issue badges', async ({ page, api }) => {+ const project = await api.createProject();+ const issue = await api.createIssue(project);+ const linkedIssue = await api.createIssue(project);+ await login(page, admin.name, admin.password);+ await page.goto(issue.url);+ await expect(page.locator('.issue-editable-title')).toContainText(issue.title);+ await expect(page.locator('.linked-issues .issue-state')).toHaveCount(0);+ await watchWebSocketUpdates(page);++ await api.json('get', '~api/tod/link-issues', { params: {+ currentProject: project.name,+ sourceReference: `#${issue.url.split('/').at(-1)}`,+ targetReference: `#${linkedIssue.url.split('/').at(-1)}`,+ linkName: 'Related',+ } });+ // The REST link endpoint stores the link without an issue-change event.+ // Change the parent to render the new link and its observer via WebSocket.+ await postIssueChange(api, issue, 'title', 'Parent with a newly linked issue');+ const badge = page.locator('.linked-issues .issue-state');+ await expect(badge).toHaveText('Open');+ await expect(page.locator('.linked-issues')).toContainText(linkedIssue.title);++ // Only the linked issue changes now. Without WebSocketRequestHandler's+ // observe(page), this page is still subscribed solely to the original issue.+ await postIssueChange(api, linkedIssue, 'state-transitions', { state: 'Closed' });+ await expect(badge).toHaveText('Closed');+ await postIssueChange(api, linkedIssue, 'state-transitions', { state: 'Open' });+ await expect(badge).toHaveText('Open');+ expect(await page.evaluate(() => Wicket.WebSocket.INSTANCE.ws === observedSocket)).toBe(true);+ expect(await page.evaluate(() => socketUpdates.some(xml => xml.includes('Closed')))).toBe(true);+});++test('WebSocket updates include pending session feedback', async ({ page, api }) => {+ const project = await api.createProject();+ const issue = await api.createIssue(project);+ await login(page, admin.name, admin.password);+ await page.goto(`${project.name}/~issues`);+ await expect(page.locator('tr.issue')).toContainText(issue.title);+ await watchWebSocketUpdates(page);+ await expect(page.locator('#session-feedback')).not.toContainText('New iteration created');++ const formPage = await page.context().newPage();+ try {+ await formPage.goto(`${project.name}/~iterations/new`);+ await formPage.locator('.property-name input').fill('WebSocket feedback iteration');+ const submission = await formPage.locator('form.leave-confirm').evaluate(form => ({+ url: form.action,+ fields: Object.fromEntries(new FormData(form)),+ }));+ // Use the browser's session and the real form, but stop at the redirect so+ // the destination page cannot consume the success message first.+ const response = await page.context().request.post(submission.url, {+ form: submission.fields, maxRedirects: 0,+ });+ const body = await response.text();+ expect(response.status(), body).toBe(200);+ // OneDev preserves URL fragments with a JavaScript redirect response.+ expect(body).toContain('window.location.replace(redirect)');+ expect(body).not.toContain('New iteration created');+ } finally {+ await formPage.close();+ }++ await postIssueChange(api, issue, 'title', 'Issue updated with pending feedback');+ await expect(page.locator('tr.issue')).toContainText('Issue updated with pending feedback');+ await expect(page.locator('#session-feedback')).toBeVisible();+ await expect(page.locator('#session-feedback')).toContainText('New iteration created');+ expect(await page.evaluate(() => socketUpdates.some(xml =>+ xml.includes('id="session-feedback"') && xml.includes('New iteration created')))).toBe(true);+});diff --git a/e2e-test/tests/websocket-resource-reference.spec.js b/e2e-test/tests/websocket-resource-reference.spec.jsnew file mode 100644index 0000000000..6879a64001--- /dev/null+++ b/e2e-test/tests/websocket-resource-reference.spec.js@@ -0,0 +1,96 @@+import { admin, expect, test } from './fixtures.js';+import { login } from './helpers.js';++test('the custom WebSocket resource defers pushed DOM updates until Ajax completes', async ({ page, api }, testInfo) => {+ const project = await api.createProject();+ const issue = await api.createIssue(project, { title: 'Title before the Ajax refresh' });+ const updatedTitle = 'Newer title delivered by WebSocket';+ const pageErrors = [];+ page.on('pageerror', error => pageErrors.push(error.message));++ await login(page, admin.name, admin.password);+ await page.goto(`${project.name}/~issues`);+ const row = page.locator('tr.issue');+ await expect(row).toContainText(issue.title);+ const script = page.locator('script[src*="wicket-websocket-jquery"]');+ await expect(script).toHaveCount(1);+ const scriptUrl = await script.getAttribute('src');+ await page.waitForFunction(() => window.Wicket?.WebSocket?.INSTANCE?.ws?.readyState === WebSocket.OPEN);+ await page.waitForFunction(() => onedev.server.ajaxRequests.count === 0);+ await page.evaluate(() => {+ window.socketRace = { updates: [], applied: [] };+ window.originalSocket = Wicket.WebSocket.INSTANCE.ws;+ originalSocket.addEventListener('message', event => {+ if (typeof event.data === 'string' && event.data.includes('<ajax-response>')) {+ socketRace.updates.push({ xml: event.data, ajaxCount: onedev.server.ajaxRequests.count });+ }+ });+ $(document).on('afterElementReplace.e2e', () => {+ socketRace.applied.push({+ title: document.querySelector('tr.issue')?.textContent,+ ajaxCount: onedev.server.ajaxRequests.count,+ });+ });+ });++ let releaseAjax;+ const ajaxGate = new Promise(resolve => { releaseAjax = resolve; });+ let intercepted = false;+ let ajaxBody;+ const holdAjaxResponse = async route => {+ if (intercepted || route.request().headers()['wicket-ajax'] !== 'true') {+ await route.continue();+ return;+ }+ intercepted = true;+ // Finish processing on the server before holding the response. Otherwise+ // Wicket's page lock could prevent the WebSocket push from being generated.+ const response = await route.fetch();+ ajaxBody = await response.text();+ await ajaxGate;+ await route.fulfill({ response });+ };+ await page.route('**/*', holdAjaxResponse);+ try {+ // Refresh the list without changing its query, retaining the old title in+ // the Ajax response while an independent REST request changes the issue.+ await page.locator('.issue-list button[data-tippy-content="Query"]').click();+ await expect.poll(() => ajaxBody).toContain(issue.title);+ expect(ajaxBody).toContain('<ajax-response>');+ expect(await page.evaluate(() => onedev.server.ajaxRequests.count)).toBeGreaterThan(0);++ const response = await api.request.post(`~api/issues/${issue.id}/title`, {+ data: JSON.stringify(updatedTitle), headers: { 'Content-Type': 'application/json' },+ });+ expect(response.ok(), await response.text()).toBeTruthy();+ await expect.poll(() => page.evaluate(title => socketRace.updates.some(update =>+ update.xml.includes(title) && update.ajaxCount > 0), updatedTitle)).toBe(true);++ // This observation window intentionally spans several 100-ms retry ticks:+ // receiving a push must not replace the DOM while Ajax is still pending.+ await page.waitForTimeout(350);+ await expect(row).toContainText(issue.title);+ expect(await page.evaluate(() => onedev.server.ajaxRequests.count)).toBeGreaterThan(0);+ expect(await page.evaluate(title => socketRace.applied.some(update =>+ update.title?.includes(title)), updatedTitle)).toBe(false);++ releaseAjax();+ await page.waitForFunction(() => onedev.server.ajaxRequests.count === 0);+ await expect(row).toContainText(updatedTitle);+ await expect.poll(() => page.evaluate(title => socketRace.applied.some(update =>+ update.title?.includes(title) && update.ajaxCount === 0), updatedTitle)).toBe(true);+ expect(await page.evaluate(() => Wicket.WebSocket.INSTANCE.ws === originalSocket)).toBe(true);+ expect(pageErrors).toEqual([]);++ // The reference must select OneDev's adjacent script, not Wicket's copy+ // under res/js. The race above also checks that the selected script runs.+ expect(new URL(scriptUrl, page.url()).pathname).not.toContain('/res/js/');+ } finally {+ releaseAjax();+ await page.unrouteAll({ behavior: 'wait' });+ await testInfo.attach('websocket-ajax-race', {+ body: JSON.stringify({ scriptUrl, ajaxBody, pageErrors, ...await page.evaluate(() => socketRace) }, null, 2),+ contentType: 'application/json',+ });+ }+});diff --git a/pom.xml b/pom.xmlindex 4c328c6b10..ad41f12c27 100644--- a/pom.xml+++ b/pom.xml@@ -35,6 +35,21 @@</plugins></pluginManagement><plugins>+ <plugin>+ <groupId>org.apache.maven.plugins</groupId>+ <artifactId>maven-surefire-plugin</artifactId>+ <configuration>+ <!-- Give Hazelcast in the test JVM access to required Java internals. -->+ <argLine>+ --add-modules=java.se+ --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED+ --add-opens=java.base/java.lang=ALL-UNNAMED+ --add-opens=java.base/sun.nio.ch=ALL-UNNAMED+ --add-opens=java.management/sun.management=ALL-UNNAMED+ --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED+ </argLine>+ </configuration>+ </plugin><plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>@@ -116,6 +131,58 @@</profiles><dependencyManagement><dependencies>+ <dependency>+ <groupId>com.fasterxml.jackson</groupId>+ <artifactId>jackson-bom</artifactId>+ <version>${jackson.version}</version>+ <type>pom</type>+ <scope>import</scope>+ </dependency>+ <dependency>+ <groupId>org.ow2.asm</groupId>+ <artifactId>asm</artifactId>+ <version>${asm.version}</version>+ </dependency>+ <dependency>+ <groupId>org.ow2.asm</groupId>+ <artifactId>asm-commons</artifactId>+ <version>${asm.version}</version>+ </dependency>+ <dependency>+ <groupId>org.ow2.asm</groupId>+ <artifactId>asm-analysis</artifactId>+ <version>${asm.version}</version>+ </dependency>+ <dependency>+ <groupId>org.ow2.asm</groupId>+ <artifactId>asm-tree</artifactId>+ <version>${asm.version}</version>+ </dependency>+ <dependency>+ <groupId>org.ow2.asm</groupId>+ <artifactId>asm-util</artifactId>+ <version>${asm.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>hk2-api</artifactId>+ <version>${hk2.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>hk2-utils</artifactId>+ <version>${hk2.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>hk2-locator</artifactId>+ <version>${hk2.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>guice-bridge</artifactId>+ <version>${hk2.version}</version>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>commons-bootstrap</artifactId>@@ -148,9 +215,9 @@<version>${commons.version}</version></dependency><dependency>- <groupId>javax.activation</groupId>- <artifactId>activation</artifactId>- <version>1.1.1</version>+ <groupId>jakarta.activation</groupId>+ <artifactId>jakarta.activation-api</artifactId>+ <version>2.1.4</version></dependency><dependency><groupId>org.slf4j</groupId>@@ -183,18 +250,28 @@<version>${jetty.version}</version></dependency><dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlets</artifactId>+ <groupId>org.eclipse.jetty.compression</groupId>+ <artifactId>jetty-compression-server</artifactId><version>${jetty.version}</version></dependency><dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlet</artifactId>+ <groupId>org.eclipse.jetty.compression</groupId>+ <artifactId>jetty-compression-gzip</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.ee11</groupId>+ <artifactId>jetty-ee11-servlets</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.ee11</groupId>+ <artifactId>jetty-ee11-servlet</artifactId><version>${jetty.version}</version></dependency><dependency>- <groupId>org.eclipse.jetty.websocket</groupId>- <artifactId>websocket-server</artifactId>+ <groupId>org.eclipse.jetty.ee11.websocket</groupId>+ <artifactId>jetty-ee11-websocket-jetty-server</artifactId><version>${jetty.version}</version></dependency><dependency>@@ -255,25 +332,30 @@<dependency><groupId>org.hibernate.validator</groupId><artifactId>hibernate-validator</artifactId>- <version>6.2.5.Final</version>+ <version>9.1.3.Final</version></dependency><dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-core</artifactId>- <version>${hibernate.version}</version>+ <groupId>jakarta.validation</groupId>+ <artifactId>jakarta.validation-api</artifactId>+ <version>3.1.1</version></dependency><dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-jcache</artifactId>- <version>${hibernate.version}</version>+ <groupId>org.glassfish.expressly</groupId>+ <artifactId>expressly</artifactId>+ <version>6.0.0</version></dependency><dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-entitymanager</artifactId>+ <groupId>jakarta.el</groupId>+ <artifactId>jakarta.el-api</artifactId>+ <version>6.0.1</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate.orm</groupId>+ <artifactId>hibernate-core</artifactId><version>${hibernate.version}</version></dependency><dependency>- <groupId>org.hibernate</groupId>+ <groupId>org.hibernate.orm</groupId><artifactId>hibernate-hikaricp</artifactId><version>${hibernate.version}</version></dependency>@@ -285,7 +367,7 @@<dependency><groupId>com.zaxxer</groupId><artifactId>HikariCP</artifactId>- <version>2.7.9</version>+ <version>7.0.2</version></dependency><dependency><groupId>org.apache.commons</groupId>@@ -323,9 +405,9 @@<version>33.5.0-jre</version></dependency><dependency>- <groupId>commons-fileupload</groupId>- <artifactId>commons-fileupload</artifactId>- <version>1.6.0</version>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>+ <version>2.0.0-M5</version></dependency><dependency><groupId>commons-validator</groupId>@@ -342,11 +424,6 @@<artifactId>httpclient</artifactId><version>4.5.13</version></dependency>- <dependency>- <groupId>org.glassfish.hk2</groupId>- <artifactId>guice-bridge</artifactId>- <version>2.5.0</version>- </dependency><dependency><groupId>org.jetbrains.xodus</groupId><artifactId>xodus-entity-store</artifactId>@@ -358,9 +435,9 @@<version>${tika.version}</version></dependency><dependency>- <groupId>com.sun.mail</groupId>- <artifactId>javax.mail</artifactId>- <version>1.6.2</version>+ <groupId>org.eclipse.angus</groupId>+ <artifactId>jakarta.mail</artifactId>+ <version>2.0.5</version></dependency><dependency><groupId>joda-time</groupId>@@ -370,7 +447,7 @@<dependency><groupId>org.yaml</groupId><artifactId>snakeyaml</artifactId>- <version>2.2</version>+ <version>2.7</version></dependency><dependency><groupId>org.bouncycastle</groupId>@@ -452,16 +529,8 @@<artifactId>shiro-guice</artifactId><version>${shiro.version}</version></dependency>- <dependency>- <groupId>javax.xml.bind</groupId>- <artifactId>jaxb-api</artifactId>- <version>2.3.1</version>- </dependency>- <dependency>- <groupId>org.glassfish</groupId>- <artifactId>javax.el</artifactId>- <version>3.0.0</version>- </dependency>++<dependency><groupId>org.hsqldb</groupId><artifactId>hsqldb</artifactId>@@ -577,36 +646,6 @@<artifactId>json</artifactId><version>20231013</version></dependency>- <dependency>- <groupId>com.fasterxml.jackson.core</groupId>- <artifactId>jackson-core</artifactId>- <version>${jackson.version}</version>- </dependency>- <dependency>- <groupId>com.fasterxml.jackson.core</groupId>- <artifactId>jackson-databind</artifactId>- <version>${jackson.version}</version>- </dependency>- <dependency>- <groupId>com.fasterxml.jackson.dataformat</groupId>- <artifactId>jackson-dataformat-yaml</artifactId>- <version>${jackson.version}</version>- </dependency>- <dependency>- <groupId>com.fasterxml.jackson.core</groupId>- <artifactId>jackson-annotations</artifactId>- <version>${jackson.version}</version>- </dependency>- <dependency>- <groupId>com.fasterxml.jackson.datatype</groupId>- <artifactId>jackson-datatype-jsr310</artifactId>- <version>${jackson.version}</version>- </dependency>- <dependency>- <groupId>com.fasterxml.jackson.jaxrs</groupId>- <artifactId>jackson-jaxrs-json-provider</artifactId>- <version>${jackson.version}</version>- </dependency><dependency><groupId>io.onedev</groupId><artifactId>agent</artifactId>@@ -625,7 +664,7 @@<dependency><groupId>net.bytebuddy</groupId><artifactId>byte-buddy</artifactId>- <version>1.12.14</version>+ <version>1.18.8</version></dependency><dependency><groupId>org.javassist</groupId>@@ -635,12 +674,12 @@<dependency><groupId>com.hazelcast</groupId><artifactId>hazelcast</artifactId>- <version>5.3.8</version>+ <version>5.7.0</version></dependency><dependency><groupId>com.hazelcast</groupId><artifactId>hazelcast-hibernate53</artifactId>- <version>2.2.1</version>+ <version>5.2.0</version></dependency><dependency><groupId>org.dhatim</groupId>@@ -681,22 +720,24 @@</repository></repositories><properties>- <commons.version>4.2.1</commons.version>- <agent.version>3.2.10</agent.version>- <slf4j.version>2.0.9</slf4j.version>+ <commons.version>4.2.2</commons.version>+ <agent.version>3.3.0</agent.version>+ <slf4j.version>2.0.17</slf4j.version><logback.version>1.4.14</logback.version>- <antlr.version>4.7.2</antlr.version>- <jetty.version>9.4.57.v20241219</jetty.version>- <wicket.version>7.18.0</wicket.version>- <jersey.version>2.38</jersey.version>- <hibernate.version>5.4.24.Final</hibernate.version>+ <antlr.version>4.13.2</antlr.version>+ <jetty.version>12.1.13</jetty.version>+ <wicket.version>10.11.0</wicket.version>+ <jersey.version>4.0.2</jersey.version>+ <hibernate.version>7.4.8.Final</hibernate.version><lucene.version>8.7.0</lucene.version>- <shiro.version>1.13.0</shiro.version>- <jgit.version>6.10.1.202505221210-r</jgit.version>+ <shiro.version>3.0.1</shiro.version>+ <jgit.version>7.8.0.202609011348-r</jgit.version><flexmark.version>0.64.8</flexmark.version><groovy.version>3.0.25</groovy.version>- <servlet.version>3.1.0</servlet.version>- <jackson.version>2.18.8</jackson.version>+ <servlet.version>6.1.0</servlet.version>+ <jackson.version>2.22.2</jackson.version>+ <asm.version>9.10.1</asm.version>+ <hk2.version>4.0.2</hk2.version><tika.version>3.2.2</tika.version><langchain4j.version>1.14.1</langchain4j.version><bouncycastle.version>1.84</bouncycastle.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 0dbb530dd7..ffabe0324f 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -18,6 +18,12 @@</plugins></build><dependencies>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-tester</artifactId>+ <version>${wicket.version}</version>+ <scope>test</scope>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>commons-bootstrap</artifactId>@@ -57,8 +63,8 @@<artifactId>tika-core</artifactId></dependency><dependency>- <groupId>com.sun.mail</groupId>- <artifactId>javax.mail</artifactId>+ <groupId>org.eclipse.angus</groupId>+ <artifactId>jakarta.mail</artifactId></dependency><dependency><groupId>joda-time</groupId>@@ -96,6 +102,10 @@<groupId>org.quartz-scheduler</groupId><artifactId>quartz</artifactId><exclusions>+ <exclusion>+ <groupId>com.zaxxer</groupId>+ <artifactId>HikariCP-java7</artifactId>+ </exclusion><exclusion><groupId>com.mchange</groupId><artifactId>c3p0</artifactId>@@ -150,14 +160,8 @@</exclusion></exclusions></dependency>- <dependency>- <groupId>javax.xml.bind</groupId>- <artifactId>jaxb-api</artifactId>- </dependency>- <dependency>- <groupId>org.glassfish</groupId>- <artifactId>javax.el</artifactId>- </dependency>++<dependency><groupId>org.hsqldb</groupId><artifactId>hsqldb</artifactId>@@ -265,16 +269,24 @@<artifactId>jetty-server</artifactId></dependency><dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlets</artifactId>+ <groupId>org.eclipse.jetty.compression</groupId>+ <artifactId>jetty-compression-server</artifactId></dependency><dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlet</artifactId>+ <groupId>org.eclipse.jetty.compression</groupId>+ <artifactId>jetty-compression-gzip</artifactId>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.ee11</groupId>+ <artifactId>jetty-ee11-servlets</artifactId></dependency><dependency>- <groupId>org.eclipse.jetty.websocket</groupId>- <artifactId>websocket-server</artifactId>+ <groupId>org.eclipse.jetty.ee11</groupId>+ <artifactId>jetty-ee11-servlet</artifactId>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.ee11.websocket</groupId>+ <artifactId>jetty-ee11-websocket-jetty-server</artifactId></dependency><dependency><groupId>org.glassfish.jersey.containers</groupId>@@ -292,6 +304,10 @@<groupId>org.hibernate.validator</groupId><artifactId>hibernate-validator</artifactId></dependency>+ <dependency>+ <groupId>org.glassfish.expressly</groupId>+ <artifactId>expressly</artifactId>+ </dependency><dependency><groupId>org.apache.wicket</groupId><artifactId>wicket-core</artifactId>@@ -321,8 +337,8 @@<artifactId>wicket-guice</artifactId></dependency><dependency>- <groupId>commons-fileupload</groupId>- <artifactId>commons-fileupload</artifactId>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId></dependency><dependency><groupId>commons-validator</groupId>@@ -341,19 +357,11 @@<artifactId>guice-bridge</artifactId></dependency><dependency>- <groupId>org.hibernate</groupId>+ <groupId>org.hibernate.orm</groupId><artifactId>hibernate-core</artifactId></dependency><dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-jcache</artifactId>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-entitymanager</artifactId>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>+ <groupId>org.hibernate.orm</groupId><artifactId>hibernate-hikaricp</artifactId></dependency><dependency>@@ -397,6 +405,10 @@<groupId>com.hazelcast</groupId><artifactId>hazelcast</artifactId></dependency>+ <dependency>+ <groupId>com.hazelcast</groupId>+ <artifactId>hazelcast-hibernate53</artifactId>+ </dependency><dependency><groupId>com.google.code.gson</groupId><artifactId>gson</artifactId>@@ -407,10 +419,6 @@<artifactId>toml4j</artifactId><version>0.7.2</version></dependency>- <dependency>- <groupId>com.hazelcast</groupId>- <artifactId>hazelcast-hibernate53</artifactId>- </dependency><dependency><groupId>org.apache.commons</groupId><artifactId>commons-csv</artifactId>@@ -419,7 +427,6 @@<dependency><groupId>org.ow2.asm</groupId><artifactId>asm-util</artifactId>- <version>9.2</version></dependency><dependency><groupId>org.jetbrains.kotlin</groupId>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 184ff91c27..3c58e1aee1 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -15,21 +15,21 @@ import java.util.concurrent.SynchronousQueue;import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;-import javax.inject.Singleton;-import javax.persistence.EntityManager;-import javax.persistence.EntityManagerFactory;-import javax.persistence.JoinColumn;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Transient;-import javax.persistence.Version;-import javax.validation.Configuration;-import javax.validation.Path;-import javax.validation.Path.Node;-import javax.validation.TraversableResolver;-import javax.validation.Validation;-import javax.validation.Validator;-import javax.validation.ValidatorFactory;+import jakarta.inject.Singleton;+import jakarta.persistence.EntityManager;+import jakarta.persistence.EntityManagerFactory;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.OneToMany;+import jakarta.persistence.OneToOne;+import jakarta.persistence.Transient;+import jakarta.persistence.Version;+import jakarta.validation.Configuration;+import jakarta.validation.Path;+import jakarta.validation.Path.Node;+import jakarta.validation.TraversableResolver;+import jakarta.validation.Validation;+import jakarta.validation.Validator;+import jakarta.validation.ValidatorFactory;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.guice.aop.ShiroAopModule;@@ -42,19 +42,18 @@ import org.apache.shiro.web.servlet.ShiroFilter;import org.apache.wicket.Application;import org.apache.wicket.protocol.http.WicketFilter;import org.apache.wicket.protocol.http.WicketServlet;-import org.eclipse.jetty.server.session.SessionDataStoreFactory;+import org.eclipse.jetty.session.SessionDataStoreFactory;import org.glassfish.jersey.server.ResourceConfig;import org.glassfish.jersey.servlet.ServletContainer;-import org.hibernate.CallbackException;import org.hibernate.Interceptor;import org.hibernate.Session;import org.hibernate.SessionFactory;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;-import org.hibernate.collection.internal.PersistentBag;+import org.hibernate.collection.spi.PersistentBag;import org.hibernate.type.Type;import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.inject.matcher.AbstractMatcher;+import com.google.inject.matcher.Matcher;import com.google.inject.matcher.Matchers;import com.thoughtworks.xstream.XStream;import com.thoughtworks.xstream.annotations.XStreamOmitField;@@ -70,7 +69,6 @@ import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPlugin;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.StringUtils;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.ai.BuildSpecSchemaResource;import io.onedev.server.ai.ChatToolsContribution;@@ -383,6 +381,7 @@ import io.onedev.server.util.oauth.DefaultOAuthTokenService;import io.onedev.server.util.oauth.OAuthTokenService;import io.onedev.server.util.xstream.CollectionConverter;import io.onedev.server.util.xstream.HibernateProxyConverter;+import io.onedev.server.util.xstream.HibernateProxyMapper;import io.onedev.server.util.xstream.MapConverter;import io.onedev.server.util.xstream.ObjectMapperConverter;import io.onedev.server.util.xstream.ReflectionConverter;@@ -820,7 +819,7 @@ public class CoreModule extends AbstractPluginModule {TransactionInterceptor transactionInterceptor = new TransactionInterceptor();requestInjection(transactionInterceptor);- bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {+ bindInterceptor(Matchers.any(), new Matcher<AnnotatedElement>() {@Overridepublic boolean matches(AnnotatedElement element) {@@ -832,7 +831,7 @@ public class CoreModule extends AbstractPluginModule {SessionInterceptor sessionInterceptor = new SessionInterceptor();requestInjection(sessionInterceptor);- bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {+ bindInterceptor(Matchers.any(), new Matcher<AnnotatedElement>() {@Overridepublic boolean matches(AnnotatedElement element) {@@ -844,26 +843,23 @@ public class CoreModule extends AbstractPluginModule {contribute(PersistListener.class, new PersistListener() {@Override- public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)- throws CallbackException {+ public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {return false;}@Override- public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)- throws CallbackException {+ public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {return false;}@Overridepublic boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState,- String[] propertyNames, Type[] types) throws CallbackException {+ String[] propertyNames, Type[] types) {return false;}@Override- public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)- throws CallbackException {+ public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {}});@@ -878,7 +874,7 @@ public class CoreModule extends AbstractPluginModule {@Overrideprotected MapperWrapper wrapMapper(MapperWrapper next) {- return new MapperWrapper(next) {+ return new MapperWrapper(new HibernateProxyMapper(next)) {@Overridepublic boolean shouldSerializeMember(Class definedIn, String fieldName) {@@ -897,8 +893,6 @@ public class CoreModule extends AbstractPluginModule {return super.serializedClass(type);else if (type == PersistentBag.class)return super.serializedClass(ArrayList.class);- else if (type.getName().contains("$HibernateProxy$"))- return StringUtils.substringBefore(type.getName(), "$HibernateProxy$");elsereturn super.serializedClass(type);}diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 9c5ec2f8c8..e946399164 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -18,7 +18,7 @@ import java.util.List;import java.util.Set;import java.util.concurrent.ExecutorService;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.SystemUtils;import org.apache.wicket.request.Url;@@ -28,8 +28,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.inject.Provider;-import com.hazelcast.core.HazelcastInstance;-import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPlugin;import io.onedev.commons.loader.AppLoader;@@ -136,8 +134,7 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {sessionFactoryService.start();taskScheduler.start();- var databasePopulated = clusterService.getHazelcastInstance().getCPSubsystem()- .getAtomicLong("databasePopulated");+ var databasePopulated = clusterService.getAtomicLong("databasePopulated");// Do not use database lock as schema update will commit transaction immediately// in MySQLclusterService.initWithLead(databasePopulated, () -> {@@ -240,8 +237,7 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {}private List<ManualConfig> checkData() {- HazelcastInstance hazelcastInstance = clusterService.getHazelcastInstance();- var lock = hazelcastInstance.getCPSubsystem().getLock("checkData");+ var lock = clusterService.getLock("checkData");lock.lock();try {return dataService.checkData();diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.javaindex 8a0e61db69..8b7333143b 100644--- a/server-core/src/main/java/io/onedev/server/ServerConfig.java+++ b/server-core/src/main/java/io/onedev/server/ServerConfig.java@@ -111,16 +111,6 @@ public class ServerConfig {String dbHost = StringUtils.substringBefore(tempStr, "/");dbPorts.put(dbHost, 3306);}- } else if (dbUrl.startsWith("sqlserver")) {- if (tempStr.contains(":")) {- String dbHost = StringUtils.substringBefore(tempStr, ":");- tempStr = StringUtils.substringAfter(tempStr, ":");- tempStr = StringUtils.substringBefore(tempStr, ";");- dbPorts.put(dbHost, parseInt(tempStr));- } else {- String dbHost = StringUtils.substringBefore(tempStr, ";");- dbPorts.put(dbHost, 1433);- }} else {tempStr = StringUtils.substringBefore(tempStr, "/");for (var part: Splitter.on(",").omitEmptyStrings().trimResults().split(tempStr)) {diff --git a/server-core/src/main/java/io/onedev/server/agent/ServerSocket.java b/server-core/src/main/java/io/onedev/server/agent/ServerSocket.javaindex 592e9ac3af..13b27498d5 100644--- a/server-core/src/main/java/io/onedev/server/agent/ServerSocket.java+++ b/server-core/src/main/java/io/onedev/server/agent/ServerSocket.java@@ -1,16 +1,17 @@package io.onedev.server.agent;-import java.io.IOException;import java.io.Serializable;+import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;import java.util.concurrent.ExecutorService;import org.apache.commons.lang3.SerializationUtils;+import org.eclipse.jetty.websocket.api.Callback;import org.eclipse.jetty.websocket.api.Session;import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketOpen;import org.eclipse.jetty.websocket.api.annotations.WebSocket;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -37,7 +38,7 @@ import io.onedev.server.logging.LogService;import io.onedev.server.service.AgentService;import io.onedev.server.workspace.WorkspaceAgentShell;-@WebSocket+@WebSocket(autoDemand = true)public class ServerSocket {private static final Logger logger = LoggerFactory.getLogger(ServerSocket.class);@@ -55,8 +56,8 @@ public class ServerSocket {getAgentService().agentDisconnected(agentId);StringBuilder builder = new StringBuilder("Websocket closed (");- if (session != null && session.getRemoteAddress() != null)- builder.append("remote address: " + session.getRemoteAddress().toString() + ", ");+ if (session != null && session.getRemoteSocketAddress() != null)+ builder.append("remote address: " + session.getRemoteSocketAddress().toString() + ", ");builder.append("status code: " + statusCode);if (reason != null)builder.append(", reason: " + reason);@@ -69,10 +70,10 @@ public class ServerSocket {@OnWebSocketErrorpublic void onError(Throwable t) {if (session != null) {- logger.error("Websocket error (remote address: " + session.getRemoteAddress().toString() + ")", t);+ logger.error("Websocket error (remote address: " + session.getRemoteSocketAddress().toString() + ")", t);try {session.disconnect();- } catch (IOException e) {+ } catch (RuntimeException e) {}} else {logger.error("Websocket error", t);@@ -83,7 +84,7 @@ public class ServerSocket {return OneDev.getInstance(AgentService.class);}- @OnWebSocketConnect+ @OnWebSocketOpenpublic void onConnect(Session session) {this.session = session;try {@@ -92,107 +93,114 @@ public class ServerSocket {logger.error("Error sending websocket message", e);try {session.disconnect();- } catch (IOException ignored) {+ } catch (RuntimeException ignored) {}}}@OnWebSocketMessage- public void onMessage(byte[] bytes, int offset, int count) {- Message message = Message.of(bytes, offset, count);- byte[] messageData = message.getData();+ public void onMessage(ByteBuffer payload, Callback callback) {try {- switch (message.getType()) {- case AGENT_DATA:- // It is fine to deserialize from agent as they have valid agent token which can only- // be assigned via Administrator- AgentData data = SerializationUtils.deserialize(message.getData());- try {- agentId = getAgentService().agentConnected(data, session);- } catch (Exception e) {- var explicitException = ExceptionUtils.find(e, ExplicitException.class);- if (explicitException != null) {- new Message(MessageTypes.ERROR, e.getMessage()).sendBy(session);- } else {- logger.error("Error connecting agent", e);- new Message(MessageTypes.ERROR, "Internal server error, check log for details").sendBy(session);+ byte[] bytes = new byte[payload.remaining()];+ payload.get(bytes);+ Message message = Message.of(bytes, 0, bytes.length);+ byte[] messageData = message.getData();+ try {+ switch (message.getType()) {+ case AGENT_DATA:+ // It is fine to deserialize from agent as they have valid agent token which can only+ // be assigned via Administrator+ AgentData data = SerializationUtils.deserialize(message.getData());+ try {+ agentId = getAgentService().agentConnected(data, session);+ } catch (Exception e) {+ var explicitException = ExceptionUtils.find(e, ExplicitException.class);+ if (explicitException != null) {+ new Message(MessageTypes.ERROR, e.getMessage()).sendBy(session);+ } else {+ logger.error("Error connecting agent", e);+ new Message(MessageTypes.ERROR, "Internal server error, check log for details").sendBy(session);+ }}- }- break;- case REQUEST:- OneDev.getInstance(ExecutorService.class).execute(() -> {+ break;+ case REQUEST:+ OneDev.getInstance(ExecutorService.class).execute(() -> {+ try {+ CallData request = SerializationUtils.deserialize(messageData);+ CallData response = new CallData(request.getUuid(), service(request.getPayload()));+ new Message(MessageTypes.RESPONSE, response).sendBy(session);+ } catch (Exception e) {+ logger.error("Error processing websocket request", e);+ }+ });+ break;+ case RESPONSE:+ WebsocketUtils.onResponse(SerializationUtils.deserialize(messageData));+ break;+ case LOG:try {- CallData request = SerializationUtils.deserialize(messageData);- CallData response = new CallData(request.getUuid(), service(request.getPayload()));- new Message(MessageTypes.RESPONSE, response).sendBy(session);+ String dataString = new String(messageData, StandardCharsets.UTF_8);+ String token = StringUtils.substringBefore(dataString, ":");+ String remaining = StringUtils.substringAfter(dataString, ":");+ String sessionId = StringUtils.substringBefore(remaining, ":");+ if (sessionId.length() == 0)+ sessionId = null;+ String logMessage = StringUtils.substringAfter(remaining, ":");+ TaskLogger logger = OneDev.getInstance(LogService.class).getLogger(token);+ if (logger != null)+ logger.log(logMessage, sessionId);} catch (Exception e) {- logger.error("Error processing websocket request", e);+ logger.error("Error processing job log", e);}- });- break;- case RESPONSE:- WebsocketUtils.onResponse(SerializationUtils.deserialize(messageData));- break;- case LOG:- try {+ break;+ case REPORT_JOB_WORKDIR:String dataString = new String(messageData, StandardCharsets.UTF_8);- String token = StringUtils.substringBefore(dataString, ":");- String remaining = StringUtils.substringAfter(dataString, ":");- String sessionId = StringUtils.substringBefore(remaining, ":");- if (sessionId.length() == 0)- sessionId = null;- String logMessage = StringUtils.substringAfter(remaining, ":");- TaskLogger logger = OneDev.getInstance(LogService.class).getLogger(token);- if (logger != null)- logger.log(logMessage, sessionId);- } catch (Exception e) {- logger.error("Error processing job log", e);+ String jobToken = StringUtils.substringBefore(dataString, ":");+ String jobWorkDir = StringUtils.substringAfter(dataString, ":");+ JobContext jobContext = getJobService().getJobContext(jobToken, false);+ if (jobContext != null)+ getJobService().reportJobWorkDir(jobContext, jobWorkDir);+ break;+ case JOB_SHELL_EXIT: {+ String sessionId = new String(messageData, StandardCharsets.UTF_8);+ JobAgentShell jobShell = (JobAgentShell) getJobService().getShell(sessionId);+ if (jobShell != null)+ jobShell.getTerminal().onShellExit();+ break;}- break;- case REPORT_JOB_WORKDIR:- String dataString = new String(messageData, StandardCharsets.UTF_8);- String jobToken = StringUtils.substringBefore(dataString, ":");- String jobWorkDir = StringUtils.substringAfter(dataString, ":");- JobContext jobContext = getJobService().getJobContext(jobToken, false);- if (jobContext != null)- getJobService().reportJobWorkDir(jobContext, jobWorkDir);- break;- case JOB_SHELL_EXIT: {- String sessionId = new String(messageData, StandardCharsets.UTF_8);- JobAgentShell jobShell = (JobAgentShell) getJobService().getShell(sessionId);- if (jobShell != null)- jobShell.getTerminal().onShellExit();- break;- }- case JOB_SHELL_OUTPUT: {- JobShellOutputRequest jobShellOutputRequest = SerializationUtils.deserialize(messageData);- JobAgentShell jobShell = (JobAgentShell) getJobService().getShell(jobShellOutputRequest.getSessionId());- if (jobShell != null)- jobShell.getTerminal().onShellOutput(jobShellOutputRequest.getBase64Data());- break;- }- case WORKSPACE_SHELL_EXIT: {- String sessionId = new String(messageData, StandardCharsets.UTF_8);- WorkspaceAgentShell workspaceShell = WorkspaceAgentShell.get(sessionId);- if (workspaceShell != null)- workspaceShell.getTerminal().onShellExit();- break;+ case JOB_SHELL_OUTPUT: {+ JobShellOutputRequest jobShellOutputRequest = SerializationUtils.deserialize(messageData);+ JobAgentShell jobShell = (JobAgentShell) getJobService().getShell(jobShellOutputRequest.getSessionId());+ if (jobShell != null)+ jobShell.getTerminal().onShellOutput(jobShellOutputRequest.getBase64Data());+ break;+ }+ case WORKSPACE_SHELL_EXIT: {+ String sessionId = new String(messageData, StandardCharsets.UTF_8);+ WorkspaceAgentShell workspaceShell = WorkspaceAgentShell.get(sessionId);+ if (workspaceShell != null)+ workspaceShell.getTerminal().onShellExit();+ break;+ }+ case WORKSPACE_SHELL_OUTPUT: {+ WorkspaceShellOutputRequest workspaceShellOutputRequest = SerializationUtils.deserialize(messageData);+ WorkspaceAgentShell workspaceShell = WorkspaceAgentShell.get(workspaceShellOutputRequest.getSessionId());+ if (workspaceShell != null)+ workspaceShell.getTerminal().onShellOutput(workspaceShellOutputRequest.getBase64Data());+ break;+ }+ default:}- case WORKSPACE_SHELL_OUTPUT: {- WorkspaceShellOutputRequest workspaceShellOutputRequest = SerializationUtils.deserialize(messageData);- WorkspaceAgentShell workspaceShell = WorkspaceAgentShell.get(workspaceShellOutputRequest.getSessionId());- if (workspaceShell != null)- workspaceShell.getTerminal().onShellOutput(workspaceShellOutputRequest.getBase64Data());- break;+ } catch (Exception e) {+ logger.error("Error processing websocket message (remote address: " + session.getRemoteSocketAddress().toString() + ")", e);+ try {+ session.disconnect();+ } catch (Exception e2) {}- default:- }- } catch (Exception e) {- logger.error("Error processing websocket message (remote address: " + session.getRemoteAddress().toString() + ")", e);- try {- session.disconnect();- } catch (IOException e2) {}+ callback.succeed();+ } catch (Throwable t) {+ callback.fail(t);}}diff --git a/server-core/src/main/java/io/onedev/server/agent/ServerSocketServlet.java b/server-core/src/main/java/io/onedev/server/agent/ServerSocketServlet.javaindex 5c5031905b..5af7a96e13 100644--- a/server-core/src/main/java/io/onedev/server/agent/ServerSocketServlet.java+++ b/server-core/src/main/java/io/onedev/server/agent/ServerSocketServlet.java@@ -1,17 +1,18 @@package io.onedev.server.agent;-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;+import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;import java.io.IOException;+import java.time.Duration;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;-import org.eclipse.jetty.websocket.servlet.WebSocketServlet;-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServlet;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServletFactory;import io.onedev.agent.Agent;import io.onedev.server.OneDev;@@ -20,7 +21,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.AgentTokenService;@Singleton-public class ServerSocketServlet extends WebSocketServlet {+public class ServerSocketServlet extends JettyWebSocketServlet {private static final long serialVersionUID = 1L;@@ -28,11 +29,11 @@ public class ServerSocketServlet extends WebSocketServlet {private AgentTokenService tokenService;@Override- public void configure(WebSocketServletFactory factory) {+ public void configure(JettyWebSocketServletFactory factory) {factory.register(ServerSocket.class);- factory.getPolicy().setIdleTimeout(Agent.SOCKET_IDLE_TIMEOUT);- factory.getPolicy().setMaxBinaryMessageSize(Agent.MAX_MESSAGE_BYTES);- factory.getPolicy().setMaxTextMessageSize(Agent.MAX_MESSAGE_BYTES);+ factory.setIdleTimeout(Duration.ofMillis(Agent.SOCKET_IDLE_TIMEOUT));+ factory.setMaxBinaryMessageSize(Agent.MAX_MESSAGE_BYTES);+ factory.setMaxTextMessageSize(Agent.MAX_MESSAGE_BYTES);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchemaResource.java b/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchemaResource.javaindex 1fdcb12c21..36042d32f8 100644--- a/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchemaResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/BuildSpecSchemaResource.java@@ -1,11 +1,11 @@package io.onedev.server.ai;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.javaindex 249dab54fb..5e528040b8 100644--- a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java+++ b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java@@ -19,8 +19,8 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.subject.Subject;@@ -29,14 +29,14 @@ import org.apache.wicket.Application;import org.apache.wicket.Page;import org.apache.wicket.protocol.ws.WebSocketSettings;import org.apache.wicket.protocol.ws.api.registry.PageIdKey;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterAtomicLong;import dev.langchain4j.data.message.AiMessage;import dev.langchain4j.data.message.SystemMessage;@@ -133,9 +133,9 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatS* Use cluster wide id for anonymous chats and messages as we use id to route* websocket observable changes to correct connections*/- private volatile IAtomicLong nextAnonymousChatId;+ private volatile ClusterAtomicLong nextAnonymousChatId;- private volatile IAtomicLong nextAnonymousChatMessageId;+ private volatile ClusterAtomicLong nextAnonymousChatMessageId;private final Map<String, Map<Long, ChatRespondingImpl>> respondings = new ConcurrentHashMap<>();@@ -523,8 +523,8 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatS@Listenpublic void on(SystemStarting event) {- nextAnonymousChatId = clusterService.getHazelcastInstance().getCPSubsystem().getAtomicLong("nextAnonymousChatId");- nextAnonymousChatMessageId = clusterService.getHazelcastInstance().getCPSubsystem().getAtomicLong("nextAnonymousChatMessageId");+ nextAnonymousChatId = clusterService.getAtomicLong("nextAnonymousChatId");+ nextAnonymousChatMessageId = clusterService.getAtomicLong("nextAnonymousChatMessageId");if (clusterService.isLeaderServer()) {nextAnonymousChatId.set(1L);nextAnonymousChatMessageId.set(1L);diff --git a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.javaindex d8abe38424..e99b01aa2a 100644--- a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java+++ b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java@@ -225,7 +225,7 @@ public class IssueHelper {public static void setFieldValues(Map<String, Serializable> data, JsonNode fieldsNode) {if (fieldsNode == null || !fieldsNode.isObject())return;- var fields = fieldsNode.fields();+ var fields = fieldsNode.properties().iterator();while (fields.hasNext()) {var entry = fields.next();setFieldValue(data, entry.getKey(), entry.getValue());diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.javaindex e32363ac13..3d900aedad 100644--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java@@ -1,6 +1,6 @@package io.onedev.server.ai;-import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;+import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE;import static org.apache.commons.lang3.StringUtils.trimToNull;import static org.unbescape.html.HtmlEscape.escapeHtml5;@@ -18,23 +18,23 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.EntityNotFoundException;-import javax.validation.Valid;-import javax.validation.Validator;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.EntityNotFoundException;+import jakarta.validation.Valid;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;@@ -563,7 +563,7 @@ public class TodResource {public Map<String, Object> createIssue(@QueryParam("currentProject") @NotNull String currentProjectPath,@QueryParam("project") String projectPath,- @NotNull @Valid Map<String, Serializable> data) {+ @NotNull Map<String, @Valid Serializable> data) {var subject = SecurityUtils.getSubject();if (SecurityUtils.getUser(subject) == null)throw new UnauthenticatedException();@@ -1676,7 +1676,7 @@ public class TodResource {@POSTpublic Map<String, Object> runJob(@QueryParam("currentProject") @NotNull String currentProjectPath,- @NotNull @Valid Map<String, Serializable> data) {+ @NotNull Map<String, @Valid Serializable> data) {var subject = SecurityUtils.getSubject();var user = SecurityUtils.getUser(subject);diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/code/CommitDetailTool.java b/server-core/src/main/java/io/onedev/server/ai/tools/code/CommitDetailTool.javaindex 9129eda00c..f8482eab6a 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/code/CommitDetailTool.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/code/CommitDetailTool.java@@ -1,5 +1,7 @@package io.onedev.server.ai.tools.code;+import java.util.Date;+import static io.onedev.server.ai.ToolUtils.convertToJson;import java.util.List;@@ -52,11 +54,11 @@ public abstract class CommitDetailTool implements TaskTool {"author", Map.of("name", authorIdent.getName(),"emailAddress", authorIdent.getEmailAddress(),- "date", authorIdent.getWhen()),+ "date", Date.from(authorIdent.getWhenAsInstant())),"committer", Map.of("name", committerIdent.getName(),"emailAddress", committerIdent.getEmailAddress(),- "date", committerIdent.getWhen()),+ "date", Date.from(committerIdent.getWhenAsInstant())),"parents", List.of(commit.getParents()).stream().map(RevCommit::name).toList(),"link", OneDev.getInstance(UrlService.class).urlFor(project, commit.copy(), true));}diff --git a/server-core/src/main/java/io/onedev/server/annotation/AgentQuery.java b/server-core/src/main/java/io/onedev/server/annotation/AgentQuery.javaindex 63d0305a47..c4ebd876eb 100644--- a/server-core/src/main/java/io/onedev/server/annotation/AgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/AgentQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.AgentQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/AttributeName.java b/server-core/src/main/java/io/onedev/server/annotation/AttributeName.javaindex 9c27b0eb29..1bfb826499 100644--- a/server-core/src/main/java/io/onedev/server/annotation/AttributeName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/AttributeName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.AttributeNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/BranchName.java b/server-core/src/main/java/io/onedev/server/annotation/BranchName.javaindex 25ddcf5fe6..49d1ab108d 100644--- a/server-core/src/main/java/io/onedev/server/annotation/BranchName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/BranchName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.BranchNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/BuildQuery.java b/server-core/src/main/java/io/onedev/server/annotation/BuildQuery.javaindex 12db663aab..53f1ccdee5 100644--- a/server-core/src/main/java/io/onedev/server/annotation/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/BuildQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.BuildQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ClassValidating.java b/server-core/src/main/java/io/onedev/server/annotation/ClassValidating.javaindex 49878ced5b..d819b6e2a8 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ClassValidating.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ClassValidating.java@@ -6,8 +6,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ClassValidatingValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Code.java b/server-core/src/main/java/io/onedev/server/annotation/Code.javaindex fa375871ba..9ef81965fe 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Code.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Code.java@@ -13,7 +13,7 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Payload;+import jakarta.validation.Payload;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)diff --git a/server-core/src/main/java/io/onedev/server/annotation/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/annotation/CodeCommentQuery.javaindex e427d44fa5..3c551a8055 100644--- a/server-core/src/main/java/io/onedev/server/annotation/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/CodeCommentQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.CodeCommentQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/CommitHash.java b/server-core/src/main/java/io/onedev/server/annotation/CommitHash.javaindex 7cfbf09c5d..1cf2053a38 100644--- a/server-core/src/main/java/io/onedev/server/annotation/CommitHash.java+++ b/server-core/src/main/java/io/onedev/server/annotation/CommitHash.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.CommitHashValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/CommitQuery.java b/server-core/src/main/java/io/onedev/server/annotation/CommitQuery.javaindex ad5418336b..b122dedbfc 100644--- a/server-core/src/main/java/io/onedev/server/annotation/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/CommitQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.CommitQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/CronExpression.java b/server-core/src/main/java/io/onedev/server/annotation/CronExpression.javaindex 02ce83189e..284bcb01d2 100644--- a/server-core/src/main/java/io/onedev/server/annotation/CronExpression.java+++ b/server-core/src/main/java/io/onedev/server/annotation/CronExpression.java@@ -12,8 +12,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.CronExpressionValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/CurrentPassword.java b/server-core/src/main/java/io/onedev/server/annotation/CurrentPassword.javaindex 34594178eb..a5b141cf2a 100644--- a/server-core/src/main/java/io/onedev/server/annotation/CurrentPassword.java+++ b/server-core/src/main/java/io/onedev/server/annotation/CurrentPassword.java@@ -12,8 +12,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.CurrentPasswordValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/DataDirectory.java b/server-core/src/main/java/io/onedev/server/annotation/DataDirectory.javaindex 4a7e17f2e5..0667f915bb 100644--- a/server-core/src/main/java/io/onedev/server/annotation/DataDirectory.java+++ b/server-core/src/main/java/io/onedev/server/annotation/DataDirectory.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.DataDirectoryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/DnsName.java b/server-core/src/main/java/io/onedev/server/annotation/DnsName.javaindex 9721a9e4b4..a0b57dcffd 100644--- a/server-core/src/main/java/io/onedev/server/annotation/DnsName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/DnsName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.DnsNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/EnvVarName.java b/server-core/src/main/java/io/onedev/server/annotation/EnvVarName.javaindex 315f259149..d011acbe7f 100644--- a/server-core/src/main/java/io/onedev/server/annotation/EnvVarName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/EnvVarName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.EnvNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/FieldName.java b/server-core/src/main/java/io/onedev/server/annotation/FieldName.javaindex 28c3cf59d2..8e7594de7d 100644--- a/server-core/src/main/java/io/onedev/server/annotation/FieldName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/FieldName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.FieldNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/GroupName.java b/server-core/src/main/java/io/onedev/server/annotation/GroupName.javaindex ea9b1de984..d8945d24bc 100644--- a/server-core/src/main/java/io/onedev/server/annotation/GroupName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/GroupName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.GroupNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Interpolative.java b/server-core/src/main/java/io/onedev/server/annotation/Interpolative.javaindex 37e8231b33..2c4a24eb3b 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Interpolative.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Interpolative.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.InterpolativeValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.javaindex d80b6c2cda..4d58267173 100644--- a/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.IssueQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/JobMatch.java b/server-core/src/main/java/io/onedev/server/annotation/JobMatch.javaindex bc323693c9..5c208798c9 100644--- a/server-core/src/main/java/io/onedev/server/annotation/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/annotation/JobMatch.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.JobMatchValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/NoSpace.java b/server-core/src/main/java/io/onedev/server/annotation/NoSpace.javaindex 686f84ec8d..cef09c9db8 100644--- a/server-core/src/main/java/io/onedev/server/annotation/NoSpace.java+++ b/server-core/src/main/java/io/onedev/server/annotation/NoSpace.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.NoSpaceValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/annotation/NotificationReceiver.javaindex 758536c2cf..5d47ef29e0 100644--- a/server-core/src/main/java/io/onedev/server/annotation/NotificationReceiver.java+++ b/server-core/src/main/java/io/onedev/server/annotation/NotificationReceiver.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.NotificationReceiverValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Numeric.java b/server-core/src/main/java/io/onedev/server/annotation/Numeric.javaindex b3fff61f65..4939402948 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Numeric.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Numeric.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.NumericValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/PackQuery.java b/server-core/src/main/java/io/onedev/server/annotation/PackQuery.javaindex d6a723c374..fe2a63203e 100644--- a/server-core/src/main/java/io/onedev/server/annotation/PackQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/PackQuery.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.PackQueryValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ParamName.java b/server-core/src/main/java/io/onedev/server/annotation/ParamName.javaindex 257518f432..b1e3654a0f 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ParamName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ParamName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ParamNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Password.java b/server-core/src/main/java/io/onedev/server/annotation/Password.javaindex 569a4b5766..394246354d 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Password.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Password.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.PasswordValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Path.java b/server-core/src/main/java/io/onedev/server/annotation/Path.javaindex 5e0cc3d4ab..b65d113f10 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Path.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Path.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.PathValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/PathSegment.java b/server-core/src/main/java/io/onedev/server/annotation/PathSegment.javaindex 1f5db809b0..68d3a32638 100644--- a/server-core/src/main/java/io/onedev/server/annotation/PathSegment.java+++ b/server-core/src/main/java/io/onedev/server/annotation/PathSegment.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.PathSegmentValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/Patterns.java b/server-core/src/main/java/io/onedev/server/annotation/Patterns.javaindex 8a4d733371..3829eeadbf 100644--- a/server-core/src/main/java/io/onedev/server/annotation/Patterns.java+++ b/server-core/src/main/java/io/onedev/server/annotation/Patterns.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.PatternsValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ProjectKey.java b/server-core/src/main/java/io/onedev/server/annotation/ProjectKey.javaindex 04a40c307c..502a6337a2 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ProjectKey.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ProjectKey.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.ProjectKeyValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ProjectName.java b/server-core/src/main/java/io/onedev/server/annotation/ProjectName.javaindex c885a9762a..a1609a4408 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ProjectName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ProjectName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ProjectNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ProjectPath.java b/server-core/src/main/java/io/onedev/server/annotation/ProjectPath.javaindex 02706c4c96..0a177e0887 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ProjectPath.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ProjectPath.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ProjectPathValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/annotation/ProjectQuery.javaindex 74ade7e481..77c51edca5 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ProjectQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ProjectQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/annotation/PullRequestQuery.javaindex 5cafc9b1bb..04c2a0e788 100644--- a/server-core/src/main/java/io/onedev/server/annotation/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/PullRequestQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.PullRequestQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/RegExp.java b/server-core/src/main/java/io/onedev/server/annotation/RegExp.javaindex 608bafbf7c..a1681802a8 100644--- a/server-core/src/main/java/io/onedev/server/annotation/RegExp.java+++ b/server-core/src/main/java/io/onedev/server/annotation/RegExp.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.RegExpValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ReservedOptions.java b/server-core/src/main/java/io/onedev/server/annotation/ReservedOptions.javaindex a7481fcce9..76e5800a14 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ReservedOptions.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ReservedOptions.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.ReservedOptionsValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/annotation/ReviewRequirement.javaindex 345ab03f33..472b6b2059 100644--- a/server-core/src/main/java/io/onedev/server/annotation/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/annotation/ReviewRequirement.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.ReviewRequirementValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/RoleName.java b/server-core/src/main/java/io/onedev/server/annotation/RoleName.javaindex c589e693fe..9d458a8c70 100644--- a/server-core/src/main/java/io/onedev/server/annotation/RoleName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/RoleName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.RoleNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/TagName.java b/server-core/src/main/java/io/onedev/server/annotation/TagName.javaindex c52484fd0f..6adbc98e32 100644--- a/server-core/src/main/java/io/onedev/server/annotation/TagName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/TagName.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.TagNameValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/UrlPath.java b/server-core/src/main/java/io/onedev/server/annotation/UrlPath.javaindex 739fe1737f..f5d0b8e6a9 100644--- a/server-core/src/main/java/io/onedev/server/annotation/UrlPath.java+++ b/server-core/src/main/java/io/onedev/server/annotation/UrlPath.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.UrlPathValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/UrlSegment.java b/server-core/src/main/java/io/onedev/server/annotation/UrlSegment.javaindex 8e1b88f49e..66663e2e46 100644--- a/server-core/src/main/java/io/onedev/server/annotation/UrlSegment.java+++ b/server-core/src/main/java/io/onedev/server/annotation/UrlSegment.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.UrlSegmentValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/UserMatch.java b/server-core/src/main/java/io/onedev/server/annotation/UserMatch.javaindex fa2a1448b7..6667d9cbb2 100644--- a/server-core/src/main/java/io/onedev/server/annotation/UserMatch.java+++ b/server-core/src/main/java/io/onedev/server/annotation/UserMatch.java@@ -2,8 +2,8 @@ package io.onedev.server.annotation;import io.onedev.server.validation.validator.UserMatchValidator;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;diff --git a/server-core/src/main/java/io/onedev/server/annotation/UserName.java b/server-core/src/main/java/io/onedev/server/annotation/UserName.javaindex 4750e02384..486c53655d 100644--- a/server-core/src/main/java/io/onedev/server/annotation/UserName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/UserName.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.UserNameValidator;diff --git a/server-core/src/main/java/io/onedev/server/annotation/WorkspaceQuery.java b/server-core/src/main/java/io/onedev/server/annotation/WorkspaceQuery.javaindex afcc737729..1743d77289 100644--- a/server-core/src/main/java/io/onedev/server/annotation/WorkspaceQuery.java+++ b/server-core/src/main/java/io/onedev/server/annotation/WorkspaceQuery.java@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;-import javax.validation.Constraint;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.Payload;import io.onedev.server.validation.validator.WorkspaceQueryValidator;diff --git a/server-core/src/main/java/io/onedev/server/assets/AssetServlet.java b/server-core/src/main/java/io/onedev/server/assets/AssetServlet.javaindex 906bc96848..257ae764fd 100644--- a/server-core/src/main/java/io/onedev/server/assets/AssetServlet.java+++ b/server-core/src/main/java/io/onedev/server/assets/AssetServlet.java@@ -3,21 +3,15 @@ package io.onedev.server.assets;import java.io.IOException;import java.net.URL;-import javax.servlet.DispatcherType;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpServletResponseWrapper;+import jakarta.servlet.DispatcherType;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.commons.lang3.StringUtils;-import org.eclipse.jetty.http.HttpContent;-import org.eclipse.jetty.http.HttpFields;-import org.eclipse.jetty.http.HttpHeader;-import org.eclipse.jetty.server.ResourceService;-import org.eclipse.jetty.server.Response;-import org.eclipse.jetty.servlet.DefaultServlet;-import org.eclipse.jetty.servlet.ServletContextHandler;-import org.eclipse.jetty.servlet.ServletMapping;+import org.eclipse.jetty.ee11.servlet.ResourceServlet;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletMapping;import org.eclipse.jetty.util.resource.Resource;import io.onedev.commons.bootstrap.Bootstrap;@@ -27,58 +21,49 @@ import io.onedev.commons.bootstrap.Bootstrap;* @author robin**/-public abstract class AssetServlet extends DefaultServlet {+public abstract class AssetServlet extends ResourceServlet {private static final long serialVersionUID = 1L;- private static ThreadLocal<HttpServletRequest> requestHolder = new ThreadLocal<HttpServletRequest>();+ private org.eclipse.jetty.util.resource.ResourceFactory.Closeable resourceFactory;++ private org.eclipse.jetty.http.content.ValidatingCachingHttpContentFactory contentFactory;++ @Override+ public void init() throws ServletException {+ super.init();+ resourceFactory = org.eclipse.jetty.util.resource.ResourceFactory.closeable();+ var context = ServletContextHandler.getServletContextHandler(getServletContext());+ var pool = new org.eclipse.jetty.io.ByteBufferPool.Sized(context.getServer().getByteBufferPool());+ contentFactory = new org.eclipse.jetty.http.content.ValidatingCachingHttpContentFactory(path -> {+ Resource resource = getResource(org.eclipse.jetty.util.URIUtil.decodePath(path));+ if (resource == null || !resource.exists())+ return null;+ String type = context.getMimeTypes().getMimeByExtension(path);+ if (path.endsWith(".mjs"))+ type = "text/javascript";+ else if (path.equals("/prefetch.json"))+ type = "application/speculationrules+json";+ return new org.eclipse.jetty.http.content.ResourceHttpContent(resource, type, pool);+ }, 1000, pool);+ contentFactory.setMaxCacheSize(Integer.parseInt(getInitParameter("maxCacheSize")));+ contentFactory.setMaxCachedFileSize(Integer.parseInt(getInitParameter("maxCachedFileSize")));+ contentFactory.setMaxCachedFiles(Integer.parseInt(getInitParameter("maxCachedFiles")));+ getResourceService().setHttpContentFactory(contentFactory);+ }++ @Override+ public void destroy() {+ try {+ super.destroy();+ } finally {+ if (contentFactory != null)+ contentFactory.flushCache();+ if (resourceFactory != null)+ resourceFactory.close();+ }+ }- public AssetServlet() {- super(new ResourceService() {-- @Override- protected void putHeaders(HttpServletResponse response, HttpContent content, long contentLength) {- super.putHeaders(response, content, contentLength);-- HttpFields fields;- if (response instanceof Response)- fields = ((Response) response).getHttpFields();- else- fields = ((Response)((HttpServletResponseWrapper) response).getResponse()).getHttpFields();-- HttpServletRequest request = requestHolder.get();- if (request == null)- return;-- String requestUri = request.getRequestURI();- if (request.getDispatcherType() == DispatcherType.ERROR) {- /*- * Do not cache error page and also makes sure that error page is not eligible for- * modification check. That is, error page will be always retrieved.- */- fields.put(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");- } else if (requestUri.equals("/favicon.ico")) {- /*- * Make sure favicon request is cached. Otherwise, it will be requested for every- * page request.- */- fields.put(HttpHeader.CACHE_CONTROL, "max-age=86400,public");- } else if (requestUri.equals("/prefetch.json")) {- fields.put(HttpHeader.CONTENT_TYPE, "application/speculationrules+json");- }-- /*- * Some browsers enforce a JavaScript MIME type for module scripts. Jetty's default- * mime mapping does not always include .mjs, which breaks dynamic imports (for- * instance, pdf.js modules).- */- if (requestUri.endsWith(".mjs"))- fields.put(HttpHeader.CONTENT_TYPE, "text/javascript");- }-- });- }-@Overridepublic String getInitParameter(String name) {String value = super.getInitParameter(name);@@ -95,20 +80,26 @@ public abstract class AssetServlet extends DefaultServlet {return "false";if (name.equals("dirAllowed"))return "false";- if (name.equals("cacheControl")) {- if (!Bootstrap.sandboxMode || Bootstrap.prodMode)- return "max-age=86400,public";- else- return "must-revalidate,no-cache,no-store";- }+return null;}}- @Override+ @Override+ protected String getEncodedPathInContext(HttpServletRequest request, boolean included) {+ String servletPath = included+ ? (String) request.getAttribute(jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH)+ : request.getServletPath();+ String pathInfo = included+ ? (String) request.getAttribute(jakarta.servlet.RequestDispatcher.INCLUDE_PATH_INFO)+ : request.getPathInfo();+ if (servletPath == null)+ servletPath = request.getServletPath();+ return org.eclipse.jetty.util.URIUtil.encodePath(servletPath + (pathInfo != null ? pathInfo : ""));+ }+public final Resource getResource(String pathInContext) {- ServletContextHandler.Context context = (ServletContextHandler.Context) getServletContext();- ServletContextHandler contextHandler = (ServletContextHandler) context.getContextHandler();+ ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(getServletContext());for (ServletMapping mapping: contextHandler.getServletHandler().getServletMappings()) {if (mapping.getServletName().equals(getServletName())) {@@ -129,7 +120,8 @@ public abstract class AssetServlet extends DefaultServlet {}if (relativePath != null) {relativePath = StringUtils.stripStart(relativePath, "/");- Resource resource = Resource.newResource(loadResource(relativePath));+ URL url = loadResource(relativePath);+ Resource resource = url != null ? resourceFactory.newResource(url) : null;if (resource != null && resource.exists())return resource;}@@ -153,14 +145,17 @@ public abstract class AssetServlet extends DefaultServlet {*/protected abstract URL loadResource(String relativePath);- @Override- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {- try {- requestHolder.set(request);- super.service(request, response);- } finally {- requestHolder.remove();- }- }-+ @Override+ protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {+ String cacheControl = getInitParameter("cacheControl");+ if (cacheControl == null)+ cacheControl = !Bootstrap.sandboxMode || Bootstrap.prodMode+ ? "max-age=86400,public" : "must-revalidate,no-cache,no-store";+ if (request.getDispatcherType() == DispatcherType.ERROR)+ cacheControl = "must-revalidate,no-cache,no-store";+ else if (request.getRequestURI().equals("/favicon.ico"))+ cacheControl = "max-age=86400,public";+ response.setHeader("Cache-Control", cacheControl);+ super.service(request, response);+ }}diff --git a/server-core/src/main/java/io/onedev/server/assets/AssetsSyncManager.java b/server-core/src/main/java/io/onedev/server/assets/AssetsSyncManager.javaindex 7ad13906b4..0457621fc7 100644--- a/server-core/src/main/java/io/onedev/server/assets/AssetsSyncManager.java+++ b/server-core/src/main/java/io/onedev/server/assets/AssetsSyncManager.java@@ -2,8 +2,8 @@ package io.onedev.server.assets;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/attachment/AttachmentTooLargeException.java b/server-core/src/main/java/io/onedev/server/attachment/AttachmentTooLargeException.javaindex cd45fb2045..cad9fc098e 100644--- a/server-core/src/main/java/io/onedev/server/attachment/AttachmentTooLargeException.java+++ b/server-core/src/main/java/io/onedev/server/attachment/AttachmentTooLargeException.java@@ -2,7 +2,7 @@ package io.onedev.server.attachment;import io.onedev.server.exception.HttpResponseAwareException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class AttachmentTooLargeException extends HttpResponseAwareException {diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.javaindex df598eb2b1..c9312201bb 100644--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentService.java@@ -6,7 +6,7 @@ import static io.onedev.k8shelper.KubernetesHelper.BEARER;import static io.onedev.server.model.Project.ATTACHMENT_DIR;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static io.onedev.server.util.SiteSyncUtils.isVersionFile;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import java.io.BufferedOutputStream;import java.io.File;@@ -22,16 +22,16 @@ import java.util.HashSet;import java.util.List;import java.util.UUID;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.glassfish.jersey.client.ClientProperties;import org.quartz.CronScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 75add3d360..578182a8fb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -14,11 +14,11 @@ import java.util.Stack;import java.util.function.Consumer;import java.util.function.Function;-import javax.validation.ConstraintValidatorContext;-import javax.validation.ConstraintViolation;-import javax.validation.Valid;-import javax.validation.ValidationException;-import javax.validation.Validator;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Valid;+import jakarta.validation.ValidationException;+import jakarta.validation.Validator;import org.apache.commons.lang3.SerializationUtils;import org.jspecify.annotations.Nullable;@@ -118,8 +118,7 @@ public class BuildSpec implements Serializable, Validatable {private transient Map<String, JobProperty> propertyMap;@Editable- @Valid- public List<Job> getJobs() {+ public List<@Valid Job> getJobs() {return jobs;}@@ -129,8 +128,7 @@ public class BuildSpec implements Serializable, Validatable {}@Editable- @Valid- public List<StepTemplate> getStepTemplates() {+ public List<@Valid StepTemplate> getStepTemplates() {return stepTemplates;}@@ -140,8 +138,7 @@ public class BuildSpec implements Serializable, Validatable {}@Editable- @Valid- public List<Service> getServices() {+ public List<@Valid Service> getServices() {return services;}@@ -151,8 +148,7 @@ public class BuildSpec implements Serializable, Validatable {}@Editable- @Valid- public List<JobProperty> getProperties() {+ public List<@Valid JobProperty> getProperties() {return properties;}@@ -162,8 +158,7 @@ public class BuildSpec implements Serializable, Validatable {}@Editable- @Valid- public List<Import> getImports() {+ public List<@Valid Import> getImports() {return imports;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javaindex 14a756282d..6555e1e94b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -11,11 +11,11 @@ import java.util.Stack;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.ConstraintViolation;-import javax.validation.ValidationException;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.ValidationException;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.revwalk.RevCommit;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Service.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.javaindex 4886bf20fe..1213c06a2d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Service.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java@@ -6,9 +6,9 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;@@ -89,8 +89,7 @@ public class Service implements NamedElement {@Editable(order=300, name="Environment Variables", description="Optionally specify environment variables of "+ "the service")- @Valid- public List<EnvVar> getEnvVars() {+ public List<@Valid EnvVar> getEnvVars() {return envVars;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.javaindex 9d6b16f632..8117a2c950 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex c715d2f942..b180e60668 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -17,10 +17,10 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.eclipse.jgit.lib.ObjectId;import org.jspecify.annotations.Nullable;@@ -186,8 +186,7 @@ public class Job implements NamedElement, Validatable {}@Editable(order=200, description="Steps will be executed serially on same node, sharing the same <a href='https://docs.onedev.io/concepts#job-workdir'>job working directory</a>")- @Valid- public List<Step> getSteps() {+ public List<@Valid Step> getSteps() {return steps;}@@ -196,8 +195,7 @@ public class Job implements NamedElement, Validatable {}@Editable(order=400, name="Parameter Specs", group="Params & Triggers", description="Optionally define parameter specifications of the job")- @Valid- public List<ParamSpec> getParamSpecs() {+ public List<@Valid ParamSpec> getParamSpecs() {return paramSpecs;}@@ -206,8 +204,7 @@ public class Job implements NamedElement, Validatable {}@Editable(order=500, group="Params & Triggers", description="Use triggers to run the job automatically under certain conditions")- @Valid- public List<JobTrigger> getTriggers() {+ public List<@Valid JobTrigger> getTriggers() {return triggers;}@@ -217,8 +214,7 @@ public class Job implements NamedElement, Validatable {@Editable(name="Job Dependencies", order=9110, group="Dependencies & Services", description="Job dependencies determines the order and "+ "concurrency when run different jobs. You may also specify artifacts to retrieve from upstream jobs")- @Valid- public List<JobDependency> getJobDependencies() {+ public List<@Valid JobDependency> getJobDependencies() {return jobDependencies;}@@ -228,8 +224,7 @@ public class Job implements NamedElement, Validatable {@Editable(name="Project Dependencies", order=9112, group="Dependencies & Services", description="Use project dependency to retrieve "+ "artifacts from other projects")- @Valid- public List<ProjectDependency> getProjectDependencies() {+ public List<@Valid ProjectDependency> getProjectDependencies() {return projectDependencies;}@@ -341,8 +336,7 @@ public class Job implements NamedElement, Validatable {}@Editable(order=10600, name="Post Build Actions", group="More Settings")- @Valid- public List<PostBuildAction> getPostBuildActions() {+ public List<@Valid PostBuildAction> getPostBuildActions() {return postBuildActions;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex 443ee4346b..d1cdcf399b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -4,8 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.ChoiceProvider;@@ -66,8 +66,7 @@ public class JobDependency implements Serializable {@ParamSpecProvider("getParamSpecs")@VariableOption(withBuildVersion=false, withDynamicVariables=false)@OmitName- @Valid- public List<ParamInstances> getParamMatrix() {+ public List<@Valid ParamInstances> getParamMatrix() {return paramMatrix;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 3075362e28..56c2fb9e04 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -5,9 +5,9 @@ import java.util.Collection;import java.util.Date;import java.util.List;-import javax.validation.Valid;-import javax.validation.ValidationException;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.ValidationException;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;@@ -80,8 +80,7 @@ public class CreateIssueAction extends PostBuildAction {@Editable(order=1100, group="Issue Details")@FieldNamesProvider("getFieldNames")@OmitName- @Valid- public List<FieldInstance> getIssueFields() {+ public List<@Valid FieldInstance> getIssueFields() {return issueFields;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.javaindex dcbd7fbec6..1fb454ee8d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex 29af86ad53..48db3feba2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -6,9 +6,9 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.ValidationException;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.ValidationException;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;@@ -63,8 +63,7 @@ public class RunJobAction extends PostBuildAction {@ParamSpecProvider("getParamSpecs")@VariableOption(withBuildVersion=false, withDynamicVariables=false)@OmitName- @Valid- public List<ParamInstances> getParamMatrix() {+ public List<@Valid ParamInstances> getParamMatrix() {return paramMatrix;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.javaindex 1518c8f598..96ac00ca6f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java@@ -8,9 +8,9 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.NotAcceptableException;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.NotAcceptableException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.util.ThreadContext;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.javaindex 96cdbb5457..927bd19509 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java@@ -1,6 +1,6 @@package io.onedev.server.buildspec.job.action;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.event.project.build.BuildFinished;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.javaindex a17e13a981..87d299971a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java@@ -15,10 +15,10 @@ import static io.onedev.server.model.Build.NAME_TAG;import java.util.ArrayList;import java.util.List;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AiPullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AiPullRequestEmptyCriteria.javaindex 3b236c9967..2c1c9931b2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AiPullRequestEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AiPullRequestEmptyCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.buildspec.job.action.condition;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.javaindex 1b2c28197f..381e3d88a7 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.javaindex 19ee237751..8b8821b8a0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java@@ -4,10 +4,10 @@ import static io.onedev.server.buildspec.job.action.condition.ActionCondition.geimport static io.onedev.server.model.Build.NAME_BRANCH;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.javaindex a0e8a4e10d..cbdc29becc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java@@ -4,10 +4,10 @@ import static io.onedev.server.buildspec.job.action.condition.ActionCondition.geimport static io.onedev.server.model.Build.NAME_BRANCH;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.javaindex 115e01e860..8d0e641a75 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.javaindex 3166d00501..585a5bba38 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.javaindex 62acb6536e..35506f831e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.action.condition;import java.util.regex.Pattern;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.logging.LogService;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.javaindex 750251d035..12d82a9b05 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.javaindex 87eeb48055..39e4e91268 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.action.condition;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.javaindex 57f19abf5b..2a18386840 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.action.condition;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.javaindex b8a8c894b4..daabf62038 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.javaindex ffc7cd3363..4cae1b674d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.javaindex 141ff7eb06..04c2bd51aa 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.javaindex c348b26717..5f04bee653 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.javaindex c74988cd76..0a5d574a46 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java@@ -4,10 +4,10 @@ import static io.onedev.server.buildspec.job.action.condition.ActionCondition.geimport static io.onedev.server.model.Build.NAME_PROJECT;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.javaindex d766d0f632..f217f6f604 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.javaindex 85c02b3683..a4620caec2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.javaindex 499c4400ca..f23e8bcec6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java@@ -4,10 +4,10 @@ import static io.onedev.server.buildspec.job.action.condition.ActionCondition.geimport static io.onedev.server.model.Build.NAME_TAG;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.javaindex 4e8412b5ab..f13430edfa 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java@@ -4,10 +4,10 @@ import static io.onedev.server.buildspec.job.action.condition.ActionCondition.geimport static io.onedev.server.model.Build.NAME_TAG;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.javaindex 7f363cf589..7101cc71bb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.action.condition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.javaindex 18e383fc17..a0c456adf3 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java@@ -3,9 +3,9 @@ package io.onedev.server.buildspec.job.gitcredential;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.CloneInfo;import io.onedev.k8shelper.HttpCloneInfo;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.javaindex 4be5b980f3..c3011955d4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java@@ -5,11 +5,11 @@ import java.security.GeneralSecurityException;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.config.keys.PublicKeyEntry;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.CloneInfo;import io.onedev.k8shelper.SshCloneInfo;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.javaindex bcb1518ac9..d843bdbe05 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.projectdependency;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.javaindex dc3ae569ca..36a8697443 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java@@ -18,8 +18,8 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.WicketUtils;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.javaindex 708a06085c..0bd0d715f4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.projectdependency;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.javaindex 8bde5b3f1d..0f4c71d12b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.retrycondition;import java.util.regex.Pattern;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.logging.LogService;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.javaindex 77926e7dbe..d85c0293e9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.retrycondition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.javaindex d299afeb23..7f923203dd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.retrycondition;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.javaindex db2b7ba62c..80a144e78f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.buildspec.job.retrycondition;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.javaindex 97538af4ba..28a2ed4ccd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java@@ -11,10 +11,10 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/TimedOutCriteria.javaindex fa158edf92..54c88cd856 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/TimedOutCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.buildspec.job.retrycondition;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex 403aaa6b2c..ed11f4879c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.trigger;import java.util.Collection;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.javaindex ceba5c809e..d0569da1fc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/IssueInStateTrigger.java@@ -17,7 +17,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.List;import static java.util.stream.Collectors.toList;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.javaindex 6fc82df429..228eddd117 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.function.Function;-import javax.validation.Valid;+import jakarta.validation.Valid;import org.eclipse.jgit.revwalk.RevCommit;import org.jspecify.annotations.Nullable;@@ -70,8 +70,7 @@ public abstract class JobTrigger implements Serializable {@Editable(order=1000)@ParamSpecProvider("getParamSpecs")@OmitName- @Valid- public List<ParamInstances> getParamMatrix() {+ public List<@Valid ParamInstances> getParamMatrix() {return paramMatrix;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.javaindex 820dd2e12d..c108ce80eb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java@@ -15,7 +15,7 @@ import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.List;@Editable(order=600, name="Cron schedule")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.javaindex 51445d4f00..1e087a1e71 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java@@ -1,8 +1,31 @@package io.onedev.server.buildspec.param;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;++import org.apache.commons.codec.DecoderException;+import org.apache.commons.codec.binary.Hex;+import org.apache.commons.lang.SerializationUtils;+import org.jspecify.annotations.Nullable;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.param.instance.*;+import io.onedev.server.buildspec.param.instance.ParamInstance;+import io.onedev.server.buildspec.param.instance.ParamInstances;+import io.onedev.server.buildspec.param.instance.ParamMap;+import io.onedev.server.buildspec.param.instance.SpecifiedValue;+import io.onedev.server.buildspec.param.instance.SpecifiedValues;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspec.param.spec.SecretParam;import io.onedev.server.buildspecmodel.inputspec.SecretInput;@@ -11,17 +34,7 @@ import io.onedev.server.model.Project;import io.onedev.server.util.HtmlUtils;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;-import org.apache.commons.codec.DecoderException;-import org.apache.commons.codec.binary.Hex;-import org.apache.commons.lang.SerializationUtils;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import org.jspecify.annotations.Nullable;-import javax.validation.ValidationException;-import java.io.Serializable;-import java.util.*;-import java.util.stream.Collectors;+import jakarta.validation.ValidationException;public class ParamUtils {@@ -175,7 +188,7 @@ public class ParamUtils {@SuppressWarnings("unchecked")@Nullable- public static Class<? extends Serializable> loadBeanClass(String className) {+ public static Class<? extends Serializable> loadParamBeanClass(String className) {if (className.startsWith(PARAM_BEAN_CLASS_NAME_PREFIX)) {byte[] bytes;try {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.javaindex 1f99326808..f00e6ac528 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java@@ -4,9 +4,9 @@ import io.onedev.server.annotation.Editable;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstances.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstances.javaindex 3c45e4e868..402c2f4f27 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstances.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstances.java@@ -2,12 +2,12 @@ package io.onedev.server.buildspec.param.instance;import java.io.Serializable;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.javaindex f13e8f49cd..e617f6c4c8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;+import jakarta.validation.Valid;import org.apache.wicket.Component;@@ -35,8 +35,7 @@ public class ParamMap implements Serializable {@ParamSpecProvider("getParamSpecs")@VariableOption(withBuildVersion=false, withDynamicVariables=false)@OmitName- @Valid- public List<ParamInstance> getParams() {+ public List<@Valid ParamInstance> getParams() {return params;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.javaindex b52e7529a1..7bef7270af 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValue.java@@ -11,7 +11,7 @@ import io.onedev.server.buildspecmodel.inputspec.Input;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.javaindex 04762bb353..635da0b3e9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/PassthroughValues.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValue.javaindex 512d492c9d..4ae3699dd4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValue.java@@ -8,7 +8,7 @@ import io.onedev.server.util.GroovyUtils;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.*;@Editable(name="Evaluate script to get value or secret")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValues.javaindex 70ef3807f6..f430f2aa5f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ScriptingValues.java@@ -8,7 +8,7 @@ import java.util.Map;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.javaindex 32eb4e8391..dc7f54882e 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspecmodel.inputspec.booleaninput.BooleanInput;import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javaindex 27525443aa..85c0bead40 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.javaindex d7a849cf2b..33c179d0d2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.javaindex 4c32adbaa9..dc2a29a0a6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.floatinput.FloatInput;import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.javaindex ec366c36b2..180edebe07 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.GroupChoiceInput;import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.AllGroups;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.javaindex bd181c5dfa..c505d99818 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.integerinput.IntegerInput;import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javaindex d8cad06db8..ce401a0b11 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java@@ -2,8 +2,8 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.javaindex 734e56febd..52efe7dad7 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;import io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.javaindex 39a005f825..726c1987ec 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java@@ -4,8 +4,8 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 794bec31a1..1334a9e56c 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 02fbe8d55a..4f8be241d8 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -3,9 +3,9 @@ package io.onedev.server.buildspec.param.spec.choiceparam.defaultmultivalueproviimport java.util.ArrayList;import java.util.List;-import javax.validation.Validator;+import jakarta.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/ScriptingDefaultValue.javaindex d8616e287a..f2517b987d 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/ScriptingDefaultValue.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.javaindex 6fd8262da4..60ba9b5678 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java@@ -6,8 +6,8 @@ import io.onedev.server.util.EditContext;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.javaindex b91fc4738a..0049e2f3d4 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/UserChoiceParam.java@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.param.spec.userchoiceparam;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 7c24456623..092a8a54f9 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 7c76f62efe..37722fa0c4 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -8,8 +8,8 @@ import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.import io.onedev.server.model.User;import io.onedev.server.util.EditContext;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.javaindex d992e367c5..b745ab0069 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/ScriptingDefaultValue.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.javaindex c09cbde15b..6733e4c289 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/userchoiceparam/defaultvalueprovider/SpecifiedDefaultValue.java@@ -7,8 +7,8 @@ import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.import io.onedev.server.model.User;import io.onedev.server.util.EditContext;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.javaindex 79e7b36db0..6d0440c531 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java@@ -7,9 +7,9 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.BuildImageFacade;@@ -83,8 +83,7 @@ public class BuildImageStep extends Step {@Editable(order=1000, group="More Settings", description="Optionally specify registry logins to override " +"those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +"<code>@job_token@</code> for user name, and access token secret for password secret")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.javaindex 94763595c1..d1709174ce 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java@@ -10,8 +10,8 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CacheEntry.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CacheEntry.javaindex 939caa4026..95a2c84e85 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CacheEntry.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CacheEntry.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.step;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CacheEntryFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.javaindex 92229abf72..a537228ba1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java@@ -2,8 +2,8 @@ package io.onedev.server.buildspec.step;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CheckoutFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseIterationStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseIterationStep.javaindex 649cf9b2c1..960184fac3 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseIterationStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseIterationStep.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Iteration;import io.onedev.server.model.Project;import io.onedev.server.persistence.TransactionService;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 020b9f006a..e15d4c1037 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -7,10 +7,10 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CommandFacade;@@ -100,8 +100,7 @@ public class CommandStep extends Step {"those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +"<code>@job_token@</code> for user name, and access token secret for password secret")@DependsOn(property="runInContainer")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}@@ -111,8 +110,7 @@ public class CommandStep extends Step {@Editable(order=9900, name="Environment Variables", group="More Settings", description="Optionally specify environment "+ "variables for this step")- @Valid- public List<EnvVar> getEnvVars() {+ public List<@Valid EnvVar> getEnvVars() {return envVars;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.javaindex 34f866e3b9..71e9c6f4e2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import org.eclipse.jgit.lib.Repository;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.javaindex 5ec17415dd..3d525f817e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java@@ -4,8 +4,8 @@ import java.io.File;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.javaindex 1935bb8ff5..dd7f607b5a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java@@ -18,7 +18,7 @@ import io.onedev.server.persistence.SessionService;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Repository;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.javaindex 4cc3ab933e..0beeb55857 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java@@ -5,7 +5,7 @@ import static io.onedev.server.buildspec.step.StepGroup.PUBLISH;import java.io.File;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.javaindex 0ea719b301..eee7697378 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.ExecuteCondition;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.javaindex c5d8022941..5be118aebf 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java@@ -5,7 +5,7 @@ import static io.onedev.server.buildspec.step.StepGroup.PUBLISH;import java.io.File;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullImageStep.javaindex 0a3400090e..b5f7fa0d3f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullImageStep.java@@ -5,7 +5,7 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.annotation.*;import io.onedev.server.buildspec.BuildSpec;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.List;import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex a06e063754..f86b6c9cb0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -14,7 +14,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.atomic.AtomicReference;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.eclipse.jgit.lib.AnyObjectId;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushImageStep.javaindex d4f299623e..e9a192f7c0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushImageStep.java@@ -4,7 +4,7 @@ import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryLogin.javaindex 5537ad3eff..03f5af5276 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryLogin.java@@ -7,7 +7,7 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex cc49cc933e..3d2bc1c2ea 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -7,9 +7,9 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import org.jspecify.annotations.Nullable;@@ -98,8 +98,7 @@ public class RunContainerStep extends Step {@Editable(order=400, name="Environment Variables", group="More Settings", description="Optionally specify environment "+ "variables for the container")- @Valid- public List<EnvVar> getEnvVars() {+ public List<@Valid EnvVar> getEnvVars() {return envVars;}@@ -108,8 +107,7 @@ public class RunContainerStep extends Step {}@Editable(order=500, group = "More Settings", description="Optionally mount directories or files under job working directory into container")- @Valid- public List<VolumeMount> getVolumeMounts() {+ public List<@Valid VolumeMount> getVolumeMounts() {return volumeMounts;}@@ -120,8 +118,7 @@ public class RunContainerStep extends Step {@Editable(order=600, group="More Settings", description="Optionally specify registry logins to override " +"those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +"<code>@job_token@</code> for user name, and access token secret for password secret")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.javaindex e058e066ec..cb04ebca32 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java@@ -6,8 +6,8 @@ import static java.util.stream.Collectors.toList;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.RunImagetoolsFacade;@@ -47,8 +47,7 @@ public class RunImagetoolsStep extends Step {@Editable(order=200, group="More Settings", description="Optionally specify registry logins to override " +"those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +"<code>@job_token@</code> for user name, and access token secret for password secret")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.javaindex 91f483342b..ea045dbfec 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java@@ -6,7 +6,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.javaindex c2351565e1..a0dc642e32 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java@@ -6,7 +6,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.javaindex 2e0c0f6b6e..6f4b6440f5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java@@ -13,7 +13,7 @@ import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.build.BuildUpdated;import io.onedev.server.persistence.TransactionService;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.javaindex 0203c5a5bc..040bc1fd58 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java@@ -12,7 +12,7 @@ import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.build.BuildUpdated;import io.onedev.server.persistence.TransactionService;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.nio.charset.StandardCharsets;import java.util.HashMap;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.javaindex 0ba38e8105..90f266cf44 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java@@ -8,10 +8,10 @@ import java.util.List;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import org.apache.commons.lang3.tuple.Pair;@@ -85,9 +85,8 @@ public class SetupCacheStep extends Step {}@Editable(order=300, name="Cache Entries", description = "Specify cache entries")- @Valid@Size(min=1, max=100)- public List<CacheEntry> getEntries() {+ public List<@Valid CacheEntry> getEntries() {return entries;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.javaindex bbb8fc6e17..430bf3308d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java@@ -4,8 +4,8 @@ import static io.onedev.k8shelper.ExecuteCondition.SUCCESSFUL;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.k8shelper.Action;import io.onedev.k8shelper.ExecuteCondition;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.javaindex 7318001cdf..4c328c38eb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.step;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;@@ -52,8 +52,7 @@ public class StepTemplate implements NamedElement {}@Editable(order=200, description="Steps will be executed serially on same node, sharing the same <a href='https://docs.onedev.io/concepts#job-workdir'>job working directory</a>")- @Valid- public List<Step> getSteps() {+ public List<@Valid Step> getSteps() {return steps;}@@ -62,8 +61,7 @@ public class StepTemplate implements NamedElement {}@Editable(order=300, name="Parameter Specs", description="Optionally define parameter specifications of the step template")- @Valid- public List<ParamSpec> getParamSpecs() {+ public List<@Valid ParamSpec> getParamSpecs() {return paramSpecs;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.javaindex 29fd4a9b1e..8855664a5c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java@@ -7,8 +7,8 @@ import java.nio.charset.StandardCharsets;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.javaindex 4ae07f57ba..e22fa47eb1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java@@ -7,8 +7,8 @@ import java.util.List;import java.util.Map;import java.util.concurrent.atomic.AtomicInteger;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.k8shelper.Action;@@ -65,8 +65,7 @@ public class UseTemplateStep extends CompositeStep {@ParamSpecProvider("getParamSpecs")@VariableOption(withBuildVersion=false, withDynamicVariables=false)@OmitName- @Valid- public List<ParamInstances> getParamMatrix() {+ public List<@Valid ParamInstances> getParamMatrix() {return paramMatrix;}@@ -76,8 +75,7 @@ public class UseTemplateStep extends CompositeStep {@Editable(order=300, name="Exclude Param Combos")@ShowCondition("isExcludeParamMapsVisible")- @Valid- public List<ParamMap> getExcludeParamMaps() {+ public List<@Valid ParamMap> getExcludeParamMaps() {return excludeParamMaps;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.javaindex d63d538fe9..9ed8f73153 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.step;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.Path;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/SpecifiedBranchName.java b/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/SpecifiedBranchName.javaindex ab6b179150..a9e9c5ca2f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/SpecifiedBranchName.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/branchnameprovider/SpecifiedBranchName.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step.branchnameprovider;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.BranchName;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.javaindex 4a1c270106..3b0a2c08af 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.java@@ -1,6 +1,6 @@package io.onedev.server.buildspec.step.commandinterpreter;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.InterpreterFacade;import io.onedev.k8shelper.PosixInterpreterFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.javaindex d29b7216c6..27a92a8455 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=300, name="PowerShell")public class PowerShellInterpreter extends Interpreter {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.javaindex a3ef67968b..eedc042ecb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.java@@ -1,6 +1,6 @@package io.onedev.server.buildspec.step.commandinterpreter;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.InterpreterFacade;import io.onedev.k8shelper.WindowsBatchInterpreterFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.javaindex 9c1e8af92d..384013935f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.tuple.ImmutablePair;import org.apache.commons.lang3.tuple.Pair;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.javaindex 57d6196b3e..08c91f8f0f 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java@@ -5,7 +5,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.javaindex 08f991efb3..bbb77be4be 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.javaindex a5cae90edc..a1c5dde819 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/Input.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.javaindex f0850b7c32..ad978f3038 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java@@ -238,7 +238,7 @@ public abstract class InputSpec implements Serializable {buffer.append("import io.onedev.server.util.*;\n");buffer.append("import io.onedev.server.util.facade.*;\n");buffer.append("import java.util.*;\n");- buffer.append("import javax.validation.constraints.*;\n");+ buffer.append("import jakarta.validation.constraints.*;\n");buffer.append("import org.hibernate.validator.constraints.*;\n");buffer.append("\n");buffer.append("@Editable(name=").append("\"").append(description).append("\", translatable=false)\n");diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.javaindex ae9a3bd951..3ea96d06f0 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.javaindex ecacd6526c..176317fa7a 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IterationChoiceInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.model.Iteration;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.javaindex f45e5f8aac..7639ec3ab0 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.javaindex 449f2494ff..675f4b996b 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.javaindex 0e24c2b875..1f4ef861ff 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspecmodel.inputspec.booleaninput;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javaindex 643b5f2a76..8323a441c5 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.javaindex dcfdfd9480..e6bd54b3d3 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java@@ -4,8 +4,8 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;-import javax.validation.Validator;+import jakarta.validation.ValidationException;+import jakarta.validation.Validator;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.javaindex 2f3946a966..12f3a38eaf 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.Color;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex c314681e8b..04235cffac 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -4,7 +4,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex 2fa7535873..b31e42048d 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -9,8 +9,8 @@ import java.util.Set;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.buildspec.param.spec.choiceparam.ChoiceParam;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.javaindex 3a0ef89625..4ae40a186c 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java@@ -5,7 +5,7 @@ import java.util.Date;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 7ac4c2b5c9..1898dadd60 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueproviderimport java.util.Date;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 81230782fa..bef4620b59 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueproviderimport java.util.Date;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.javaindex ec9cdd09de..505bb3fbf7 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java@@ -5,7 +5,7 @@ import java.util.Date;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 84e668b25a..c3ef6cbd25 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovimport java.util.Date;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex b79ed5a01c..e648cdd74a 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovimport java.util.Date;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.javaindex 926010a268..bc52c4988b 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 018301c408..4dda4cd36b 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 1cadb19cf3..b518aaa9bf 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -4,8 +4,8 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;-import javax.validation.Validator;+import jakarta.validation.ValidationException;+import jakarta.validation.Validator;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaindex e8843c32ca..584e7b55b0 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java@@ -5,7 +5,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex fbb272aa66..6127789d0a 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 1d55561b90..74ba5bef41 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -2,9 +2,9 @@ package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvaluepimport java.util.List;-import javax.validation.Validator;+import jakarta.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.javaindex 3378673e5c..297405dedf 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.javaindex f5c989201d..300177c2f0 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.javaindex 1c73469f19..a114af3dc6 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java@@ -4,9 +4,9 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.javaindex 5d5f4b9e2a..5cd53e77cd 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.showcondition;import java.util.List;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import org.apache.commons.collections.CollectionUtils;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.javaindex e5c0af456f..bf64759b4b 100644--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec.showcondition;import java.util.List;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import org.apache.commons.collections.CollectionUtils;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.javaindex 61e6888866..34dba6ae62 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java@@ -6,7 +6,7 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javaindex d3f8aca843..3103f8886a 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 4bc204c231..2bd690c1f8 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueproviderimport io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=100, name="Use specified default value")public class SpecifiedDefaultValue implements DefaultValueProvider {diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex e5e34403da..097808dc79 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -6,7 +6,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/cache/ServerCacheProvisioner.java b/server-core/src/main/java/io/onedev/server/cache/ServerCacheProvisioner.javaindex d052a2fff6..31525a1b2a 100644--- a/server-core/src/main/java/io/onedev/server/cache/ServerCacheProvisioner.java+++ b/server-core/src/main/java/io/onedev/server/cache/ServerCacheProvisioner.java@@ -5,14 +5,14 @@ import java.io.IOException;import java.io.InputStream;import java.util.List;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.glassfish.jersey.client.ClientProperties;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterAtomicLong.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterAtomicLong.javanew file mode 100644index 0000000000..53c3a84ac0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterAtomicLong.java@@ -0,0 +1,99 @@+package io.onedev.server.cluster;++import java.util.Map;++import com.hazelcast.core.HazelcastInstance;+import com.hazelcast.map.EntryProcessor;+import com.hazelcast.map.IMap;++/**+ * A named counter backed by atomic partition operations and synchronous IMap backups.+ * Like other IMap data, this has AP semantics, not the CP subsystem's consensus guarantees.+ */+public final class ClusterAtomicLong {+ private static final String MAP_NAME = "clusterAtomicLongs";++ private final IMap<String, Long> values;+ private final String name;++ public ClusterAtomicLong(HazelcastInstance hazelcastInstance, String name) {+ this.values = hazelcastInstance.getMap(MAP_NAME);+ this.name = name;+ }++ public long get() {+ Long value = values.get(name);+ return value != null ? value : 0;+ }++ public void set(long value) {+ values.set(name, value);+ }++ public long getAndIncrement() {+ return values.executeOnKey(name, new Update(Operation.INCREMENT, 0, 0));+ }++ public boolean compareAndSet(long expected, long value) {+ return values.executeOnKey(name, new Update(Operation.COMPARE_AND_SET, expected, value)) == expected;+ }++ public void ensureAtLeast(long value) {+ values.executeOnKey(name, new Update(Operation.MAX, 0, value));+ }++ private enum Operation { INCREMENT, COMPARE_AND_SET, MAX }++ private static final class Update implements EntryProcessor<String, Long, Long> {+ private static final long serialVersionUID = 1L;+ private final Operation operation;+ private final long expected;+ private final long value;+ private Long updated;++ private Update(Operation operation, long expected, long value) {+ this.operation = operation;+ this.expected = expected;+ this.value = value;+ }++ @Override+ public Long process(Map.Entry<String, Long> entry) {+ long current = entry.getValue() != null ? entry.getValue() : 0;+ updated = switch (operation) {+ case INCREMENT -> Math.addExact(current, 1);+ case COMPARE_AND_SET -> current == expected ? value : null;+ case MAX -> Math.max(current, value);+ };+ if (updated != null)+ entry.setValue(updated);+ return current;+ }++ @Override+ public EntryProcessor<String, Long, Long> getBackupProcessor() {+ // Apply the primary's result, even when a backup has no previous entry.+ return updated != null ? new SetBackupValue(updated) : null;+ }+ }++ private static final class SetBackupValue implements EntryProcessor<String, Long, Long> {+ private static final long serialVersionUID = 1L;+ private final long value;++ private SetBackupValue(long value) {+ this.value = value;+ }++ @Override+ public Long process(Map.Entry<String, Long> entry) {+ entry.setValue(value);+ return null;+ }++ @Override+ public EntryProcessor<String, Long, Long> getBackupProcessor() {+ return null;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterLock.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterLock.javanew file mode 100644index 0000000000..8ca0d0f12a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterLock.java@@ -0,0 +1,60 @@+package io.onedev.server.cluster;++import java.util.concurrent.TimeUnit;+import java.util.concurrent.locks.Condition;+import java.util.concurrent.locks.Lock;++import com.hazelcast.core.HazelcastInstance;+import com.hazelcast.map.IMap;++/**+ * A named cluster wide lock backed by IMap key locking. It is reentrant and owned by the+ * locking thread. Like other IMap data, this has AP semantics, not the CP subsystem's+ * consensus guarantees.+ */+public final class ClusterLock implements Lock {++ private static final String MAP_NAME = "clusterLocks";++ private final IMap<String, Object> locks;+ private final String name;++ public ClusterLock(HazelcastInstance hazelcastInstance, String name) {+ this.locks = hazelcastInstance.getMap(MAP_NAME);+ this.name = name;+ }++ @Override+ public void lock() {+ locks.lock(name);+ }++ @Override+ public void lockInterruptibly() throws InterruptedException {+ // IMap has no interruptible blocking lock, so wait in bounded attempts+ boolean locked = false;+ while (!locked)+ locked = locks.tryLock(name, 1, TimeUnit.SECONDS);+ }++ @Override+ public boolean tryLock() {+ return locks.tryLock(name);+ }++ @Override+ public boolean tryLock(long time, TimeUnit unit) throws InterruptedException {+ return locks.tryLock(name, time, unit);+ }++ @Override+ public void unlock() {+ locks.unlock(name);+ }++ @Override+ public Condition newCondition() {+ throw new UnsupportedOperationException();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.javaindex ad687dd34e..2169f3ed19 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java@@ -4,9 +4,9 @@ import static io.onedev.commons.utils.LockUtils.read;import static io.onedev.server.model.Build.getArtifactsLockName;import static io.onedev.server.model.Project.SHARE_TEST_DIR;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;-import static javax.ws.rs.core.Response.ok;-import static javax.ws.rs.core.Response.status;-import static javax.ws.rs.core.Response.Status.NO_CONTENT;+import static jakarta.ws.rs.core.Response.ok;+import static jakarta.ws.rs.core.Response.status;+import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;import static org.eclipse.jgit.lib.ObjectId.fromString;import java.io.BufferedOutputStream;@@ -19,17 +19,17 @@ import java.io.OutputStream;import java.util.Map;import java.util.concurrent.ExecutionException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.lib.Repository;diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterService.javaindex 6fdb02c901..abe2579bb2 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterService.java@@ -11,7 +11,6 @@ import org.jspecify.annotations.Nullable;import com.hazelcast.cluster.Member;import com.hazelcast.core.HazelcastInstance;-import com.hazelcast.cp.IAtomicLong;import io.onedev.server.annotation.NoDBAccess;import io.onedev.server.replica.ProjectReplica;@@ -33,7 +32,15 @@ public interface ClusterService {@NullableHazelcastInstance getHazelcastInstance();- void initWithLead(IAtomicLong data, Callable<Long> initializer);+ default ClusterAtomicLong getAtomicLong(String name) {+ return new ClusterAtomicLong(getHazelcastInstance(), name);+ }++ default ClusterLock getLock(String name) {+ return new ClusterLock(getHazelcastInstance(), name);+ }++ void initWithLead(ClusterAtomicLong data, Callable<Long> initializer);<T> T runOnServer(Member server, ClusterTask<T> task);diff --git a/server-core/src/main/java/io/onedev/server/codequality/UnitTestReport.java b/server-core/src/main/java/io/onedev/server/codequality/UnitTestReport.javaindex 76bf690e87..302955155a 100644--- a/server-core/src/main/java/io/onedev/server/codequality/UnitTestReport.java+++ b/server-core/src/main/java/io/onedev/server/codequality/UnitTestReport.java@@ -21,11 +21,11 @@ import java.util.Collection;import java.util.List;import java.util.Map;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import static com.google.common.collect.Lists.newArrayList;import static io.onedev.commons.utils.LockUtils.read;@@ -33,7 +33,7 @@ import static io.onedev.k8shelper.KubernetesHelper.BEARER;import static io.onedev.k8shelper.KubernetesHelper.checkStatus;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static java.util.stream.Collectors.toList;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;public class UnitTestReport implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java b/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.javaindex 92796010ae..65d066915a 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ApplyDatabaseConstraints.java@@ -8,8 +8,8 @@ import io.onedev.server.security.SecurityUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.javaindex 53c008d28e..27ffb2dc10 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/BackupDatabase.java@@ -12,8 +12,8 @@ import io.onedev.server.security.SecurityUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.File;import java.sql.SQLException;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java b/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.javaindex f4b6da1172..96bf66fb27 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CheckDataVersion.java@@ -4,8 +4,8 @@ import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;import java.sql.SQLException;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.javaindex 3721b5345f..88c3836bfa 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/CleanDatabase.java@@ -8,8 +8,8 @@ import io.onedev.server.security.SecurityUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.sql.SQLException;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.java b/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.javaindex 76ee9692de..ffa05c81b9 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/EnableInternalLogin.java@@ -4,8 +4,8 @@ import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;import java.sql.SQLException;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.javaindex 933ad33cae..7be5d203d7 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java@@ -12,8 +12,8 @@ import org.apache.shiro.authc.credential.PasswordService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.sql.SQLException;import static io.onedev.server.persistence.PersistenceUtils.callWithTransaction;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.javaindex 76a5a977e7..7ff3e5a1b3 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/RestoreDatabase.java@@ -12,8 +12,8 @@ import io.onedev.server.security.SecurityUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.File;import java.sql.SQLException;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Translate.java b/server-core/src/main/java/io/onedev/server/commandhandler/Translate.javaindex a94a27c661..cf88722529 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Translate.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Translate.java@@ -19,11 +19,11 @@ import java.util.regex.Matcher;import java.util.regex.Pattern;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex feb294c1d6..06f97816ea 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -20,7 +20,7 @@ import java.util.Properties;import java.util.concurrent.Callable;import java.util.regex.Matcher;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.apache.commons.lang3.Strings;import org.apache.commons.lang3.SystemUtils;@@ -1010,6 +1010,8 @@ public class Upgrade extends AbstractPlugin {String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, UTF_8);hibernateProps = Strings.CS.replace(hibernateProps, "hibernate.hikari.autoCommit=false","hibernate.hikari.autoCommit=true");+ hibernateProps = Strings.CS.replace(hibernateProps, "javax.persistence.validation.mode",+ "jakarta.persistence.validation.mode");hibernateProps = Strings.CS.replace(hibernateProps, "GitPlex", "OneDev");hibernateProps = Strings.CS.replace(hibernateProps, "TurboDev", "OneDev");@@ -1039,6 +1041,8 @@ public class Upgrade extends AbstractPlugin {"com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");hibernateProps = Strings.CS.replace(hibernateProps, "org.hibernate.cache.jcache.JCacheRegionFactory","com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");+ hibernateProps = Strings.CS.replace(hibernateProps, "com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory",+ "io.onedev.server.persistence.HazelcastLocalCacheRegionFactory");if (!hibernateProps.contains("hibernate.cache.auto_evict_collection_cache=true")) {hibernateProps += "hibernate.cache.auto_evict_collection_cache=true\r\n";hibernateProps += "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider\r\n";diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.javaindex 16f9e38a8d..e57724f32d 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java@@ -29,35 +29,37 @@ import java.sql.Statement;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;-import java.util.EnumSet;import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;import java.util.UUID;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;-import javax.validation.Validator;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;+import jakarta.validation.Validator;import org.apache.shiro.authc.credential.PasswordService;import org.dom4j.DocumentHelper;import org.dom4j.Element;-import org.hibernate.ReplicationMode;import org.hibernate.Session;import org.hibernate.Transaction;import org.hibernate.boot.Metadata;import org.hibernate.boot.model.naming.Identifier;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;+import org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl;+import org.hibernate.cfg.AvailableSettings;+import org.hibernate.engine.config.spi.ConfigurationService;import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;import org.hibernate.query.Query;-import org.hibernate.tool.hbm2ddl.SchemaExport;-import org.hibernate.tool.schema.TargetType;+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;+import org.hibernate.tool.schema.internal.SchemaDropperImpl;+import org.hibernate.tool.schema.spi.GenerationTarget;import org.joda.time.DateTime;import org.joda.time.format.DateTimeFormat;import org.quartz.CronScheduleBuilder;@@ -239,6 +241,27 @@ public class DefaultDataService implements DataService, Serializable {return dbDataVersion;}+ private void writeSchemaScript(File file, boolean create) throws IOException {+ var metadata = getMetadata();+ var registry = metadata.getDatabase().getServiceRegistry();+ var settings = new LinkedHashMap<String, Object>(registry.requireService(ConfigurationService.class).getSettings());+ // Callers read one SQL statement per line, regardless of SQL logging format.+ settings.put(AvailableSettings.FORMAT_SQL, false);+ List<String> commands = new ArrayList<>();+ // Capture SQL only. Existing filtering and transaction handling below+ // decide which statements are executed against the database.+ GenerationTarget target = new GenerationTarget() {+ public void prepare() {}+ public void accept(String command) { commands.add(command); }+ public void release() {}+ };+ if (create)+ new SchemaCreatorImpl(registry).doCreation(metadata, registry, settings, false, target);+ else+ new SchemaDropperImpl(registry).doDrop(metadata, registry, settings, false, target);+ FileUtils.writeLines(file, commands);+ }+@Overridepublic void populateDatabase(Connection conn) {if (hibernateConfig.isHSQLDialect())@@ -250,8 +273,7 @@ public class DefaultDataService implements DataService, Serializable {File tempFile = null;try {tempFile = FileUtils.createTempFile("schema", ".sql");- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), getMetadata());+ writeSchemaScript(tempFile, true);List<String> sqls = new ArrayList<String>();for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {if (shouldInclude(sql))@@ -453,7 +475,7 @@ public class DefaultDataService implements DataService, Serializable {private void exportEntity(Session session, Class<?> entityType, List<Number> ids, int start, int count, int batchSize, File exportDir) {logger.info("Loading table rows ({}->{}) from database...", String.valueOf(start+1), (start + count));- Query<?> query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId order by id");+ Query<?> query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId order by id", entityType);query.setParameter("fromId", ids.get(start));query.setParameter("toId", ids.get(start+count-1));@@ -483,23 +505,22 @@ public class DefaultDataService implements DataService, Serializable {for (Class<?> entityType: entityTypes) {File[] dataFiles = dataDir.listFiles((dir, name) -> name.startsWith(entityType.getSimpleName() + "s.xml"));for (File file: dataFiles) {- Session session = dao.getSession();- Transaction transaction = session.beginTransaction();- try {- logger.info("Importing from data file '" + file.getName() + "'...");- VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);-- for (Element element: dom.getRootElement().elements()) {- element.detach();- AbstractEntity entity = (AbstractEntity) new VersionedXmlDoc(DocumentHelper.createDocument(element)).toBean();- session.replicate(entity, ReplicationMode.EXCEPTION);+ // Restore each batch independently, preserving its IDs and failing on duplicates.+ try (var session = dao.getSession().getSessionFactory().openStatelessSession()) {+ Transaction transaction = session.beginTransaction();+ try {+ logger.info("Importing from data file '" + file.getName() + "'...");+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.detach();+ AbstractEntity entity = (AbstractEntity) new VersionedXmlDoc(DocumentHelper.createDocument(element)).toBean();+ session.insert(entity);+ }+ transaction.commit();+ } catch (Exception e) {+ transaction.rollback();+ throw ExceptionUtils.unchecked(e);}- session.flush();- session.clear();- transaction.commit();- } catch (Exception e) {- transaction.rollback();- throw ExceptionUtils.unchecked(e);}}}@@ -510,8 +531,7 @@ public class DefaultDataService implements DataService, Serializable {File tempFile = null;try {tempFile = FileUtils.createTempFile("schema", ".sql");- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), getMetadata());+ writeSchemaScript(tempFile, true);List<String> sqls = new ArrayList<>();for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {if (isApplyingConstraints(sql)) {@@ -532,8 +552,7 @@ public class DefaultDataService implements DataService, Serializable {File tempFile = null;try {tempFile = FileUtils.createTempFile("schema", ".sql");- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), getMetadata());+ writeSchemaScript(tempFile, true);List<String> sqls = new ArrayList<>();for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {if (shouldInclude(sql) && !isApplyingConstraints(sql))@@ -550,23 +569,21 @@ public class DefaultDataService implements DataService, Serializable {@Overridepublic void dropConstraints(Connection conn) {- File tempFile = null;- try {- tempFile = FileUtils.createTempFile("schema", ".sql");- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())- .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), getMetadata());- List<String> sqls = new ArrayList<>();- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {- if (isDroppingConstraints(sql))- sqls.add(sql);- }- execute(conn, sqls, false);- } catch (IOException e) {- throw new RuntimeException(e);- } finally {- if (tempFile != null)- tempFile.delete();- }+ var metadata = getMetadata();+ var database = metadata.getDatabase();+ var registry = database.getServiceRegistry();+ var environment = registry.requireService(JdbcEnvironment.class);+ var context = SqlStringGenerationContextImpl.fromConfigurationMap(environment, database,+ registry.requireService(ConfigurationService.class).getSettings());+ var exporter = environment.getDialect().getForeignKeyExporter();+ List<String> sqls = new ArrayList<>();+ // Full schema drops may rely on DROP TABLE CASCADE and omit foreign keys.+ // Export them directly, including dialect-specific DROP FOREIGN KEY syntax.+ for (var table : metadata.collectTableMappings()) {+ for (var foreignKey : table.getForeignKeyCollection())+ Collections.addAll(sqls, exporter.getSqlDropStrings(foreignKey, metadata, context));+ }+ execute(conn, sqls, false);}@Override@@ -574,8 +591,7 @@ public class DefaultDataService implements DataService, Serializable {File tempFile = null;try {tempFile = FileUtils.createTempFile("schema", ".sql");- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())- .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), getMetadata());+ writeSchemaScript(tempFile, false);List<String> sqls = new ArrayList<>();for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {sqls.add(sql);@@ -593,10 +609,6 @@ public class DefaultDataService implements DataService, Serializable {return sql.toLowerCase().contains(" foreign key ");}- private boolean isDroppingConstraints(String sql) {- return sql.toLowerCase().contains(" drop constraint ");- }-private boolean shouldInclude(String sql) {// some databases will create index on foreign keys automatically, so// we skip creating indexes for thosediff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 6f92a4501a..079b17762f 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -36,7 +36,7 @@ import java.util.UUID;import java.util.regex.Matcher;import java.util.regex.Pattern;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.Strings;@@ -9405,4 +9405,25 @@ public class DataMigrator {}}+ private void migrate244(File dataDir, Stack<Integer> versions) {+ var oldClass = "javax.mail.internet.InternetAddress";+ var newClass = "jakarta.mail.internet.InternetAddress";+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml") || file.getName().startsWith("IssueComments.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Node node : dom.selectNodes("//*")) {+ var element = (Element) node;+ if (element.getName().equals(oldClass))+ element.setName(newClass);+ if (oldClass.equals(element.attributeValue("class")))+ element.addAttribute("class", newClass);+ var reference = element.attribute("reference");+ if (reference != null)+ reference.setValue(Strings.CS.replace(reference.getValue(), oldClass, newClass));+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.javaindex 054f7de4a0..ac48f1b10c 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java@@ -29,7 +29,7 @@ import org.dom4j.XPath;import org.dom4j.io.OutputFormat;import org.dom4j.io.SAXReader;import org.dom4j.io.XMLWriter;-import org.hibernate.proxy.HibernateProxyHelper;+import io.onedev.server.util.HibernateProxyHelper;import org.xml.sax.EntityResolver;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.javaindex eb6d19da75..71a39e680e 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/VersionedYamlDoc.java@@ -17,7 +17,7 @@ import java.util.List;import java.util.Map;import java.util.Set;-import org.hibernate.proxy.HibernateProxyHelper;+import io.onedev.server.util.HibernateProxyHelper;import org.yaml.snakeyaml.DumperOptions;import org.yaml.snakeyaml.DumperOptions.FlowStyle;import org.yaml.snakeyaml.LoaderOptions;@@ -188,6 +188,7 @@ public class VersionedYamlDoc extends MappingNode {private static class OneYaml extends Yaml {+ @SuppressWarnings("deprecation")OneYaml() {super(newConstructor(), newRepresenter());diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeService.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeService.javaindex 6d0318fdba..8d4015b4c6 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeService.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeService.java@@ -4,8 +4,8 @@ import static io.onedev.server.entityreference.ReferenceUtils.extractReferences;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.jsoup.Jsoup;import org.jsoup.nodes.Document;diff --git a/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java b/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.javaindex 89261a40b5..1fa6fbb360 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/EntityReference.java@@ -3,7 +3,7 @@ package io.onedev.server.entityreference;import java.io.Serializable;import org.jspecify.annotations.Nullable;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;diff --git a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.javaindex 4956dbe0ea..1eca3001d9 100644--- a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java+++ b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java@@ -15,8 +15,8 @@ import io.onedev.server.security.SecurityUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.ObjectStreamException;import java.io.Serializable;import java.lang.reflect.Method;diff --git a/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java b/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.javaindex 2350751bd4..62e6b53925 100644--- a/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java+++ b/server-core/src/main/java/io/onedev/server/exception/ExceptionUtils.java@@ -1,15 +1,15 @@package io.onedev.server.exception;import static java.nio.charset.StandardCharsets.UTF_8;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;import java.io.IOException;import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MultivaluedMap;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java b/server-core/src/main/java/io/onedev/server/exception/HttpResponse.javaindex 95dcb1e570..b923239464 100644--- a/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java+++ b/server-core/src/main/java/io/onedev/server/exception/HttpResponse.java@@ -1,8 +1,8 @@package io.onedev.server.exception;import org.jspecify.annotations.Nullable;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;import java.util.Map;public class HttpResponse {diff --git a/server-core/src/main/java/io/onedev/server/exception/HttpResponseBody.java b/server-core/src/main/java/io/onedev/server/exception/HttpResponseBody.javaindex f6b943b1f1..9c4091ebdd 100644--- a/server-core/src/main/java/io/onedev/server/exception/HttpResponseBody.java+++ b/server-core/src/main/java/io/onedev/server/exception/HttpResponseBody.java@@ -6,8 +6,8 @@ import io.onedev.server.OneDev;import java.util.Map;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;public class HttpResponseBody {diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.javaindex 0abed1cc61..e2adaf3fe4 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java@@ -1,10 +1,14 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;import org.apache.shiro.authc.AuthenticationException;import io.onedev.server.exception.HttpResponse;+import io.onedev.server.exception.HttpResponseBody;import io.onedev.server.security.SecurityUtils;public class AuthenticationExceptionHandler extends AbstractExceptionHandler<AuthenticationException> {@@ -13,8 +17,11 @@ public class AuthenticationExceptionHandler extends AbstractExceptionHandler<Aut@Overridepublic HttpResponse getResponse(AuthenticationException exception) {+ MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();+ headers.add("WWW-Authenticate", HttpServletRequest.BASIC_AUTH + " realm=\"OneDev\"");+ headers.add("WWW-Authenticate", "Bearer realm=\"OneDev\"");return new HttpResponse(HttpServletResponse.SC_UNAUTHORIZED,- SecurityUtils.AUTHENTICATION_FAILED_MESSAGE);+ new HttpResponseBody(false, SecurityUtils.AUTHENTICATION_FAILED_MESSAGE), headers);}}diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/BadRequestExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/BadRequestExceptionHandler.javaindex beeabc3993..be6967478c 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/BadRequestExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/BadRequestExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.BadRequestException;import io.onedev.server.exception.HttpResponse;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ClosedChannelExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ClosedChannelExceptionHandler.javanew file mode 100644index 0000000000..06ceba36a8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ClosedChannelExceptionHandler.java@@ -0,0 +1,19 @@+package io.onedev.server.exception.handler;++import java.nio.channels.ClosedChannelException;++import io.onedev.server.exception.HttpResponse;++public class ClosedChannelExceptionHandler extends AbstractExceptionHandler<ClosedChannelException> {++ private static final long serialVersionUID = 1L;++ @Override+ public HttpResponse getResponse(ClosedChannelException exception) {+ var message = exception.getMessage();+ if (message == null)+ message = "Channel closed";+ return new HttpResponse(499, message);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ConstraintViolationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ConstraintViolationExceptionHandler.javaindex 4428a1b170..d235e9f9e8 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ConstraintViolationExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ConstraintViolationExceptionHandler.java@@ -4,7 +4,7 @@ import io.onedev.server.exception.HttpResponse;import org.hibernate.exception.ConstraintViolationException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class ConstraintViolationExceptionHandler extends AbstractExceptionHandler<ConstraintViolationException> {diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.javaindex d1e48bba4a..cec37b7290 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.util.convert.ConversionException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/EntityNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/EntityNotFoundExceptionHandler.javaindex f6d90974f9..9d614c0696 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/EntityNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/EntityNotFoundExceptionHandler.java@@ -1,7 +1,7 @@package io.onedev.server.exception.handler;-import javax.persistence.EntityNotFoundException;-import javax.servlet.http.HttpServletResponse;+import jakarta.persistence.EntityNotFoundException;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.HttpResponse;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ExplicitExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ExplicitExceptionHandler.javaindex d7dd007a79..9692fd5a4e 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ExplicitExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ExplicitExceptionHandler.java@@ -3,7 +3,7 @@ package io.onedev.server.exception.handler;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.exception.HttpResponse;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class ExplicitExceptionHandler extends AbstractExceptionHandler<ExplicitException> {diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/FileNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/FileNotFoundExceptionHandler.javaindex 3312fd6727..09645d91ed 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/FileNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/FileNotFoundExceptionHandler.java@@ -2,7 +2,7 @@ package io.onedev.server.exception.handler;import java.io.FileNotFoundException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.HttpResponse;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.javaindex 758bc76f7c..9664c6ef1a 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.eclipse.jgit.errors.MissingObjectException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/NotAcceptableExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/NotAcceptableExceptionHandler.javaindex 668fc725c6..8d33ccd176 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/NotAcceptableExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/NotAcceptableExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.HttpResponse;import io.onedev.server.exception.NotAcceptableException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/NotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/NotFoundExceptionHandler.javaindex d00b23207b..df98b63557 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/NotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/NotFoundExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.HttpResponse;import io.onedev.server.exception.NotFoundException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ObjectNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ObjectNotFoundExceptionHandler.javaindex 84bea383f2..13fa15bf3a 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ObjectNotFoundExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ObjectNotFoundExceptionHandler.java@@ -4,7 +4,7 @@ import io.onedev.server.exception.HttpResponse;import org.hibernate.ObjectNotFoundException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class ObjectNotFoundExceptionHandler extends AbstractExceptionHandler<ObjectNotFoundException> {diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.javaindex ad76a10d3a..0ee8db520b 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.antlr.v4.runtime.misc.ParseCancellationException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.javaindex a5bc588e12..d11f70ef48 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.antlr.v4.runtime.RecognitionException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ServerNotReadyExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ServerNotReadyExceptionHandler.javaindex 5e27bc6f97..b11d243d48 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ServerNotReadyExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ServerNotReadyExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import io.onedev.server.exception.HttpResponse;import io.onedev.server.exception.ServerNotReadyException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.javaindex 203ea7836a..e06418117a 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java@@ -1,6 +1,6 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.hibernate.StaleStateException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/UnauthenticatedExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/UnauthenticatedExceptionHandler.javaindex d38e3fe841..16b8d08a64 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/UnauthenticatedExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/UnauthenticatedExceptionHandler.java@@ -1,9 +1,9 @@package io.onedev.server.exception.handler;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;import org.apache.shiro.authz.UnauthenticatedException;diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/UnauthorizedExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/UnauthorizedExceptionHandler.javaindex f9650cf0f1..e09bc57197 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/UnauthorizedExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/UnauthorizedExceptionHandler.java@@ -5,10 +5,10 @@ import io.onedev.server.exception.HttpResponseBody;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;public class UnauthorizedExceptionHandler extends AbstractExceptionHandler<UnauthorizedException> {diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ValidationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ValidationExceptionHandler.javaindex adf7420f6a..955102c334 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/ValidationExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ValidationExceptionHandler.java@@ -2,8 +2,8 @@ package io.onedev.server.exception.handler;import io.onedev.server.exception.HttpResponse;-import javax.servlet.http.HttpServletResponse;-import javax.validation.ValidationException;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.validation.ValidationException;public class ValidationExceptionHandler extends AbstractExceptionHandler<ValidationException> {diff --git a/server-core/src/main/java/io/onedev/server/git/BlameCommit.java b/server-core/src/main/java/io/onedev/server/git/BlameCommit.javaindex 240ce6ed3d..cb386aeb0e 100644--- a/server-core/src/main/java/io/onedev/server/git/BlameCommit.java+++ b/server-core/src/main/java/io/onedev/server/git/BlameCommit.java@@ -68,7 +68,7 @@ public class BlameCommit implements Serializable {return MoreObjects.toStringHelper(this).add("hash", hash).add("committer", committer.getName())- .add("date", committer.getWhen())+ .add("date", Date.from(committer.getWhenAsInstant())).add("messageSummary", subject).toString();}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 0be34f586d..f2c63cdb05 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -12,26 +12,26 @@ import java.io.OutputStream;import java.util.Set;import java.util.concurrent.ExecutionException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.EntityNotFoundException;-import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.EntityNotFoundException;+import jakarta.servlet.Filter;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.javaindex 751c142337..886498680c 100644--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java@@ -5,16 +5,16 @@ import static io.onedev.k8shelper.KubernetesHelper.BEARER;import static io.onedev.server.model.Project.decodeFullRepoNameAsPath;import static io.onedev.server.util.CollectionUtils.newHashMap;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-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_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+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_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;import static org.apache.commons.lang3.StringUtils.substringBeforeLast;import static org.apache.tika.mime.MimeTypes.OCTET_STREAM;import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING;@@ -31,27 +31,27 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicReference;import java.util.function.BooleanSupplier;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.Filter;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.commons.codec.binary.Hex;import org.apache.commons.lang3.StringUtils;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/git/GitLocationProvider.java b/server-core/src/main/java/io/onedev/server/git/GitLocationProvider.javaindex 3ff2981fe7..065dd905d9 100644--- a/server-core/src/main/java/io/onedev/server/git/GitLocationProvider.java+++ b/server-core/src/main/java/io/onedev/server/git/GitLocationProvider.java@@ -1,8 +1,8 @@package io.onedev.server.git;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.inject.Singleton;import io.onedev.server.service.SettingService;import io.onedev.server.git.location.GitLocation;diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex 1619544344..7e55ef3d3e 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -303,7 +303,7 @@ public class GitUtils {}public static PersonIdent newPersonIdent(String name, String email, Date when) {- return new PersonIdent(name, email, when.getTime(), SystemReader.getInstance().getTimezone(when.getTime()));+ return new PersonIdent(name, email, when.toInstant(), SystemReader.getInstance().getTimeZoneAt(when.toInstant()));}/**diff --git a/server-core/src/main/java/io/onedev/server/git/GoGetFilter.java b/server-core/src/main/java/io/onedev/server/git/GoGetFilter.javaindex d46eee4f4e..6ced8c3c8a 100644--- a/server-core/src/main/java/io/onedev/server/git/GoGetFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GoGetFilter.java@@ -4,16 +4,16 @@ import java.io.IOException;import java.net.URL;import java.nio.charset.StandardCharsets;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.Filter;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import com.google.common.base.Splitter;diff --git a/server-core/src/main/java/io/onedev/server/git/LastCommitsOfChildren.java b/server-core/src/main/java/io/onedev/server/git/LastCommitsOfChildren.javanew file mode 100644index 0000000000..75c00cdd2b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/git/LastCommitsOfChildren.java@@ -0,0 +1,254 @@+package io.onedev.server.git;++import java.io.IOException;+import java.io.InterruptedIOException;+import java.io.Serializable;+import java.nio.charset.StandardCharsets;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Map;+import java.util.Set;++import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.DateRevQueue;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.eclipse.jgit.treewalk.filter.TreeFilter;+import org.eclipse.jgit.util.RawParseUtils;+import org.jspecify.annotations.Nullable;++import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.git.LastCommitsOfChildren.Value;++/**+ * Finds the last commits of all immediate children of a Git tree in one history+ * traversal. Directory entries are compared by tree ID without opening their+ * contents. Only commits contributing a result need their message and author.+ */+public final class LastCommitsOfChildren extends HashMap<String, Value> {++ private static final long serialVersionUID = 1L;++ public LastCommitsOfChildren(Repository repo, AnyObjectId until) {+ this(repo, until, null, null);+ }++ public LastCommitsOfChildren(Repository repo, AnyObjectId until, @Nullable String treePath) {+ this(repo, until, treePath, null);+ }++ public LastCommitsOfChildren(Repository repo, AnyObjectId until, @Nullable Cache cache) {+ this(repo, until, null, cache);+ }++ /**+ * @param treePath+ * directory to list; null or empty refers to the repository root+ * @param cache+ * optional results for the same directory at earlier commits+ */+ public LastCommitsOfChildren(Repository repo, AnyObjectId until,+ @Nullable String treePath, @Nullable Cache cache) {+ try (RevWalk revWalk = new RevWalk(repo)) {+ revWalk.setRetainBody(false);+ treePath = GitUtils.normalizePath(treePath);+ if (treePath == null)+ treePath = "";+ byte[] treePathRaw = Constants.encode(treePath);+ RevCommit untilCommit = revWalk.parseCommit(until);+ Set<String> remaining = new HashSet<>();+ try (TreeWalk treeWalk = new TreeWalk(revWalk.getObjectReader())) {+ if (treePath.isEmpty()) {+ treeWalk.addTree(untilCommit.getTree());+ } else {+ try (TreeWalk pathWalk = TreeWalk.forPath(revWalk.getObjectReader(), treePath,+ untilCommit.getTree())) {+ if (pathWalk == null || !FileMode.TREE.equals(pathWalk.getFileMode(0)))+ throw new IllegalArgumentException("Path '" + treePath + "' does not exist or is not a tree.");+ treeWalk.addTree(pathWalk.getObjectId(0));+ }+ }+ while (treeWalk.next())+ remaining.add(treeWalk.getPathString());+ }++ // Batch children reaching the same commit, but keep each child's history+ // separate: a merge follows its first parent with an identical entry.+ DateRevQueue pending = new DateRevQueue();+ Map<RevCommit, Set<String>> childrenByCommit = new HashMap<>();+ if (!remaining.isEmpty()) {+ pending.add(untilCommit);+ childrenByCommit.put(untilCommit, remaining);+ }++ RevCommit commit;+ while ((commit = pending.next()) != null) {+ if (Thread.currentThread().isInterrupted())+ throw new InterruptedIOException("Interrupted while loading last commits");+ Set<String> children = childrenByCommit.remove(commit);+ if (cache != null) {+ Map<String, Value> cached = cache.getLastCommitsOfChildren(commit);+ if (cached != null) {+ var iterator = children.iterator();+ while (iterator.hasNext()) {+ String child = iterator.next();+ Value value = cached.get(child);+ if (value != null) {+ put(child, value);+ iterator.remove();+ }+ }+ }+ }+ if (children.isEmpty())+ continue;++ Set<String> modified = new HashSet<>();+ findChanges(revWalk, commit, treePathRaw, children, modified, pending, childrenByCommit);+ if (!modified.isEmpty()) {+ revWalk.parseBody(commit);+ Value value = new Value(commit);+ for (String child : modified)+ put(child, value);+ commit.disposeBody();+ }+ if (!children.isEmpty()) {+ RevCommit parent = commit.getParent(0);+ Set<String> queued = childrenByCommit.putIfAbsent(parent, children);+ if (queued == null)+ pending.add(parent);+ else+ queued.addAll(children);+ }+ }+ } catch (IOException e) {+ throw ExceptionUtils.unchecked(e);+ }+ }++ private static void findChanges(RevWalk revWalk, RevCommit commit, byte[] treePath,+ Set<String> children, Set<String> modified, DateRevQueue pending,+ Map<RevCommit, Set<String>> childrenByCommit) throws IOException {+ RevCommit[] parents = commit.getParents();+ try (TreeWalk treeWalk = new TreeWalk(revWalk.getObjectReader())) {+ for (RevCommit parent : parents) {+ revWalk.parseHeaders(parent);+ treeWalk.addTree(parent.getTree());+ }+ treeWalk.addTree(commit.getTree());+ treeWalk.setFilter(TreeFilter.ANY_DIFF);+ while (treeWalk.next()) {+ if (treePath.length != 0 && treeWalk.isPathPrefix(treePath, treePath.length) != 0)+ continue;+ int pathLength = treeWalk.getPathLength();+ if (pathLength <= treePath.length) {+ if (treeWalk.isSubtree())+ treeWalk.enterSubtree();+ } else {+ String child = RawParseUtils.decode(StandardCharsets.UTF_8, treeWalk.getRawPath(),+ treePath.length != 0 ? treePath.length + 1 : 0, pathLength);+ // TreeWalk reports a file/directory conflict as separate entries.+ // Each routed child exists in this commit; ignore the other type's+ // entry instead of mistaking two missing entries for a match.+ if (!children.contains(child) || treeWalk.getRawMode(parents.length) == 0)+ continue;+ int matchingParent = -1;+ for (int i = 0; i < parents.length; i++) {+ if (treeWalk.getRawMode(i) == treeWalk.getRawMode(parents.length)+ && treeWalk.idEqual(i, parents.length)) {+ matchingParent = i;+ break;+ }+ }+ if (matchingParent == -1) {+ modified.add(child);+ children.remove(child);+ } else if (matchingParent != 0) {+ // Other children may need a different parent. Do not let+ // those branches contribute changes discarded for this child.+ children.remove(child);+ RevCommit parent = parents[matchingParent];+ Set<String> queued = childrenByCommit.get(parent);+ if (queued == null) {+ queued = new HashSet<>();+ childrenByCommit.put(parent, queued);+ pending.add(parent);+ }+ queued.add(child);+ }+ }+ }+ }+ // Entries identical to every parent are omitted by ANY_DIFF and follow+ // the first parent. There is deliberately no global "visited" flag:+ // clock skew may bring another child's history to this commit later.+ }++ public static class Value implements Serializable {++ private static final long serialVersionUID = 1L;++ private final ObjectId id;++ private final PersonIdent author;++ private final Date commitDate;++ private final String summary;++ public Value(RevCommit commit) {+ this.id = commit.copy();+ this.author = commit.getAuthorIdent();+ this.commitDate = Date.from(commit.getCommitterIdent().getWhenAsInstant());+ this.summary = StringUtils.substringBefore(commit.getFullMessage(), "\n").trim();+ }++ public ObjectId getId() {+ return id;+ }++ public String getSummary() {+ return summary;+ }++ public PersonIdent getAuthor() {+ return author;+ }++ public Date getCommitDate() {+ return commitDate;+ }++ @Override+ public boolean equals(Object obj) {+ if (obj instanceof Value) {+ Value value = (Value) obj;+ return id.equals(value.getId());+ } else {+ return false;+ }+ }++ @Override+ public String toString() {+ return id.name();+ }++ }++ public static interface Cache {++ @Nullable+ Map<String, Value> getLastCommitsOfChildren(ObjectId commitId);++ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/SshCommandCreator.javaindex 641af81cea..a1467f409d 100644--- a/server-core/src/main/java/io/onedev/server/git/SshCommandCreator.java+++ b/server-core/src/main/java/io/onedev/server/git/SshCommandCreator.java@@ -2,7 +2,7 @@ package io.onedev.server.git;import java.util.Map;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.apache.sshd.server.command.Command;import org.eclipse.jgit.transport.RemoteConfig;diff --git a/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java b/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.javaindex 60c34d0bfc..25ef97fbb0 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java+++ b/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java@@ -2,7 +2,7 @@ package io.onedev.server.git.exception;import io.onedev.server.exception.HttpResponseAwareException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class ObjectAlreadyExistsException extends HttpResponseAwareException {diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.javaindex 6ea680b1a7..cfaa0700c9 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java@@ -7,12 +7,12 @@ import java.io.IOException;import java.util.ArrayList;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.commons.lang3.tuple.ImmutableTriple;import org.apache.commons.lang3.tuple.Triple;diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.javaindex 285cb00227..82173a34d6 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPreReceiveCallback.java@@ -14,12 +14,12 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/git/hook/Output.java b/server-core/src/main/java/io/onedev/server/git/hook/Output.javaindex 75fc1c9c7f..870dae1e60 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/Output.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/Output.java@@ -2,7 +2,7 @@ package io.onedev.server.git.hook;import java.io.IOException;-import javax.servlet.ServletOutputStream;+import jakarta.servlet.ServletOutputStream;public class Output {diff --git a/server-core/src/main/java/io/onedev/server/git/location/CurlLocation.java b/server-core/src/main/java/io/onedev/server/git/location/CurlLocation.javaindex 02aee77742..25888da0c0 100644--- a/server-core/src/main/java/io/onedev/server/git/location/CurlLocation.java+++ b/server-core/src/main/java/io/onedev/server/git/location/CurlLocation.java@@ -2,7 +2,7 @@ package io.onedev.server.git.location;import java.io.Serializable;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import org.apache.commons.lang3.exception.ExceptionUtils;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/git/location/GitLocation.java b/server-core/src/main/java/io/onedev/server/git/location/GitLocation.javaindex 184d36789f..5e8123ce61 100644--- a/server-core/src/main/java/io/onedev/server/git/location/GitLocation.java+++ b/server-core/src/main/java/io/onedev/server/git/location/GitLocation.java@@ -2,7 +2,7 @@ package io.onedev.server.git.location;import java.io.Serializable;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.git.GitUtils;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/git/location/SpecifiedCurl.java b/server-core/src/main/java/io/onedev/server/git/location/SpecifiedCurl.javaindex 037a07c277..b7d2eb0769 100644--- a/server-core/src/main/java/io/onedev/server/git/location/SpecifiedCurl.java+++ b/server-core/src/main/java/io/onedev/server/git/location/SpecifiedCurl.java@@ -1,6 +1,6 @@package io.onedev.server.git.location;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/git/location/SpecifiedGit.java b/server-core/src/main/java/io/onedev/server/git/location/SpecifiedGit.javaindex 5e29f576b3..efe8b37bd0 100644--- a/server-core/src/main/java/io/onedev/server/git/location/SpecifiedGit.java+++ b/server-core/src/main/java/io/onedev/server/git/location/SpecifiedGit.java@@ -1,6 +1,6 @@package io.onedev.server.git.location;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.javaindex e0fc1313fd..1785c6efbc 100644--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java@@ -27,8 +27,8 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.ReadWriteLock;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.lang3.SerializationUtils;import org.bouncycastle.openpgp.PGPSecretKeyRing;@@ -51,8 +51,6 @@ import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.lib.TagBuilder;import org.eclipse.jgit.lib.TreeFormatter;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;@@ -91,6 +89,8 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitTask;import io.onedev.server.git.GitUtils;+import io.onedev.server.git.LastCommitsOfChildren;+import io.onedev.server.git.LastCommitsOfChildren.Value;import io.onedev.server.git.Submodule;import io.onedev.server.git.command.BlameCommand;import io.onedev.server.git.command.GetRawCommitCommand;@@ -115,6 +115,8 @@ public class DefaultGitService implements GitService, Serializable {private static final Logger logger = LoggerFactory.getLogger(DefaultGitService.class);private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;++ private static final int LAST_COMMITS_CACHE_VERSION = 3;private final ProjectService projectService;@@ -1240,14 +1242,23 @@ public class DefaultGitService implements GitService, Serializable {final Set<ObjectId> commitIds = new HashSet<>();- lock.readLock().lock();+ lock.writeLock().lock();try {- if (cacheDir.exists()) {- for (String each: cacheDir.list())+ File versionFile = new File(cacheDir, "version.txt");+ String version = String.valueOf(LAST_COMMITS_CACHE_VERSION);+ if (!versionFile.exists()+ || !FileUtils.readFileToString(versionFile, StandardCharsets.UTF_8).trim().equals(version)) {+ FileUtils.cleanDir(cacheDir);+ FileUtils.writeFile(versionFile, version, StandardCharsets.UTF_8);+ }+ for (String each: cacheDir.list()) {+ if (!each.equals(versionFile.getName()))commitIds.add(ObjectId.fromString(each));- }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);} finally {- lock.readLock().unlock();+ lock.writeLock().unlock();}LastCommitsOfChildren.Cache cache;diff --git a/server-core/src/main/java/io/onedev/server/git/service/GitService.java b/server-core/src/main/java/io/onedev/server/git/service/GitService.javaindex ab2dae6735..3391eae17c 100644--- a/server-core/src/main/java/io/onedev/server/git/service/GitService.java+++ b/server-core/src/main/java/io/onedev/server/git/service/GitService.java@@ -10,7 +10,6 @@ import io.onedev.server.model.support.code.BranchProtection;import org.eclipse.jgit.lib.AnyObjectId;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;import org.eclipse.jgit.revwalk.RevCommit;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/git/service/RefFacade.java b/server-core/src/main/java/io/onedev/server/git/service/RefFacade.javaindex a001f0be00..a18f01c9a9 100644--- a/server-core/src/main/java/io/onedev/server/git/service/RefFacade.java+++ b/server-core/src/main/java/io/onedev/server/git/service/RefFacade.java@@ -57,17 +57,17 @@ public class RefFacade implements Comparable<RefFacade>, Serializable {public int compareTo(RefFacade other) {Date date;if (obj instanceof RevTag && ((RevTag)obj).getTaggerIdent() != null) {- date = ((RevTag)obj).getTaggerIdent().getWhen();+ date = Date.from(((RevTag)obj).getTaggerIdent().getWhenAsInstant());} else if (peeledObj instanceof RevCommit) {- date = ((RevCommit)peeledObj).getCommitterIdent().getWhen();+ date = Date.from(((RevCommit)peeledObj).getCommitterIdent().getWhenAsInstant());} else {date = null;}Date otherDate;if (other.obj instanceof RevTag && ((RevTag)other.obj).getTaggerIdent() != null) {- otherDate = ((RevTag)other.obj).getTaggerIdent().getWhen();+ otherDate = Date.from(((RevTag)other.obj).getTaggerIdent().getWhenAsInstant());} else if (other.peeledObj instanceof RevCommit) {- otherDate = ((RevCommit)other.peeledObj).getCommitterIdent().getWhen();+ otherDate = Date.from(((RevCommit)other.peeledObj).getCommitterIdent().getWhenAsInstant());} else {otherDate = null;}diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/DefaultSignatureVerificationService.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/DefaultSignatureVerificationService.javaindex e4d1b5643e..566913e2e6 100644--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/DefaultSignatureVerificationService.java+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/DefaultSignatureVerificationService.java@@ -8,8 +8,8 @@ import org.eclipse.jgit.revwalk.RevTag;import org.eclipse.jgit.util.RawParseUtils;import org.jetbrains.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.Arrays;import java.util.Set;diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSignatureVerifier.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSignatureVerifier.javaindex 36b12f6fbf..e02d1031ac 100644--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSignatureVerifier.java+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/gpg/GpgSignatureVerifier.java@@ -13,8 +13,8 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvimport org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.javaindex 9a6ea0e94f..be71954ca1 100644--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java@@ -15,8 +15,8 @@ import org.bouncycastle.crypto.signers.Ed25519Signer;import org.bouncycastle.crypto.signers.RSADigestSigner;import org.bouncycastle.util.io.pem.PemReader;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.StringReader;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/jetty/ClusterSessionDataStore.java b/server-core/src/main/java/io/onedev/server/jetty/ClusterSessionDataStore.javaindex 4723b6e04f..38c92cabf2 100644--- a/server-core/src/main/java/io/onedev/server/jetty/ClusterSessionDataStore.java+++ b/server-core/src/main/java/io/onedev/server/jetty/ClusterSessionDataStore.java@@ -19,10 +19,10 @@package io.onedev.server.jetty;import com.hazelcast.map.IMap;-import org.eclipse.jetty.server.session.AbstractSessionDataStore;-import org.eclipse.jetty.server.session.SessionContext;-import org.eclipse.jetty.server.session.SessionData;-import org.eclipse.jetty.server.session.UnreadableSessionDataException;+import org.eclipse.jetty.session.AbstractSessionDataStore;+import org.eclipse.jetty.session.SessionContext;+import org.eclipse.jetty.session.SessionData;+import org.eclipse.jetty.session.UnreadableSessionDataException;import org.eclipse.jetty.util.annotation.ManagedObject;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -47,8 +47,7 @@ public class ClusterSessionDataStore extends AbstractSessionDataStore {if (logger.isDebugEnabled())logger.debug("Loading session {} from hazelcast", id);- SessionData sd = sessionDataMap.get(id);- return sd;+ return sessionDataMap.get(id);} catch (Exception e) {throw new UnreadableSessionDataException(id, _context, e);}@@ -85,8 +84,7 @@ public class ClusterSessionDataStore extends AbstractSessionDataStore {}@Override- public Set<String> doGetExpired(Set<String> candidates) {- var now = System.currentTimeMillis();+ public Set<String> doCheckExpired(Set<String> candidates, long now) {return candidates.stream().filter(candidate -> {try {@@ -122,7 +120,7 @@ public class ClusterSessionDataStore extends AbstractSessionDataStore {}@Override- public boolean exists(String id)+ public boolean doExists(String id)throws Exception {SessionData sd = load(id);if (sd == null)@@ -134,4 +132,19 @@ public class ClusterSessionDataStore extends AbstractSessionDataStore {return sd.getExpiry() > System.currentTimeMillis(); //not expired yet}+ @Override+ public Set<String> doGetExpired(long timeLimit) {+ return sessionDataMap.values(com.hazelcast.query.Predicates.and(+ com.hazelcast.query.Predicates.greaterThan("expiry", 0L),+ com.hazelcast.query.Predicates.lessEqual("expiry", timeLimit)))+ .stream().map(SessionData::getId).collect(Collectors.toSet());+ }++ @Override+ public void doCleanOrphans(long timeLimit) {+ sessionDataMap.removeAll(com.hazelcast.query.Predicates.and(+ com.hazelcast.query.Predicates.greaterThan("expiry", 0L),+ com.hazelcast.query.Predicates.lessEqual("expiry", timeLimit)));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.javaindex ac456dba54..b6471fe85b 100644--- a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java+++ b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java@@ -8,23 +8,25 @@ import java.util.EnumSet;import java.util.List;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.inject.Singleton;-import javax.servlet.DispatcherType;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.inject.Singleton;+import jakarta.servlet.DispatcherType;+import jakarta.servlet.http.HttpServletResponse;import org.apache.tika.mime.MimeTypes;import org.eclipse.jetty.http.HttpCookie.SameSite;import org.eclipse.jetty.http.HttpMethod;import org.eclipse.jetty.server.Server;-import org.eclipse.jetty.server.handler.gzip.GzipHandler;-import org.eclipse.jetty.server.handler.HandlerList;-import org.eclipse.jetty.server.session.DefaultSessionIdManager;-import org.eclipse.jetty.server.session.HouseKeeper;-import org.eclipse.jetty.server.session.SessionDataStoreFactory;-import org.eclipse.jetty.servlet.ErrorPageErrorHandler;-import org.eclipse.jetty.servlet.ServletContextHandler;+import org.eclipse.jetty.compression.gzip.GzipCompression;+import org.eclipse.jetty.compression.server.CompressionConfig;+import org.eclipse.jetty.compression.server.CompressionHandler;+import org.eclipse.jetty.server.Handler;+import org.eclipse.jetty.session.DefaultSessionIdManager;+import org.eclipse.jetty.session.HouseKeeper;+import org.eclipse.jetty.session.SessionDataStoreFactory;+import org.eclipse.jetty.ee11.servlet.ErrorPageErrorHandler;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -91,7 +93,7 @@ public class DefaultJettyService implements JettyService, Serializable {throw ExceptionUtils.unchecked(e);}sessionIdManager.setSessionHouseKeeper(houseKeeper);- server.setSessionIdManager(sessionIdManager);+ server.addBean(sessionIdManager, true);server.addBean(sessionDataStoreFactory);@@ -99,6 +101,7 @@ public class DefaultJettyService implements JettyService, Serializable {servletContextHandler.setMaxFormContentSize(MAX_CONTENT_SIZE);servletContextHandler.setClassLoader(OneDev.class.getClassLoader());+ org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer.configure(servletContextHandler, null);servletContextHandler.setErrorHandler(new ErrorPageErrorHandler());servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));@@ -109,6 +112,7 @@ public class DefaultJettyService implements JettyService, Serializable {var sessionTimeout = DEFAULT_SESSION_TIMEOUT;if (settingService.getSystemSetting() != null && settingService.getSystemSetting().getSessionTimeout() != null)sessionTimeout = settingService.getSystemSetting().getSessionTimeout() * 60;+servletContextHandler.getSessionHandler().setMaxInactiveInterval(sessionTimeout);/*@@ -129,19 +133,15 @@ public class DefaultJettyService implements JettyService, Serializable {servletContextHandler.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();+ errorHandler.setBufferSize(64 * 1024);errorHandler.addErrorPage(HttpServletResponse.SC_NOT_FOUND, "/~errors/404");servletContextHandler.setErrorHandler(errorHandler);- GzipHandler gzipHandler = new GzipHandler();- gzipHandler.setHandler(servletContextHandler);- gzipHandler.setIncludedMethods(HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.PUT.name());- gzipHandler.setExcludedMimeTypes(MimeTypes.OCTET_STREAM);-- var handlers = new HandlerList();+ var handlers = new Handler.Sequence();handlers.addHandler(new ProbeHandler(() -> OneDev.getInstance().isReady()&& !OneDev.getInstance().isStopping()&& !OneDev.getMaintenanceFile(Bootstrap.installDir).exists()));- handlers.addHandler(gzipHandler);+ handlers.addHandler(newCompressionHandler(servletContextHandler));server.setHandler(handlers);for (ServerConfigurator configurator: serverConfiguratorsProvider.get())@@ -156,6 +156,22 @@ public class DefaultJettyService implements JettyService, Serializable {}}+ static CompressionHandler newCompressionHandler(Handler handler) {+ var compression = new CompressionHandler(handler);+ var gzip = new GzipCompression();+ gzip.setMinCompressSize(32);+ compression.putCompression(gzip);+ compression.putConfiguration("/*", CompressionConfig.builder()+ .compressIncludeMethod(HttpMethod.GET.name())+ .compressIncludeMethod(HttpMethod.POST.name())+ .compressIncludeMethod(HttpMethod.PUT.name())+ .compressExcludeMimeType(MimeTypes.OCTET_STREAM)+ // The former GzipHandler only compressed responses; keep request bodies intact.+ .decompressExcludePath("/*")+ .build());+ return compression;+ }+@Overridepublic void stop() {if (server != null && server.isStarted()) {diff --git a/server-core/src/main/java/io/onedev/server/jetty/DefaultSessionDataStoreFactory.java b/server-core/src/main/java/io/onedev/server/jetty/DefaultSessionDataStoreFactory.javaindex 0ba4706613..fd425c35dd 100644--- a/server-core/src/main/java/io/onedev/server/jetty/DefaultSessionDataStoreFactory.java+++ b/server-core/src/main/java/io/onedev/server/jetty/DefaultSessionDataStoreFactory.java@@ -18,12 +18,12 @@package io.onedev.server.jetty;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.eclipse.jetty.server.session.AbstractSessionDataStoreFactory;-import org.eclipse.jetty.server.session.SessionDataStore;-import org.eclipse.jetty.server.session.SessionHandler;+import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;+import org.eclipse.jetty.session.SessionDataStore;+import org.eclipse.jetty.session.SessionManager;import io.onedev.server.cluster.ClusterService;@@ -38,7 +38,7 @@ public class DefaultSessionDataStoreFactory extends AbstractSessionDataStoreFact}@Override- public SessionDataStore getSessionDataStore(SessionHandler handler) {+ public SessionDataStore getSessionDataStore(SessionManager handler) {ClusterSessionDataStore sessionDataStore = new ClusterSessionDataStore();sessionDataStore.setSessionDataMap(clusterService.getHazelcastInstance().getMap("jettySessionData"));return sessionDataStore;diff --git a/server-core/src/main/java/io/onedev/server/jetty/DisableTraceFilter.java b/server-core/src/main/java/io/onedev/server/jetty/DisableTraceFilter.javaindex d3d1922450..819bb411d8 100644--- a/server-core/src/main/java/io/onedev/server/jetty/DisableTraceFilter.java+++ b/server-core/src/main/java/io/onedev/server/jetty/DisableTraceFilter.java@@ -2,14 +2,14 @@ package io.onedev.server.jetty;import java.io.IOException;-import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.Filter;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;public class DisableTraceFilter implements Filter {diff --git a/server-core/src/main/java/io/onedev/server/jetty/JettyService.java b/server-core/src/main/java/io/onedev/server/jetty/JettyService.javaindex 0cd59a0e3f..73fa38fb79 100644--- a/server-core/src/main/java/io/onedev/server/jetty/JettyService.java+++ b/server-core/src/main/java/io/onedev/server/jetty/JettyService.java@@ -1,6 +1,6 @@package io.onedev.server.jetty;-import org.eclipse.jetty.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;public interface JettyService {diff --git a/server-core/src/main/java/io/onedev/server/jetty/MaintenanceProbeServer.java b/server-core/src/main/java/io/onedev/server/jetty/MaintenanceProbeServer.javaindex 7ff66bfa66..f0f69a319d 100644--- a/server-core/src/main/java/io/onedev/server/jetty/MaintenanceProbeServer.java+++ b/server-core/src/main/java/io/onedev/server/jetty/MaintenanceProbeServer.java@@ -4,8 +4,11 @@ import java.io.File;import java.net.HttpURLConnection;import java.net.URL;+import org.eclipse.jetty.server.Request;+import org.eclipse.jetty.server.Response;import org.eclipse.jetty.server.Server;import org.eclipse.jetty.server.ServerConnector;+import org.eclipse.jetty.util.Callback;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -32,7 +35,19 @@ public class MaintenanceProbeServer implements AutoCloseable {connector.setHost(serverConfig.getHttpHost());connector.setPort(serverConfig.getHttpPort());server.addConnector(connector);- server.setHandler(new ProbeHandler(() -> false));+ server.setHandler(new ProbeHandler(() -> false) {+ @Override+ public boolean handle(Request request, Response response, Callback callback) {+ // Agents may connect before the main server takes over this port.+ if (request.getHttpURI().getPath().equals("/~server")) {+ response.setStatus(HttpURLConnection.HTTP_UNAVAILABLE);+ response.getHeaders().put("Cache-Control", "no-store");+ response.write(true, null, callback);+ return true;+ }+ return super.handle(request, response, callback);+ }+ });server.start();return new MaintenanceProbeServer(server);} catch (Exception e) {diff --git a/server-core/src/main/java/io/onedev/server/jetty/ProbeHandler.java b/server-core/src/main/java/io/onedev/server/jetty/ProbeHandler.javaindex 59af790266..81739fe88a 100644--- a/server-core/src/main/java/io/onedev/server/jetty/ProbeHandler.java+++ b/server-core/src/main/java/io/onedev/server/jetty/ProbeHandler.java@@ -1,15 +1,17 @@package io.onedev.server.jetty;-import java.io.IOException;+import java.nio.ByteBuffer;+import java.nio.charset.StandardCharsets;import java.util.function.BooleanSupplier;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.eclipse.jetty.server.Request;-import org.eclipse.jetty.server.handler.AbstractHandler;+import org.eclipse.jetty.server.Handler;+import org.eclipse.jetty.server.Response;+import org.eclipse.jetty.util.Callback;-public class ProbeHandler extends AbstractHandler {+public class ProbeHandler extends Handler.Abstract {public static final String HEALTH_PATH = "/healthz";@@ -22,34 +24,34 @@ public class ProbeHandler extends AbstractHandler {}@Override- public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)- throws IOException {+ public boolean handle(Request request, Response response, Callback callback) {+ String target = request.getHttpURI().getPath();if (target.equals(HEALTH_PATH) || target.equals(READINESS_PATH)) {if (request.getMethod().equals("GET") || request.getMethod().equals("HEAD")) {if (target.equals(HEALTH_PATH)) {- respond(baseRequest, response, HttpServletResponse.SC_OK);+ respond(request, response, callback, HttpServletResponse.SC_OK);} else {- respond(baseRequest, response, readiness.getAsBoolean()+ respond(request, response, callback, readiness.getAsBoolean()? HttpServletResponse.SC_OK: HttpServletResponse.SC_SERVICE_UNAVAILABLE);}} else {- response.setHeader("Allow", "GET, HEAD");- respond(baseRequest, response, HttpServletResponse.SC_METHOD_NOT_ALLOWED);+ response.getHeaders().put("Allow", "GET, HEAD");+ respond(request, response, callback, HttpServletResponse.SC_METHOD_NOT_ALLOWED);}+ return true;}+ return false;}- private void respond(Request baseRequest, HttpServletResponse response, int status) throws IOException {+ private void respond(Request request, Response response, Callback callback, int status) {response.setStatus(status);- response.setContentType("text/plain");- response.setCharacterEncoding("UTF-8");- response.setHeader("Cache-Control", "no-store");- if (status == HttpServletResponse.SC_OK)- response.getWriter().println("ok");- else if (status == HttpServletResponse.SC_SERVICE_UNAVAILABLE)- response.getWriter().println("not ready");- baseRequest.setHandled(true);+ response.getHeaders().put("Content-Type", "text/plain;charset=UTF-8");+ response.getHeaders().put("Cache-Control", "no-store");+ String body = status == HttpServletResponse.SC_OK ? "ok\n"+ : status == HttpServletResponse.SC_SERVICE_UNAVAILABLE ? "not ready\n" : "";+ response.write(true, request.getMethod().equals("HEAD") ? null+ : ByteBuffer.wrap(body.getBytes(StandardCharsets.UTF_8)), callback);}}diff --git a/server-core/src/main/java/io/onedev/server/jetty/ServletConfigurator.java b/server-core/src/main/java/io/onedev/server/jetty/ServletConfigurator.javaindex 62e3b612cf..2c370a9cc9 100644--- a/server-core/src/main/java/io/onedev/server/jetty/ServletConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/jetty/ServletConfigurator.java@@ -1,6 +1,6 @@package io.onedev.server.jetty;-import org.eclipse.jetty.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;import io.onedev.commons.loader.ExtensionPoint;diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.javaindex 1c719fda07..9c9732425b 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java@@ -34,18 +34,18 @@ import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.Lock;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.validation.ConstraintViolation;-import javax.validation.ValidationException;-import javax.validation.Validator;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.ValidationException;+import jakarta.validation.Validator;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.javaindex a31bc17127..8306dc53d5 100644--- a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.job.match;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.match.WildcardUtils;diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.javaindex ddc6256695..20ea8eb75c 100644--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java@@ -8,10 +8,10 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;diff --git a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.javaindex 67ca4fd79b..06d1ecdb66 100644--- a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.job.match;import static io.onedev.commons.utils.match.WildcardUtils.matchPath;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.javaindex 22bf920226..02cce2014b 100644--- a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.job.match;import static io.onedev.server.model.Build.NAME_PROJECT;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.match.WildcardUtils;diff --git a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.javaindex a36c36132f..92f2d3dbd2 100644--- a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java+++ b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java@@ -29,8 +29,8 @@ import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;import java.util.regex.Pattern;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.antlr.v4.runtime.tree.TerminalNode;import org.apache.commons.lang3.Strings;diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.javaindex 6cf9ffa3d2..3fb840f2e5 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java@@ -33,27 +33,27 @@ import java.util.concurrent.atomic.AtomicReference;import java.util.function.Consumer;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.mail.Authenticator;-import javax.mail.Folder;-import javax.mail.FolderClosedException;-import javax.mail.Message;-import javax.mail.MessagingException;-import javax.mail.Multipart;-import javax.mail.Part;-import javax.mail.PasswordAuthentication;-import javax.mail.Session;-import javax.mail.Store;-import javax.mail.Transport;-import javax.mail.internet.AddressException;-import javax.mail.internet.ContentType;-import javax.mail.internet.InternetAddress;-import javax.mail.internet.MimeBodyPart;-import javax.mail.internet.MimeMessage;-import javax.mail.internet.MimeMessage.RecipientType;-import javax.mail.internet.MimeMultipart;-import javax.mail.internet.MimeUtility;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.mail.Authenticator;+import jakarta.mail.Folder;+import jakarta.mail.FolderClosedException;+import jakarta.mail.Message;+import jakarta.mail.MessagingException;+import jakarta.mail.Multipart;+import jakarta.mail.Part;+import jakarta.mail.PasswordAuthentication;+import jakarta.mail.Session;+import jakarta.mail.Store;+import jakarta.mail.Transport;+import jakarta.mail.internet.AddressException;+import jakarta.mail.internet.ContentType;+import jakarta.mail.internet.InternetAddress;+import jakarta.mail.internet.MimeBodyPart;+import jakarta.mail.internet.MimeMessage;+import jakarta.mail.internet.MimeMessage.RecipientType;+import jakarta.mail.internet.MimeMultipart;+import jakarta.mail.internet.MimeUtility;import org.apache.commons.codec.binary.Base64;import org.apache.commons.codec.digest.DigestUtils;@@ -75,7 +75,7 @@ import com.google.common.base.Joiner;import com.hazelcast.cluster.MembershipEvent;import com.hazelcast.cluster.MembershipListener;import com.ibm.icu.impl.locale.XCldrStub.Splitter;-import com.sun.mail.imap.IMAPFolder;+import org.eclipse.angus.mail.imap.IMAPFolder;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;diff --git a/server-core/src/main/java/io/onedev/server/mail/InboxMonitor.java b/server-core/src/main/java/io/onedev/server/mail/InboxMonitor.javaindex 918ab06146..2eb5745171 100644--- a/server-core/src/main/java/io/onedev/server/mail/InboxMonitor.java+++ b/server-core/src/main/java/io/onedev/server/mail/InboxMonitor.java@@ -1,6 +1,6 @@package io.onedev.server.mail;-import javax.mail.Message;+import jakarta.mail.Message;import java.util.concurrent.Future;import java.util.function.Consumer;diff --git a/server-core/src/main/java/io/onedev/server/mail/MailService.java b/server-core/src/main/java/io/onedev/server/mail/MailService.javaindex 6ab1233fe1..6f71d3ca19 100644--- a/server-core/src/main/java/io/onedev/server/mail/MailService.java+++ b/server-core/src/main/java/io/onedev/server/mail/MailService.java@@ -5,7 +5,7 @@ import java.util.concurrent.Future;import java.util.function.Consumer;import org.jspecify.annotations.Nullable;-import javax.mail.Message;+import jakarta.mail.Message;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.javaindex 5fdbc2ed28..4d5d7e99b4 100644--- a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java+++ b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownService.java@@ -26,8 +26,8 @@ import io.onedev.server.web.resource.AttachmentResource;import org.jsoup.nodes.Element;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.ArrayList;import java.util.Collection;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.javaindex 62d82eb683..fd136404a1 100644--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java@@ -7,13 +7,11 @@ import java.util.ArrayList;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.GeneratedValue;-import javax.persistence.Id;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.Id;+import jakarta.persistence.MappedSuperclass;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.annotations.GenericGenerator;import org.hibernate.proxy.HibernateProxy;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;@@ -22,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.rest.annotation.Api;+import io.onedev.server.persistence.annotation.EntityId;@MappedSuperclass@JsonIgnoreProperties("handler")@@ -43,8 +42,7 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac@Api(order=1)@Id- @GenericGenerator(name="entity_id", strategy="io.onedev.server.persistence.IdGenerator")- @GeneratedValue(generator="entity_id")+ @EntityId@JsonProperty(access = READ_ONLY)private Long id;diff --git a/server-core/src/main/java/io/onedev/server/model/AccessToken.java b/server-core/src/main/java/io/onedev/server/model/AccessToken.javaindex bc1caea334..61a0709868 100644--- a/server-core/src/main/java/io/onedev/server/model/AccessToken.java+++ b/server-core/src/main/java/io/onedev/server/model/AccessToken.java@@ -12,7 +12,7 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.jspecify.annotations.Nullable;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -23,8 +23,8 @@ import static io.onedev.server.security.SecurityUtils.asPrincipals;@Entity@Table(- indexes={@Index(columnList="o_owner_id"), @Index(columnList = "value")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_owner_id", "name"})})+ indexes={@Index(columnList="owner_id"), @Index(columnList = "value")},+ uniqueConstraints={@UniqueConstraint(columnNames={"owner_id", "name"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class AccessToken extends AbstractEntity implements AuthenticationInfo {diff --git a/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java b/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.javaindex c03b54f35e..d3cef2b328 100644--- a/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/AccessTokenAuthorization.java@@ -1,12 +1,12 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -15,8 +15,8 @@ import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_token_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_token_id", "o_project_id", "o_role_id"})+ indexes={@Index(columnList="token_id"), @Index(columnList="project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"token_id", "project_id", "role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class AccessTokenAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/Agent.java b/server-core/src/main/java/io/onedev/server/model/Agent.javaindex a9bc57bc13..a455eaa1fa 100644--- a/server-core/src/main/java/io/onedev/server/model/Agent.java+++ b/server-core/src/main/java/io/onedev/server/model/Agent.java@@ -17,15 +17,15 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.OneToMany;+import jakarta.persistence.OneToOne;+import jakarta.persistence.Table;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -44,10 +44,10 @@ import io.onedev.server.service.AgentService;@Entity@Table(indexes={- @Index(columnList="o_token_id"), @Index(columnList=PROP_IP_ADDRESS),+ @Index(columnList="token_id"), @Index(columnList=PROP_IP_ADDRESS),@Index(columnList=PROP_PAUSED), @Index(columnList=PROP_NAME),@Index(columnList=PROP_OS_NAME), @Index(columnList=PROP_OS_VERSION),- @Index(columnList=PROP_OS_ARCH), @Index(columnList="o_lastUsedDate_id")})+ @Index(columnList=PROP_OS_ARCH), @Index(columnList="lastUsedDate_id")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Agent extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.javaindex a3d37b7459..4d59de68fd 100644--- a/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java+++ b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java@@ -3,18 +3,18 @@ package io.onedev.server.model;import static io.onedev.server.model.AgentAttribute.PROP_NAME;import static io.onedev.server.model.AgentAttribute.PROP_VALUE;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.AttributeName;import io.onedev.server.annotation.Editable;@@ -25,8 +25,8 @@ import io.onedev.server.annotation.Editable;*/@Entity@Table(- indexes={@Index(columnList="o_agent_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_agent_id", PROP_NAME})})+ indexes={@Index(columnList="agent_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},+ uniqueConstraints={@UniqueConstraint(columnNames={"agent_id", PROP_NAME})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class AgentAttribute extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java b/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.javaindex 793a8701a5..9b05c11780 100644--- a/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java+++ b/server-core/src/main/java/io/onedev/server/model/AgentLastUsedDate.java@@ -1,10 +1,10 @@package io.onedev.server.model;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Table;import java.util.Date;import static io.onedev.server.model.AgentLastUsedDate.PROP_VALUE;diff --git a/server-core/src/main/java/io/onedev/server/model/AgentToken.java b/server-core/src/main/java/io/onedev/server/model/AgentToken.javaindex 9d76972751..1c960f8cd1 100644--- a/server-core/src/main/java/io/onedev/server/model/AgentToken.java+++ b/server-core/src/main/java/io/onedev/server/model/AgentToken.java@@ -3,10 +3,10 @@ package io.onedev.server.model;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Table;import java.util.UUID;diff --git a/server-core/src/main/java/io/onedev/server/model/Alert.java b/server-core/src/main/java/io/onedev/server/model/Alert.javaindex 3a1093b4dc..c06adc04ec 100644--- a/server-core/src/main/java/io/onedev/server/model/Alert.java+++ b/server-core/src/main/java/io/onedev/server/model/Alert.java@@ -4,10 +4,10 @@ import io.onedev.server.annotation.Editable;import org.apache.commons.lang3.StringUtils;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Table;import java.util.Date;import static io.onedev.server.model.Alert.PROP_DATE;diff --git a/server-core/src/main/java/io/onedev/server/model/Audit.java b/server-core/src/main/java/io/onedev/server/model/Audit.javaindex b3cad73f50..def8a123cd 100644--- a/server-core/src/main/java/io/onedev/server/model/Audit.java+++ b/server-core/src/main/java/io/onedev/server/model/Audit.java@@ -6,18 +6,18 @@ import static io.onedev.server.model.Audit.PROP_DATE;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;@Entity@Table(indexes={- @Index(columnList="o_project_id"), @Index(columnList= "o_user_id"),+ @Index(columnList="project_id"), @Index(columnList= "user_id"),@Index(columnList= PROP_DATE), @Index(columnList= PROP_ACTION)})public class Audit extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/BaseAuthorization.java b/server-core/src/main/java/io/onedev/server/model/BaseAuthorization.javaindex cacb1c5f20..7bda87c772 100644--- a/server-core/src/main/java/io/onedev/server/model/BaseAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/BaseAuthorization.java@@ -1,12 +1,12 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -15,8 +15,8 @@ import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_role_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_role_id"})+ indexes={@Index(columnList="project_id"), @Index(columnList="role_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class BaseAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 05eefad920..286be16d79 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -37,28 +37,28 @@ import java.util.Set;import java.util.Stack;import java.util.UUID;-import javax.persistence.AttributeOverride;-import javax.persistence.AttributeOverrides;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.AttributeOverride;+import jakarta.persistence.AttributeOverrides;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.apache.commons.io.FilenameUtils;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.annotations.DynamicUpdate;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Criterion;+import io.onedev.server.persistence.dao.Restrictions;import org.jspecify.annotations.Nullable;import com.fasterxml.jackson.annotation.JsonIgnore;@@ -108,8 +108,8 @@ import io.onedev.server.web.util.TextUtils;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"),- @Index(columnList="o_canceller_id"), @Index(columnList="o_request_id"),+ indexes={@Index(columnList="project_id"), @Index(columnList="submitter_id"),+ @Index(columnList="canceller_id"), @Index(columnList="request_id"),@Index(columnList= PROP_COMMIT_HASH),@Index(columnList=PROP_NUMBER), @Index(columnList= PROP_JOB_NAME),@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),@@ -117,8 +117,8 @@ import io.onedev.server.web.util.TextUtils;@Index(columnList=PROP_RUNNING_DATE), @Index(columnList=PROP_FINISH_DATE),@Index(columnList=PROP_FINISH_MONTH), @Index(columnList=PROP_FINISH_WEEK),@Index(columnList=PROP_FINISH_DAY), @Index(columnList=PROP_VERSION),- @Index(columnList="o_numberScope_id"), @Index(columnList="o_project_id, " + PROP_COMMIT_HASH)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})}+ @Index(columnList="numberScope_id"), @Index(columnList="project_id, " + PROP_COMMIT_HASH)},+ uniqueConstraints={@UniqueConstraint(columnNames={"numberScope_id", PROP_NUMBER})})@DynamicUpdatepublic class Build extends ProjectBelongingdiff --git a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java b/server-core/src/main/java/io/onedev/server/model/BuildDependence.javaindex 0b60cade65..b35938eaa2 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java@@ -1,20 +1,20 @@package io.onedev.server.model;import org.jspecify.annotations.Nullable;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.rest.annotation.Api;@Entity@Table(- indexes={@Index(columnList="o_dependent_id"), @Index(columnList="o_dependency_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_dependent_id", "o_dependency_id"})+ indexes={@Index(columnList="dependent_id"), @Index(columnList="dependency_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"dependent_id", "dependency_id"})})public class BuildDependence extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/BuildLabel.java b/server-core/src/main/java/io/onedev/server/model/BuildLabel.javaindex 489441978e..a07fe653a0 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildLabel.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildLabel.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityLabel;import io.onedev.server.rest.annotation.Api;@Entity@Table(- indexes={@Index(columnList="o_build_id"), @Index(columnList="o_spec_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", "o_spec_id"})}+ indexes={@Index(columnList="build_id"), @Index(columnList="spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"build_id", "spec_id"})})public class BuildLabel extends EntityLabel {diff --git a/server-core/src/main/java/io/onedev/server/model/BuildParam.java b/server-core/src/main/java/io/onedev/server/model/BuildParam.javaindex 42995665da..ebdb30346f 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildParam.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildParam.java@@ -4,14 +4,14 @@ import static io.onedev.server.model.BuildParam.PROP_NAME;import static io.onedev.server.model.BuildParam.PROP_VALUE;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;@@ -21,8 +21,8 @@ import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;*/@Entity@Table(- indexes={@Index(columnList="o_build_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", PROP_NAME, PROP_VALUE})})+ indexes={@Index(columnList="build_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},+ uniqueConstraints={@UniqueConstraint(columnNames={"build_id", PROP_NAME, PROP_VALUE})})public class BuildParam extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.javaindex 93ea369eae..124d490363 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java@@ -4,15 +4,15 @@ import java.util.ArrayList;import java.util.LinkedHashSet;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.service.BuildQueryPersonalizationService;@@ -23,8 +23,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class BuildQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedBuildQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/Chat.java b/server-core/src/main/java/io/onedev/server/model/Chat.javaindex c772a14911..9547cbf5ee 100644--- a/server-core/src/main/java/io/onedev/server/model/Chat.java+++ b/server-core/src/main/java/io/onedev/server/model/Chat.java@@ -6,20 +6,20 @@ import java.util.Comparator;import java.util.Date;import java.util.List;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import org.apache.commons.lang3.StringUtils;@Entity-@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_ai_id")})+@Table(indexes={@Index(columnList="user_id"), @Index(columnList="ai_id")})public class Chat extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/ChatMessage.java b/server-core/src/main/java/io/onedev/server/model/ChatMessage.javaindex d9b43c4b72..f88e99575d 100644--- a/server-core/src/main/java/io/onedev/server/model/ChatMessage.java+++ b/server-core/src/main/java/io/onedev/server/model/ChatMessage.java@@ -1,17 +1,17 @@package io.onedev.server.model;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.commons.utils.StringUtils;@Entity-@Table(indexes={@Index(columnList="o_chat_id")})+@Table(indexes={@Index(columnList="chat_id")})public class ChatMessage extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 46a7ca37c8..24b1451190 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -13,16 +13,16 @@ import java.util.Map;import java.util.Set;import java.util.UUID;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;@@ -45,8 +45,8 @@ import io.onedev.server.xodus.VisitInfoService;@Entity@Table(indexes={- @Index(columnList="o_project_id"), @Index(columnList="o_user_id"),- @Index(columnList="o_pullRequest_id"),+ @Index(columnList="project_id"), @Index(columnList="user_id"),+ @Index(columnList="pullRequest_id"),@Index(columnList=Mark.PROP_COMMIT_HASH), @Index(columnList=Mark.PROP_PATH),@Index(columnList=PROP_CREATE_DATE), @Index(columnList= LastActivity.COLUMN_DATE)})public class CodeComment extends ProjectBelonging implements AttachmentStorageSupport {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.javaindex 50db781e31..68e5382a8d 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.java@@ -1,11 +1,11 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id"})}+ indexes={@Index(columnList="comment_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"comment_id", "user_id"})})public class CodeCommentMention extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.javaindex 1eabd89261..e5d6bc5caa 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java@@ -7,13 +7,13 @@ import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.ArrayList;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class CodeCommentQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedCodeCommentQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.javaindex 9324096a67..7f03f8fd56 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.EntityComment;@Entity@Table(indexes={- @Index(columnList="o_comment_id"), @Index(columnList="o_user_id"),- @Index(columnList="o_pullRequest_id"),+ @Index(columnList="comment_id"), @Index(columnList="user_id"),+ @Index(columnList="pullRequest_id"),})public class CodeCommentReply extends EntityComment {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.javaindex e666ade18d..5468de663e 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java@@ -2,21 +2,21 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.CompareContext;@Entity@Table(indexes={- @Index(columnList="o_comment_id"), @Index(columnList="o_user_id"),- @Index(columnList="o_pullRequest_id")})+ @Index(columnList="comment_id"), @Index(columnList="user_id"),+ @Index(columnList="pullRequest_id")})public class CodeCommentStatusChange extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.javaindex ceca1faaf6..d2f7fdb3fb 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java@@ -1,16 +1,16 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.EntityTouch;import static io.onedev.server.model.CodeCommentTouch.*;@Entity-@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList= PROP_COMMENT_ID)})+@Table(indexes={@Index(columnList="project_id"), @Index(columnList= PROP_COMMENT_ID)})public class CodeCommentTouch extends EntityTouch {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.javaindex f0210b0e93..09f3dff53e 100644--- a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java@@ -4,15 +4,15 @@ import java.util.ArrayList;import java.util.LinkedHashSet;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.service.CommitQueryPersonalizationService;@@ -23,8 +23,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class CommitQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedCommitQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java b/server-core/src/main/java/io/onedev/server/model/CoverageMetric.javaindex c70532cd31..6dea7786d2 100644--- a/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java@@ -4,14 +4,14 @@ import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;import io.onedev.server.web.component.chart.line.LineSeries;-import javax.persistence.*;+import jakarta.persistence.*;import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;@Entity@Table(- indexes={@Index(columnList="o_build_id"), @Index(columnList= PROP_REPORT)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", PROP_REPORT})}+ indexes={@Index(columnList="build_id"), @Index(columnList= PROP_REPORT)},+ uniqueConstraints={@UniqueConstraint(columnNames={"build_id", PROP_REPORT})})public class CoverageMetric extends AbstractEntity implements BuildMetric {diff --git a/server-core/src/main/java/io/onedev/server/model/Dashboard.java b/server-core/src/main/java/io/onedev/server/model/Dashboard.javaindex 989c3d5935..9b21ac6006 100644--- a/server-core/src/main/java/io/onedev/server/model/Dashboard.java+++ b/server-core/src/main/java/io/onedev/server/model/Dashboard.java@@ -5,17 +5,17 @@ import static io.onedev.server.model.Dashboard.PROP_NAME;import java.util.ArrayList;import java.util.Collection;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -24,8 +24,8 @@ import io.onedev.server.model.support.widget.Widget;@Entity@Table(- indexes={@Index(columnList="o_owner_id"), @Index(columnList=PROP_NAME)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_owner_id", PROP_NAME})})+ indexes={@Index(columnList="owner_id"), @Index(columnList=PROP_NAME)},+ uniqueConstraints={@UniqueConstraint(columnNames={"owner_id", PROP_NAME})})public class Dashboard extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.java b/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.javaindex 4d7bd1123a..639af2abd5 100644--- a/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.java+++ b/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_group_id"), @Index(columnList="o_dashboard_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_dashboard_id"})+ indexes={@Index(columnList="group_id"), @Index(columnList="dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"group_id", "dashboard_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class DashboardGroupShare extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.java b/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.javaindex e0c41911b0..b58693c09f 100644--- a/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.java+++ b/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_dashboard_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_dashboard_id"})+ indexes={@Index(columnList="user_id"), @Index(columnList="dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "dashboard_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class DashboardUserShare extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardVisit.java b/server-core/src/main/java/io/onedev/server/model/DashboardVisit.javaindex 6cb3f549b6..61a3dad65b 100644--- a/server-core/src/main/java/io/onedev/server/model/DashboardVisit.java+++ b/server-core/src/main/java/io/onedev/server/model/DashboardVisit.java@@ -2,22 +2,22 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_dashboard_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_dashboard_id"})+ indexes={@Index(columnList="user_id"), @Index(columnList="dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "dashboard_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class DashboardVisit extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.javaindex 265f141efc..5dc835cdd2 100644--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java@@ -1,14 +1,14 @@package io.onedev.server.model;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -23,7 +23,7 @@ import io.onedev.server.util.facade.EmailAddressFacade;@Editable@Entity-@Table(indexes={@Index(columnList="o_owner_id"), @Index(columnList="value")})+@Table(indexes={@Index(columnList="owner_id"), @Index(columnList="value")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class EmailAddress extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.javaindex f4d00aad42..50851ccc49 100644--- a/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java+++ b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java@@ -4,14 +4,14 @@ import static io.onedev.server.model.GitLfsLock.PROP_PATH;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -24,8 +24,8 @@ import io.onedev.server.annotation.Editable;*/@Entity@Table(- indexes={@Index(columnList="o_owner_id"), @Index(columnList="o_project_id"), @Index(columnList=PROP_PATH)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PROP_PATH})})+ indexes={@Index(columnList="owner_id"), @Index(columnList="project_id"), @Index(columnList=PROP_PATH)},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", PROP_PATH})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class GitLfsLock extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/GpgKey.java b/server-core/src/main/java/io/onedev/server/model/GpgKey.javaindex c9fbca8281..73a2edabc3 100644--- a/server-core/src/main/java/io/onedev/server/model/GpgKey.java+++ b/server-core/src/main/java/io/onedev/server/model/GpgKey.java@@ -2,13 +2,13 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex 35e0a945e9..f69ed7fd99 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -4,11 +4,11 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.OneToMany;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.OneToMany;+import jakarta.validation.constraints.NotEmpty;import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;diff --git a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.javaindex e510684990..0a13b5cf74 100644--- a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_group_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_project_id", "o_role_id"})+ indexes={@Index(columnList="group_id"), @Index(columnList="project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"group_id", "project_id", "role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class GroupAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/GroupEntitlement.java b/server-core/src/main/java/io/onedev/server/model/GroupEntitlement.javaindex 789d312ca8..462148fc3b 100644--- a/server-core/src/main/java/io/onedev/server/model/GroupEntitlement.java+++ b/server-core/src/main/java/io/onedev/server/model/GroupEntitlement.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_ai_id"), @Index(columnList="o_group_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_ai_id", "o_group_id"})+ indexes={@Index(columnList="ai_id"), @Index(columnList="group_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"ai_id", "group_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class GroupEntitlement extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 405ecd3f89..50af50c00f 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -42,20 +42,20 @@ import java.util.Stack;import java.util.UUID;import java.util.stream.Collectors;-import javax.mail.internet.InternetAddress;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;-import javax.validation.ValidationException;+import jakarta.mail.internet.InternetAddress;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;+import jakarta.validation.ValidationException;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;@@ -111,19 +111,19 @@ import io.onedev.server.xodus.VisitInfoService;@Entity@Table(indexes={- @Index(columnList="o_project_id"), @Index(columnList=PROP_STATE),+ @Index(columnList="project_id"), @Index(columnList=PROP_STATE),@Index(columnList=PROP_UUID), @Index(columnList = PROP_BOARD_POSITION),@Index(columnList=PROP_TITLE), @Index(columnList=PROP_NUMBER),- @Index(columnList=PROP_SUBMIT_DATE), @Index(columnList="o_submitter_id"),+ @Index(columnList=PROP_SUBMIT_DATE), @Index(columnList="submitter_id"),@Index(columnList=PROP_VOTE_COUNT), @Index(columnList=PROP_COMMENT_COUNT),@Index(columnList=PROP_THUMBS_UP_COUNT), @Index(columnList=PROP_THUMBS_DOWN_COUNT),@Index(columnList=PROP_SMILE_COUNT), @Index(columnList=PROP_TADA_COUNT),@Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),@Index(columnList=PROP_EYES_COUNT), @Index(columnList=PROP_TICK_COUNT),@Index(columnList=PROP_MESSAGE_ID),- @Index(columnList= LastActivity.COLUMN_DATE), @Index(columnList="o_numberScope_id"),- @Index(columnList="o_movedTo_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})+ @Index(columnList= LastActivity.COLUMN_DATE), @Index(columnList="numberScope_id"),+ @Index(columnList="movedTo_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@Editablediff --git a/server-core/src/main/java/io/onedev/server/model/IssueAuthorization.java b/server-core/src/main/java/io/onedev/server/model/IssueAuthorization.javaindex 4b42231357..18c3babb2c 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueAuthorization.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_issue_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_issue_id"})+ indexes={@Index(columnList="user_id"), @Index(columnList="issue_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "issue_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class IssueAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.javaindex 0d42ca2170..a80a2a801f 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java@@ -2,20 +2,20 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.issue.changedata.IssueChangeData;@Entity@Table(indexes={- @Index(columnList="o_issue_id"), @Index(columnList="o_user_id")})+ @Index(columnList="issue_id"), @Index(columnList="user_id")})public class IssueChange extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueComment.java b/server-core/src/main/java/io/onedev/server/model/IssueComment.javaindex 3591e565b5..288d33fa75 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueComment.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueComment.java@@ -7,15 +7,15 @@ import java.util.ArrayList;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.mail.internet.InternetAddress;-import javax.persistence.CascadeType;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.mail.internet.InternetAddress;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import com.fasterxml.jackson.annotation.JsonProperty;@@ -25,7 +25,7 @@ import io.onedev.server.util.facade.IssueCommentFacade;@Entity@Table(indexes={- @Index(columnList="o_issue_id"), @Index(columnList="o_user_id"),+ @Index(columnList="issue_id"), @Index(columnList="user_id"),@Index(columnList=PROP_MESSAGE_ID)})public class IssueComment extends EntityComment {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.javaindex af6c977483..e2f0b22623 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java@@ -1,18 +1,18 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityReaction;@Entity@Table(- indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id", "emoji"})}+ indexes={@Index(columnList="comment_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"comment_id", "user_id", "emoji"})})public class IssueCommentReaction extends EntityReaction {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueCommentRevision.java b/server-core/src/main/java/io/onedev/server/model/IssueCommentRevision.javaindex f789b96aaf..f906929970 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueCommentRevision.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueCommentRevision.java@@ -1,9 +1,9 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;import io.onedev.server.model.support.CommentRevision;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueDescriptionRevision.java b/server-core/src/main/java/io/onedev/server/model/IssueDescriptionRevision.javaindex 46b58958c8..3422ecb88b 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueDescriptionRevision.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueDescriptionRevision.java@@ -1,9 +1,9 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;import io.onedev.server.model.support.CommentRevision;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueField.java b/server-core/src/main/java/io/onedev/server/model/IssueField.javaindex ccbe97c778..c3609382a4 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueField.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueField.java@@ -6,23 +6,23 @@ import static io.onedev.server.model.IssueField.PROP_TYPE;import static io.onedev.server.model.IssueField.PROP_VALUE;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;@Entity@Table(indexes={- @Index(columnList="o_issue_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE),+ @Index(columnList="issue_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE),@Index(columnList=PROP_TYPE), @Index(columnList=PROP_ORDINAL)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", PROP_NAME, PROP_VALUE})})+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", PROP_NAME, PROP_VALUE})})public class IssueField extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueLink.java b/server-core/src/main/java/io/onedev/server/model/IssueLink.javaindex b28967cb33..271d989d89 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueLink.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueLink.java@@ -2,22 +2,22 @@ package io.onedev.server.model;import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;-import javax.validation.ValidationException;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;+import jakarta.validation.ValidationException;import com.fasterxml.jackson.annotation.JsonProperty;@Entity@Table(- indexes={@Index(columnList="o_source_id"), @Index(columnList="o_target_id"), @Index(columnList="o_spec_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_source_id", "o_target_id", "o_spec_id"})})+ indexes={@Index(columnList="source_id"), @Index(columnList="target_id"), @Index(columnList="spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"source_id", "target_id", "spec_id"})})public class IssueLink extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueMention.java b/server-core/src/main/java/io/onedev/server/model/IssueMention.javaindex 458c9b57b1..ed2aa0b7d9 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueMention.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueMention.java@@ -1,11 +1,11 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})}+ indexes={@Index(columnList="issue_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "user_id"})})public class IssueMention extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.javaindex acd5b54586..2e6bd888a1 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java@@ -4,15 +4,15 @@ import java.util.ArrayList;import java.util.LinkedHashMap;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.service.IssueQueryPersonalizationService;@@ -23,8 +23,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class IssueQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedIssueQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueReaction.javaindex bbd80cc084..844c20613d 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueReaction.java@@ -1,13 +1,13 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;import io.onedev.server.model.support.EntityReaction;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id", "emoji"})}+ indexes={@Index(columnList="issue_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "user_id", "emoji"})})public class IssueReaction extends EntityReaction {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueSchedule.java b/server-core/src/main/java/io/onedev/server/model/IssueSchedule.javaindex 2ce4ca614d..152fb5633c 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueSchedule.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueSchedule.java@@ -3,13 +3,13 @@ package io.onedev.server.model;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.Date;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_iteration_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_iteration_id"})+ indexes={@Index(columnList="issue_id"), @Index(columnList="iteration_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "iteration_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class IssueSchedule extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.javaindex 78c895c313..b4c5881ce0 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java@@ -3,7 +3,7 @@ package io.onedev.server.model;import io.onedev.server.model.support.TimeGroups;import org.jspecify.annotations.Nullable;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.Date;import static io.onedev.server.model.IssueStateHistory.PROP_DATE;@@ -12,7 +12,7 @@ import static io.onedev.server.model.support.TimeGroups.*;@Entity@Table(indexes={- @Index(columnList="o_issue_id"), @Index(columnList=PROP_STATE),+ @Index(columnList="issue_id"), @Index(columnList=PROP_STATE),@Index(columnList=PROP_DATE), @Index(columnList=PROP_MONTH),@Index(columnList=PROP_WEEK), @Index(columnList=PROP_DAY),})diff --git a/server-core/src/main/java/io/onedev/server/model/IssueTouch.java b/server-core/src/main/java/io/onedev/server/model/IssueTouch.javaindex ff9e3c1ad8..1fc23d9d4e 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueTouch.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueTouch.java@@ -2,12 +2,12 @@ package io.onedev.server.model;import io.onedev.server.model.support.EntityTouch;-import javax.persistence.*;+import jakarta.persistence.*;import static io.onedev.server.model.IssueTouch.*;@Entity-@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList= PROP_ISSUE_ID)})+@Table(indexes={@Index(columnList="project_id"), @Index(columnList= PROP_ISSUE_ID)})public class IssueTouch extends EntityTouch {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/IssueVote.java b/server-core/src/main/java/io/onedev/server/model/IssueVote.javaindex 799cd24bda..d08ee1b770 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueVote.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueVote.java@@ -5,19 +5,19 @@ import io.onedev.server.rest.annotation.Immutable;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})}+ indexes={@Index(columnList="issue_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "user_id"})})public class IssueVote extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWatch.java b/server-core/src/main/java/io/onedev/server/model/IssueWatch.javaindex e11ef4a21a..0efb80db2a 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueWatch.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueWatch.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})+ indexes={@Index(columnList="issue_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "user_id"})})public class IssueWatch extends EntityWatch {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWork.java b/server-core/src/main/java/io/onedev/server/model/IssueWork.javaindex 5c5eac59e7..a2b7450b97 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueWork.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueWork.java@@ -7,15 +7,15 @@ import java.util.Collection;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;import io.onedev.server.rest.annotation.Immutable;@Entity-@Table(indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id"), @Index(columnList=PROP_DATE)})+@Table(indexes={@Index(columnList="issue_id"), @Index(columnList="user_id"), @Index(columnList=PROP_DATE)})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class IssueWork extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.javaindex 69d0d86905..d0bcc45533 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java@@ -1,18 +1,18 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityReaction;@Entity@Table(- indexes={@Index(columnList="o_work_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_work_id", "o_user_id", "emoji"})}+ indexes={@Index(columnList="work_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"work_id", "user_id", "emoji"})})public class IssueWorkReaction extends EntityReaction {diff --git a/server-core/src/main/java/io/onedev/server/model/Iteration.java b/server-core/src/main/java/io/onedev/server/model/Iteration.javaindex a155449c34..5149864ac7 100644--- a/server-core/src/main/java/io/onedev/server/model/Iteration.java+++ b/server-core/src/main/java/io/onedev/server/model/Iteration.java@@ -7,15 +7,15 @@ import java.util.HashMap;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;@@ -26,8 +26,8 @@ import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", Iteration.PROP_NAME})}+ indexes={@Index(columnList="project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", Iteration.PROP_NAME})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Iteration extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/LabelSpec.java b/server-core/src/main/java/io/onedev/server/model/LabelSpec.javaindex c946d7ffe0..e6252bd848 100644--- a/server-core/src/main/java/io/onedev/server/model/LabelSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/LabelSpec.java@@ -5,13 +5,13 @@ import static io.onedev.server.model.LabelSpec.PROP_NAME;import java.util.ArrayList;import java.util.Collection;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.validation.constraints.NotEmpty;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;diff --git a/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.javaindex aed3a0685f..4b9404ab32 100644--- a/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_link_id"), @Index(columnList="o_role_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_link_id", "o_role_id"})})+ indexes={@Index(columnList="link_id"), @Index(columnList="role_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"link_id", "role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class LinkAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.javaindex deb5860b51..fd76c3bc44 100644--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java@@ -4,12 +4,12 @@ import java.util.ArrayList;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Lob;-import javax.persistence.OneToMany;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Lob;+import jakarta.persistence.OneToMany;+import jakarta.validation.constraints.NotEmpty;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;diff --git a/server-core/src/main/java/io/onedev/server/model/Membership.java b/server-core/src/main/java/io/onedev/server/model/Membership.javaindex 39b730156d..c454ac32b1 100644--- a/server-core/src/main/java/io/onedev/server/model/Membership.java+++ b/server-core/src/main/java/io/onedev/server/model/Membership.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_group_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_group_id"})+ indexes={@Index(columnList="user_id"), @Index(columnList="group_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "group_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Membership extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/ModelVersion.java b/server-core/src/main/java/io/onedev/server/model/ModelVersion.javaindex e05ddfb9e9..ffdaddc32f 100644--- a/server-core/src/main/java/io/onedev/server/model/ModelVersion.java+++ b/server-core/src/main/java/io/onedev/server/model/ModelVersion.java@@ -1,7 +1,7 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;@Entity@Tablediff --git a/server-core/src/main/java/io/onedev/server/model/Pack.java b/server-core/src/main/java/io/onedev/server/model/Pack.javaindex ea36132d9e..627a2e92e5 100644--- a/server-core/src/main/java/io/onedev/server/model/Pack.java+++ b/server-core/src/main/java/io/onedev/server/model/Pack.java@@ -8,7 +8,7 @@ import io.onedev.server.pack.PackSupport;import io.onedev.server.search.entity.SortField;import org.jspecify.annotations.Nullable;-import javax.persistence.*;+import jakarta.persistence.*;import java.io.Serializable;import java.util.*;@@ -18,10 +18,10 @@ import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;@Entity@Table(indexes={- @Index(columnList="o_project_id"), @Index(columnList= PROP_TYPE),+ @Index(columnList="project_id"), @Index(columnList= PROP_TYPE),@Index(columnList= PROP_NAME), @Index(columnList= PROP_VERSION)}, uniqueConstraints = {- @UniqueConstraint(columnNames={"o_project_id", PROP_TYPE, PROP_NAME, PROP_VERSION})+ @UniqueConstraint(columnNames={"project_id", PROP_TYPE, PROP_NAME, PROP_VERSION})})public class Pack extends AbstractEntity implements LabelSupport<PackLabel> {diff --git a/server-core/src/main/java/io/onedev/server/model/PackBlob.java b/server-core/src/main/java/io/onedev/server/model/PackBlob.javaindex e14ab74b6c..052f791186 100644--- a/server-core/src/main/java/io/onedev/server/model/PackBlob.java+++ b/server-core/src/main/java/io/onedev/server/model/PackBlob.java@@ -5,23 +5,23 @@ import java.util.Collection;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;@Entity@Table(indexes={- @Index(columnList="o_project_id"), @Index(columnList= PackBlob.PROP_SHA256_HASH),+ @Index(columnList="project_id"), @Index(columnList= PackBlob.PROP_SHA256_HASH),@Index(columnList= PackBlob.PROP_CREATE_DATE)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PackBlob.PROP_SHA256_HASH})})+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", PackBlob.PROP_SHA256_HASH})})public class PackBlob extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/PackBlobReference.java b/server-core/src/main/java/io/onedev/server/model/PackBlobReference.javaindex c6ac027cfa..0960094414 100644--- a/server-core/src/main/java/io/onedev/server/model/PackBlobReference.java+++ b/server-core/src/main/java/io/onedev/server/model/PackBlobReference.java@@ -1,11 +1,11 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_pack_id"), @Index(columnList = "o_packBlob_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_pack_id", "o_packBlob_id"})})+ indexes={@Index(columnList="pack_id"), @Index(columnList = "packBlob_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"pack_id", "packBlob_id"})})public class PackBlobReference extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/PackLabel.java b/server-core/src/main/java/io/onedev/server/model/PackLabel.javaindex d76a96e6c3..f0fac4c9bf 100644--- a/server-core/src/main/java/io/onedev/server/model/PackLabel.java+++ b/server-core/src/main/java/io/onedev/server/model/PackLabel.java@@ -4,12 +4,12 @@ import io.onedev.server.model.support.EntityLabel;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.Immutable;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_pack_id"), @Index(columnList="o_spec_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_pack_id", "o_spec_id"})}+ indexes={@Index(columnList="pack_id"), @Index(columnList="spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"pack_id", "spec_id"})})public class PackLabel extends EntityLabel {diff --git a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.javaindex 2975ef2937..9138b8aab2 100644--- a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java@@ -4,15 +4,15 @@ import java.util.ArrayList;import java.util.LinkedHashSet;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.service.PackQueryPersonalizationService;@@ -23,8 +23,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class PackQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedPackQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/PendingSuggestionApply.java b/server-core/src/main/java/io/onedev/server/model/PendingSuggestionApply.javaindex b85626668d..4d4a3cacfe 100644--- a/server-core/src/main/java/io/onedev/server/model/PendingSuggestionApply.java+++ b/server-core/src/main/java/io/onedev/server/model/PendingSuggestionApply.java@@ -3,23 +3,23 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.List;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;@Entity@Table(indexes={- @Index(columnList="o_user_id"), @Index(columnList="o_request_id"),- @Index(columnList="o_comment_id")},+ @Index(columnList="user_id"), @Index(columnList="request_id"),+ @Index(columnList="comment_id")},uniqueConstraints={- @UniqueConstraint(columnNames={"o_user_id", "o_request_id", "o_comment_id"})}+ @UniqueConstraint(columnNames={"user_id", "request_id", "comment_id"})})public class PendingSuggestionApply extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java b/server-core/src/main/java/io/onedev/server/model/ProblemMetric.javaindex db9728f6b1..f8558be209 100644--- a/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/ProblemMetric.java@@ -3,14 +3,14 @@ package io.onedev.server.model;import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;-import javax.persistence.*;+import jakarta.persistence.*;import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;@Entity@Table(- indexes={@Index(columnList="o_build_id"), @Index(columnList= PROP_REPORT)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", PROP_REPORT})}+ indexes={@Index(columnList="build_id"), @Index(columnList= PROP_REPORT)},+ uniqueConstraints={@UniqueConstraint(columnNames={"build_id", PROP_REPORT})})public class ProblemMetric extends AbstractEntity implements BuildMetric {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex aaea88785f..609362cfdf 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1,5 +1,6 @@package io.onedev.server.model;+import io.onedev.server.git.LastCommitsOfChildren;import io.onedev.server.model.support.wiki.WikiFolder;import io.onedev.server.model.support.wiki.WikiSetting;import io.onedev.server.model.support.wiki.SpecifiedPath;@@ -28,22 +29,22 @@ import java.util.Stack;import java.util.concurrent.ConcurrentHashMap;import java.util.stream.Collectors;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;-import javax.validation.Validator;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.OneToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;+import jakarta.validation.Validator;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;import org.apache.commons.collections4.map.ReferenceMap;@@ -56,7 +57,6 @@ import org.apache.wicket.util.encoding.UrlEncoder;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.ObjectNotFoundException;import org.hibernate.annotations.Cache;@@ -156,11 +156,11 @@ import io.onedev.server.xodus.CommitInfoService;@Entity@Table(indexes={- @Index(columnList="o_parent_id"), @Index(columnList="o_forkedFrom_id"),- @Index(columnList="o_lastActivityDate_id"), @Index(columnList=PROP_NAME),+ @Index(columnList="parent_id"), @Index(columnList="forkedFrom_id"),+ @Index(columnList="lastActivityDate_id"), @Index(columnList=PROP_NAME),@Index(columnList=PROP_PATH)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_parent_id", PROP_NAME})}+ uniqueConstraints={@UniqueConstraint(columnNames={"parent_id", PROP_NAME})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)//use dynamic update in order not to overwrite other edits while background threads change update date@@ -428,8 +428,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@Column(length=65535)private ProjectAiSetting aiSetting = new ProjectAiSetting();- // SQL Server does not allow duplicate null values for unique column. So we use- // special prefix to indicate null@Column(unique=true)private String serviceDeskEmailAddress;diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectEntitlement.java b/server-core/src/main/java/io/onedev/server/model/ProjectEntitlement.javaindex 8d1ae07c8a..02dc261973 100644--- a/server-core/src/main/java/io/onedev/server/model/ProjectEntitlement.java+++ b/server-core/src/main/java/io/onedev/server/model/ProjectEntitlement.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_ai_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_ai_id", "o_project_id"})+ indexes={@Index(columnList="ai_id"), @Index(columnList="project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"ai_id", "project_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class ProjectEntitlement extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.javaindex 00be698b3a..f5ee3cad24 100644--- a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java+++ b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java@@ -1,12 +1,12 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityLabel;import io.onedev.server.rest.annotation.Api;@@ -16,8 +16,8 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_spec_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_spec_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "spec_id"})})@Cache(usage= CacheConcurrencyStrategy.READ_WRITE)public class ProjectLabel extends EntityLabel {diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectLastActivityDate.java b/server-core/src/main/java/io/onedev/server/model/ProjectLastActivityDate.javaindex ca4416c8c7..53ce6befdb 100644--- a/server-core/src/main/java/io/onedev/server/model/ProjectLastActivityDate.java+++ b/server-core/src/main/java/io/onedev/server/model/ProjectLastActivityDate.java@@ -4,10 +4,10 @@ import static io.onedev.server.model.ProjectLastActivityDate.PROP_VALUE;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Table;/*** Maintain high dynamic data in a separate table to avoid project second-leveldiff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 6027c10d42..e7b0964e42 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -49,19 +49,19 @@ import java.util.Stack;import java.util.UUID;import java.util.stream.Collectors;-import javax.persistence.AttributeOverride;-import javax.persistence.AttributeOverrides;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.AttributeOverride;+import jakarta.persistence.AttributeOverrides;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Embedded;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;@@ -109,9 +109,9 @@ import io.onedev.server.xodus.VisitInfoService;@Table(indexes={@Index(columnList=PROP_TITLE), @Index(columnList=PROP_UUID),- @Index(columnList=PROP_NUMBER), @Index(columnList="o_targetProject_id"),+ @Index(columnList=PROP_NUMBER), @Index(columnList="targetProject_id"),@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList= LastActivity.COLUMN_DATE),- @Index(columnList="o_sourceProject_id"), @Index(columnList="o_submitter_id"),+ @Index(columnList="sourceProject_id"), @Index(columnList="submitter_id"),@Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH), @Index(columnList=PROP_SUBMIT_MONTH),@Index(columnList=PROP_SUBMIT_WEEK), @Index(columnList=PROP_SUBMIT_DAY),@Index(columnList=PROP_CLOSE_MONTH), @Index(columnList=PROP_CLOSE_WEEK),@@ -121,8 +121,8 @@ import io.onedev.server.xodus.VisitInfoService;@Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),@Index(columnList=PROP_EYES_COUNT),@Index(columnList=PROP_TICK_COUNT),- @Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_numberScope_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})+ @Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="numberScope_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdatepublic class PullRequest extends ProjectBelongingdiff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.javaindex b99d9f5810..d6a7eb37b8 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.java@@ -2,18 +2,18 @@ package io.onedev.server.model;import io.onedev.server.rest.annotation.Immutable;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_request_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_request_id"})}+ indexes={@Index(columnList="user_id"), @Index(columnList="request_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "request_id"})})public class PullRequestAssignment extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.javaindex a4a4b249f6..b555b99616 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java@@ -2,19 +2,19 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;@Entity-@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})+@Table(indexes={@Index(columnList="request_id"), @Index(columnList="user_id")})public class PullRequestChange extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.javaindex 705831bf9f..a01afb6113 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java@@ -8,14 +8,14 @@ import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import com.fasterxml.jackson.annotation.JsonProperty;@@ -24,7 +24,7 @@ import io.onedev.server.rest.annotation.Immutable;import io.onedev.server.util.facade.PullRequestCommentFacade;@Entity-@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id"),+@Table(indexes={@Index(columnList="request_id"), @Index(columnList="user_id"),@Index(columnList=PROP_MESSAGE_ID)})public class PullRequestComment extends EntityComment {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.javaindex 8d47b55de5..237a85e0d8 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java@@ -1,13 +1,13 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;import io.onedev.server.model.support.EntityReaction;@Entity@Table(- indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id", "emoji"})}+ indexes={@Index(columnList="comment_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"comment_id", "user_id", "emoji"})})public class PullRequestCommentReaction extends EntityReaction {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestCommentRevision.java b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentRevision.javaindex ba241a3aa4..4e9526ca5d 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestCommentRevision.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentRevision.java@@ -1,9 +1,9 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;import io.onedev.server.model.support.CommentRevision;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestDescriptionRevision.java b/server-core/src/main/java/io/onedev/server/model/PullRequestDescriptionRevision.javaindex f1d3d5f560..d5977b690a 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestDescriptionRevision.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestDescriptionRevision.java@@ -1,9 +1,9 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;import io.onedev.server.model.support.CommentRevision;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.javaindex ddc66f5b38..d6bf373ac6 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java@@ -1,12 +1,12 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.model.support.EntityLabel;import io.onedev.server.rest.annotation.Api;@@ -14,8 +14,8 @@ import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_spec_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_spec_id"})}+ indexes={@Index(columnList="request_id"), @Index(columnList="spec_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"request_id", "spec_id"})})public class PullRequestLabel extends EntityLabel {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestMention.java b/server-core/src/main/java/io/onedev/server/model/PullRequestMention.javaindex dfd116dd86..433c4d2833 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestMention.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestMention.java@@ -1,11 +1,11 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id"})}+ indexes={@Index(columnList="request_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"request_id", "user_id"})})public class PullRequestMention extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.javaindex 326168709c..bf450e7c4d 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java@@ -4,15 +4,15 @@ import java.util.ArrayList;import java.util.LinkedHashMap;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.service.PullRequestQueryPersonalizationService;@@ -23,8 +23,8 @@ import io.onedev.server.util.watch.QueryWatchSupport;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class PullRequestQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedPullRequestQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.javaindex 3053481968..163d7f5c30 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java@@ -1,13 +1,13 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;import io.onedev.server.model.support.EntityReaction;@Entity@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id", "emoji"})}+ indexes={@Index(columnList="request_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"request_id", "user_id", "emoji"})})public class PullRequestReaction extends EntityReaction {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex 19a732d558..6d7a4a205b 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -2,14 +2,14 @@ package io.onedev.server.model;import java.util.Date;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import com.fasterxml.jackson.annotation.JsonProperty;@@ -17,8 +17,8 @@ import io.onedev.server.rest.annotation.Immutable;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_request_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_request_id"})}+ indexes={@Index(columnList="user_id"), @Index(columnList="request_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "request_id"})})public class PullRequestReview extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.javaindex a4c158873b..f7c3918c29 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java@@ -1,16 +1,16 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import io.onedev.server.model.support.EntityTouch;import static io.onedev.server.model.PullRequestTouch.*;@Entity-@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList= PROP_REQUEST_ID)})+@Table(indexes={@Index(columnList="project_id"), @Index(columnList= PROP_REQUEST_ID)})public class PullRequestTouch extends EntityTouch {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex d1566dc37e..e0ef768102 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -5,13 +5,13 @@ import java.util.Collections;import java.util.Date;import java.util.List;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -24,7 +24,7 @@ import io.onedev.server.service.PullRequestService;import io.onedev.server.git.service.GitService;@Entity-@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="date")})+@Table(indexes={@Index(columnList="request_id"), @Index(columnList="date")})public class PullRequestUpdate extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestWatch.java b/server-core/src/main/java/io/onedev/server/model/PullRequestWatch.javaindex 5800b8df28..671f53176d 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestWatch.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestWatch.java@@ -3,12 +3,12 @@ package io.onedev.server.model;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.rest.annotation.Immutable;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id"})+ indexes={@Index(columnList="request_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"request_id", "user_id"})})public class PullRequestWatch extends EntityWatch {diff --git a/server-core/src/main/java/io/onedev/server/model/ReviewedDiff.java b/server-core/src/main/java/io/onedev/server/model/ReviewedDiff.javaindex 0180f6b68b..fc41fc1e74 100644--- a/server-core/src/main/java/io/onedev/server/model/ReviewedDiff.java+++ b/server-core/src/main/java/io/onedev/server/model/ReviewedDiff.java@@ -1,6 +1,6 @@package io.onedev.server.model;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.Date;import static io.onedev.server.model.ReviewedDiff.*;@@ -11,7 +11,7 @@ import static io.onedev.server.model.ReviewedDiff.*;@Index(columnList= PROP_OLD_COMMIT_HASH), @Index(columnList= PROP_NEW_COMMIT_HASH),@Index(columnList= PROP_BLOB_PATH), @Index(columnList = PROP_DATE)}, uniqueConstraints = {- @UniqueConstraint(columnNames={"o_user_id", PROP_OLD_COMMIT_HASH, PROP_NEW_COMMIT_HASH, PROP_BLOB_PATH})+ @UniqueConstraint(columnNames={"user_id", PROP_OLD_COMMIT_HASH, PROP_NEW_COMMIT_HASH, PROP_BLOB_PATH})})public class ReviewedDiff extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex d4e6d1fb6f..5eae471761 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -6,16 +6,16 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Lob;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.Transient;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Lob;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.persistence.Transient;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.javaindex 6fd9647f4f..2ab8004d10 100644--- a/server-core/src/main/java/io/onedev/server/model/Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java@@ -1,8 +1,8 @@package io.onedev.server.model;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Lob;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Lob;import java.io.Serializable;/**diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex 6f960034ba..d21547f053 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -6,15 +6,15 @@ import java.security.PublicKey;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.digest.BuiltinDigests;@@ -34,7 +34,7 @@ import io.onedev.server.validation.Validatable;@Editable@Entity-@Table(indexes={@Index(columnList="o_owner_id"), @Index(columnList="fingerprint")})+@Table(indexes={@Index(columnList="owner_id"), @Index(columnList="fingerprint")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@ClassValidatingpublic class SshKey extends AbstractEntity implements Validatable {diff --git a/server-core/src/main/java/io/onedev/server/model/SsoAccount.java b/server-core/src/main/java/io/onedev/server/model/SsoAccount.javaindex 945250991f..4479fce92e 100644--- a/server-core/src/main/java/io/onedev/server/model/SsoAccount.java+++ b/server-core/src/main/java/io/onedev/server/model/SsoAccount.java@@ -1,21 +1,21 @@package io.onedev.server.model;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-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.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_provider_id"), @Index(columnList=SsoAccount.PROP_SUBJECT)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_provider_id", SsoAccount.PROP_SUBJECT})+ indexes={@Index(columnList="user_id"), @Index(columnList="provider_id"), @Index(columnList=SsoAccount.PROP_SUBJECT)},+ uniqueConstraints={@UniqueConstraint(columnNames={"provider_id", SsoAccount.PROP_SUBJECT})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class SsoAccount extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/SsoProvider.java b/server-core/src/main/java/io/onedev/server/model/SsoProvider.javaindex d2050fbe3a..8db834281e 100644--- a/server-core/src/main/java/io/onedev/server/model/SsoProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/SsoProvider.java@@ -3,15 +3,15 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.Collection;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;diff --git a/server-core/src/main/java/io/onedev/server/model/Stopwatch.java b/server-core/src/main/java/io/onedev/server/model/Stopwatch.javaindex 931753875c..4cb49b7851 100644--- a/server-core/src/main/java/io/onedev/server/model/Stopwatch.java+++ b/server-core/src/main/java/io/onedev/server/model/Stopwatch.java@@ -3,13 +3,13 @@ package io.onedev.server.model;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.Date;@Entity@Table(- indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})})+ indexes={@Index(columnList="issue_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"issue_id", "user_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Stopwatch extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java b/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.javaindex 127aa2bf70..4e02dbb040 100644--- a/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java@@ -4,14 +4,14 @@ import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;import io.onedev.server.web.component.chart.line.LineSeries;-import javax.persistence.*;+import jakarta.persistence.*;import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;@Entity@Table(- indexes={@Index(columnList="o_build_id"), @Index(columnList= PROP_REPORT)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", PROP_REPORT})}+ indexes={@Index(columnList="build_id"), @Index(columnList= PROP_REPORT)},+ uniqueConstraints={@UniqueConstraint(columnNames={"build_id", PROP_REPORT})})public class UnitTestMetric extends AbstractEntity implements BuildMetric {diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex e7018a11d3..cd92d194af 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -23,14 +23,14 @@ import java.util.Set;import java.util.Stack;import java.util.stream.Collectors;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Lob;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.validation.constraints.NotEmpty;+import jakarta.persistence.CascadeType;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Lob;+import jakarta.persistence.OneToMany;+import jakarta.persistence.Table;+import jakarta.validation.constraints.NotEmpty;import org.apache.shiro.authc.AuthenticationInfo;import org.apache.shiro.subject.PrincipalCollection;diff --git a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.javaindex 76932f9881..da41c38b72 100644--- a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_user_id"), @Index(columnList="o_project_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_project_id", "o_role_id"})+ indexes={@Index(columnList="user_id"), @Index(columnList="project_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"user_id", "project_id", "role_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class UserAuthorization extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/UserEntitlement.java b/server-core/src/main/java/io/onedev/server/model/UserEntitlement.javaindex 6091bd633c..f91e8cdd0a 100644--- a/server-core/src/main/java/io/onedev/server/model/UserEntitlement.java+++ b/server-core/src/main/java/io/onedev/server/model/UserEntitlement.java@@ -1,20 +1,20 @@package io.onedev.server.model;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(- indexes={@Index(columnList="o_ai_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_ai_id", "o_user_id"})+ indexes={@Index(columnList="ai_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"ai_id", "user_id"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class UserEntitlement extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/UserInvitation.java b/server-core/src/main/java/io/onedev/server/model/UserInvitation.javaindex 4aca633970..30ae439f5e 100644--- a/server-core/src/main/java/io/onedev/server/model/UserInvitation.java+++ b/server-core/src/main/java/io/onedev/server/model/UserInvitation.java@@ -5,10 +5,10 @@ import io.onedev.server.annotation.Editable;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Index;+import jakarta.persistence.Table;import java.util.UUID;import static io.onedev.server.model.UserInvitation.PROP_EMAIL_ADDRESS;diff --git a/server-core/src/main/java/io/onedev/server/model/Workspace.java b/server-core/src/main/java/io/onedev/server/model/Workspace.javaindex 0f741cc66a..0907e65cca 100644--- a/server-core/src/main/java/io/onedev/server/model/Workspace.java+++ b/server-core/src/main/java/io/onedev/server/model/Workspace.java@@ -13,15 +13,15 @@ import java.util.Map;import java.util.Optional;import java.util.Stack;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.annotations.Cache;@@ -43,19 +43,19 @@ import io.onedev.server.web.util.TextUtils;@Entity@Table(indexes={- @Index(columnList="o_user_id"),- @Index(columnList="o_project_id"),- @Index(columnList="o_issue_id"),- @Index(columnList="o_request_id"),- @Index(columnList="o_agent_id"),+ @Index(columnList="user_id"),+ @Index(columnList="project_id"),+ @Index(columnList="issue_id"),+ @Index(columnList="request_id"),+ @Index(columnList="agent_id"),@Index(columnList=Workspace.PROP_SPEC),@Index(columnList= Workspace.PROP_STATUS),@Index(columnList= Workspace.PROP_BRANCH),@Index(columnList= Workspace.PROP_CREATE_DATE),@Index(columnList= Workspace.PROP_ACTIVE_DATE),@Index(columnList=AbstractEntity.PROP_NUMBER),- @Index(columnList="o_numberScope_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", AbstractEntity.PROP_NUMBER})}+ @Index(columnList="numberScope_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"numberScope_id", AbstractEntity.PROP_NUMBER})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Workspace extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/WorkspaceQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/WorkspaceQueryPersonalization.javaindex 46d65c60ab..d9e47b38b7 100644--- a/server-core/src/main/java/io/onedev/server/model/WorkspaceQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/WorkspaceQueryPersonalization.java@@ -3,15 +3,15 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.LinkedHashSet;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.FetchType;+import jakarta.persistence.Index;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.Lob;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.Table;+import jakarta.persistence.UniqueConstraint;import io.onedev.server.OneDev;import io.onedev.server.model.support.QueryPersonalization;@@ -24,8 +24,8 @@ import org.jspecify.annotations.Nullable;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}+ indexes={@Index(columnList="project_id"), @Index(columnList="user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"project_id", "user_id"})})public class WorkspaceQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedWorkspaceQuery> {diff --git a/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java b/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.javaindex 35fcf7d18e..5a14150503 100644--- a/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/AiModelSetting.java@@ -10,9 +10,9 @@ import java.time.Duration;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/AiSetting.java b/server-core/src/main/java/io/onedev/server/model/support/AiSetting.javaindex 3a30b081a3..83329e9040 100644--- a/server-core/src/main/java/io/onedev/server/model/support/AiSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/AiSetting.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.javaindex 42439f2fec..1f45b4bdcf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java@@ -4,13 +4,13 @@ import java.nio.charset.StandardCharsets;import java.util.List;import java.util.stream.Collectors;-import javax.persistence.Column;-import javax.persistence.Lob;-import javax.persistence.MappedSuperclass;-import javax.validation.ConstraintValidatorContext;+import jakarta.persistence.Column;+import jakarta.persistence.Lob;+import jakarta.persistence.MappedSuperclass;+import jakarta.validation.ConstraintValidatorContext;import org.bouncycastle.openpgp.PGPPublicKey;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.AbstractEntity;import io.onedev.server.util.GpgUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.javaindex f1d38c041c..28432336a4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java+++ b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java@@ -3,11 +3,11 @@ package io.onedev.server.model.support;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.Column;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.MappedSuperclass;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.AbstractEntity;diff --git a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.javaindex 0aca04f0c4..abc747c233 100644--- a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java+++ b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;import org.jspecify.annotations.Nullable;-import javax.persistence.*;+import jakarta.persistence.*;import java.io.Serializable;@Embeddablediff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.javaindex 8bc859b7a9..f1cfae6042 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java@@ -6,7 +6,7 @@ import io.onedev.server.model.User;import io.onedev.server.rest.annotation.Immutable;import org.apache.commons.lang3.StringUtils;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.Date;import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.java b/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.javaindex 2059e71518..56f2c35f58 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityLabel.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.MappedSuperclass;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.LabelSpec;diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java b/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.javaindex 9668cca7fb..ba9a2a432e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.persistence.*;+import jakarta.persistence.*;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.java b/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.javaindex 97f38b437a..ad306aa2b2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support;import io.onedev.server.model.AbstractEntity;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.MappedSuperclass;@MappedSuperclasspublic abstract class EntityTouch extends AbstractEntity {diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityWatch.java b/server-core/src/main/java/io/onedev/server/model/support/EntityWatch.javaindex 5a3038a301..dfd075124b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityWatch.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityWatch.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.MappedSuperclass;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java b/server-core/src/main/java/io/onedev/server/model/support/LastActivity.javaindex 6a094f4df7..a73ebdd558 100644--- a/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java+++ b/server-core/src/main/java/io/onedev/server/model/support/LastActivity.java@@ -4,11 +4,11 @@ import java.io.Serializable;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Embeddable;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;+import jakarta.persistence.Column;+import jakarta.persistence.Embeddable;+import jakarta.persistence.FetchType;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;import org.hibernate.annotations.OptimisticLock;diff --git a/server-core/src/main/java/io/onedev/server/model/support/Mark.java b/server-core/src/main/java/io/onedev/server/model/support/Mark.javaindex 071b9aa350..64fc5d42c7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/Mark.java+++ b/server-core/src/main/java/io/onedev/server/model/support/Mark.java@@ -6,8 +6,8 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Embeddable;+import jakarta.persistence.Column;+import jakarta.persistence.Embeddable;import org.apache.commons.lang3.StringUtils;import org.apache.commons.lang3.builder.EqualsBuilder;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.javaindex 3cd43a3b23..b6ed2aaad1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.AgentQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.javaindex d4b157f4a8..3c566a498b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.CodeCommentQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.javaindex 17b7165083..b9f4808980 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.CommitQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.javaindex 149d3f4744..74657af96b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ProjectQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBelonging.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBelonging.javaindex 29059bd29d..5a441af00c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBelonging.java+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBelonging.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.MappedSuperclass;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.javaindex d5e6a23f84..588c05f763 100644--- a/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support;import java.util.ArrayList;import org.jspecify.annotations.Nullable;-import javax.persistence.MappedSuperclass;+import jakarta.persistence.MappedSuperclass;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.javaindex b5a4aa6883..a02f93c497 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java@@ -6,7 +6,7 @@ import java.time.ZoneId;import java.time.temporal.TemporalAdjusters;import java.util.Date;-import javax.persistence.Embeddable;+import jakarta.persistence.Embeddable;import io.onedev.server.util.DateUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java b/server-core/src/main/java/io/onedev/server/model/support/WebHook.javaindex dbb77f29b0..a5ad39f28d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java+++ b/server-core/src/main/java/io/onedev/server/model/support/WebHook.java@@ -10,8 +10,8 @@ import io.onedev.server.event.project.workspace.WorkspaceEvent;import io.onedev.server.util.CryptoUtils;import io.onedev.server.annotation.Editable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/WebHookHeader.java b/server-core/src/main/java/io/onedev/server/model/support/WebHookHeader.javaindex 7804b259c2..abb19322bf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/WebHookHeader.java+++ b/server-core/src/main/java/io/onedev/server/model/support/WebHookHeader.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AiSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AiSetting.javaindex 6680a8a55f..558f70d3be 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/AiSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AiSetting.java@@ -2,8 +2,8 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AuditSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AuditSetting.javaindex 4bda3f9bb2..cf4091b09a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/AuditSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AuditSetting.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.javaindex 5dd69b0d8e..d722e12f8d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java@@ -3,9 +3,9 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;import java.text.ParseException;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.quartz.CronExpression;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ClusterSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ClusterSetting.javaindex ee1750cf88..5715d5c667 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ClusterSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ClusterSetting.java@@ -7,8 +7,8 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.cluster.ClusterService;import io.onedev.server.validation.Validatable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Min;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Min;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.javaindex 6b75ce4f4b..a168b52388 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectSetting.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.javaindex 36b970ec8b..725205cf1a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java@@ -5,8 +5,8 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.build.NamedBuildQuery;@@ -32,8 +32,7 @@ public class GlobalBuildSetting implements Serializable {namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is since \"last week\""));}- @Valid- public List<NamedBuildQuery> getNamedQueries() {+ public List<@Valid NamedBuildQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 14fd7a10a6..f381c5beef 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -12,8 +12,8 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import org.jspecify.annotations.Nullable;@@ -310,8 +310,7 @@ public class GlobalIssueSetting implements Serializable {}@NotNull- @Valid- public List<StateSpec> getStateSpecs() {+ public List<@Valid StateSpec> getStateSpecs() {return stateSpecs;}@@ -320,8 +319,7 @@ public class GlobalIssueSetting implements Serializable {}@NotNull- @Valid- public List<TransitionSpec> getTransitionSpecs() {+ public List<@Valid TransitionSpec> getTransitionSpecs() {return transitionSpecs;}@@ -331,8 +329,7 @@ public class GlobalIssueSetting implements Serializable {@Editable@NotNull- @Valid- public List<FieldSpec> getFieldSpecs() {+ public List<@Valid FieldSpec> getFieldSpecs() {return fieldSpecs;}@@ -704,8 +701,7 @@ public class GlobalIssueSetting implements Serializable {}@NotNull- @Valid- public List<BoardSpec> getBoardSpecs() {+ public List<@Valid BoardSpec> getBoardSpecs() {return boardSpecs;}@@ -742,8 +738,7 @@ public class GlobalIssueSetting implements Serializable {}@NotNull- @Valid- public List<NamedIssueQuery> getNamedQueries() {+ public List<@Valid NamedIssueQuery> getNamedQueries() {return namedQueries;}@@ -752,8 +747,7 @@ public class GlobalIssueSetting implements Serializable {}@NotNull- @Valid- public List<IssueTemplate> getIssueTemplates() {+ public List<@Valid IssueTemplate> getIssueTemplates() {return issueTemplates;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.javaindex c1bbdbcc9d..a0522ae641 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java@@ -1,42 +1,41 @@-package io.onedev.server.model.support.administration;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.jspecify.annotations.Nullable;-import javax.validation.Valid;--import io.onedev.server.model.support.NamedProjectQuery;--public class GlobalProjectSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<NamedProjectQuery> namedQueries = new ArrayList<>();-- public GlobalProjectSetting() {- namedQueries.add(new NamedProjectQuery("Root projects", "roots"));- namedQueries.add(new NamedProjectQuery("My projects", "owned by me"));- namedQueries.add(new NamedProjectQuery("All projects", null));- }-- @Valid- public List<NamedProjectQuery> getNamedQueries() {- return namedQueries;- }-- public void setNamedQueries(List<NamedProjectQuery> namedQueries) {- this.namedQueries = namedQueries;- }-- @Nullable- public NamedProjectQuery getNamedQuery(String name) {- for (NamedProjectQuery namedQuery: getNamedQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }--}+package io.onedev.server.model.support.administration;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.jspecify.annotations.Nullable;+import jakarta.validation.Valid;++import io.onedev.server.model.support.NamedProjectQuery;++public class GlobalProjectSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedProjectQuery> namedQueries = new ArrayList<>();++ public GlobalProjectSetting() {+ namedQueries.add(new NamedProjectQuery("Root projects", "roots"));+ namedQueries.add(new NamedProjectQuery("My projects", "owned by me"));+ namedQueries.add(new NamedProjectQuery("All projects", null));+ }++ public List<@Valid NamedProjectQuery> getNamedQueries() {+ return namedQueries;+ }++ public void setNamedQueries(List<NamedProjectQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedProjectQuery getNamedQuery(String name) {+ for (NamedProjectQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.javaindex 3d43433ae2..df4cf5e9d1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;@@ -34,8 +34,7 @@ public class GlobalPullRequestSetting implements Serializable {namedQueries.add(new NamedPullRequestQuery("All", null));}- @Valid- public List<NamedPullRequestQuery> getNamedQueries() {+ public List<@Valid NamedPullRequestQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.javaindex 14ba1cd372..6f14fb16f0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.NamedWorkspaceQuery;@@ -26,8 +26,7 @@ public class GlobalWorkspaceSetting implements Serializable {namedQueries.add(new NamedWorkspaceQuery("Created recently", "\"Create Date\" is since \"last week\""));}- @Valid- public List<NamedWorkspaceQuery> getNamedQueries() {+ public List<@Valid NamedWorkspaceQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex c774c6fcd6..b6042f61b8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -3,9 +3,9 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;+import jakarta.validation.constraints.Size;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.WildcardUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.javaindex a9d5781bab..d0de13f21e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java@@ -16,7 +16,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.Valid;+import jakarta.validation.Valid;import java.io.Serializable;import java.util.*;@@ -60,8 +60,7 @@ public class IssueCreationSetting implements Serializable {@Editable(order=300)@FieldNamesProvider("getFieldNames")@OmitName- @Valid- public List<FieldInstance> getIssueFields() {+ public List<@Valid FieldInstance> getIssueFields() {return issueFields;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex 3114c6c9bb..ff0b86b412 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.ShowCondition;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.javaindex 156d7e5f4b..eddba06ad0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java@@ -9,7 +9,7 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.Valid;+import jakarta.validation.Valid;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.ExplicitException;@@ -42,8 +42,7 @@ public class ServiceDeskSetting implements Serializable {@Editable(order=300, description="Specify issue creation settings. For a particular sender and project, " +"the first matching entry will take effect. Issue creation will be disallowed if no matching " +"entry found")- @Valid- public List<IssueCreationSetting> getIssueCreationSettings() {+ public List<@Valid IssueCreationSetting> getIssueCreationSettings() {return issueCreationSettings;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.javaindex c01a3bb83d..a5fc1d98ae 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java@@ -6,11 +6,11 @@ import java.security.GeneralSecurityException;import java.security.PrivateKey;import java.security.PublicKey;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.digest.BuiltinDigests;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex 6456569f08..7c48dc623e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -5,12 +5,12 @@ import java.net.MalformedURLException;import java.net.URL;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.javaindex 0cf4705aff..5c1154ef7f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.IOException;import java.io.Serializable;import java.net.URL;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex f166c28761..91a282ad46 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.javaindex 779466d00c..dae633e1a4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.javaindex a5c9a0c7eb..e648356f03 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java@@ -13,7 +13,7 @@ import io.onedev.server.service.SettingService;import io.onedev.server.util.interpolative.JobVariableInterpolator;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex be7776617b..2d71d8f625 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -4,8 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.Size;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Size;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;@@ -53,8 +53,7 @@ public class ServiceLocator implements Serializable {@Editable(order=300, description="Specify node selector of this locator")@Size(min=1, message="At least one entry should be specified")- @Valid- public List<NodeSelectorEntry> getNodeSelector() {+ public List<@Valid NodeSelectorEntry> getNodeSelector() {return nodeSelector;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/ImapWithSsl.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/ImapWithSsl.javaindex f7f582a3fc..7fff65af90 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/ImapWithSsl.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/ImapWithSsl.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.administration.mailservice;-import com.sun.mail.util.MailSSLSocketFactory;+import org.eclipse.angus.mail.util.MailSSLSocketFactory;import io.onedev.server.annotation.Editable;import io.onedev.server.security.TrustCertsSSLSocketFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/SmtpWithSsl.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/SmtpWithSsl.javaindex 3eb7d00f4a..132b735a91 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/SmtpWithSsl.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/SmtpWithSsl.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.administration.mailservice;-import com.sun.mail.util.MailSSLSocketFactory;+import org.eclipse.angus.mail.util.MailSSLSocketFactory;import io.onedev.server.annotation.Editable;import io.onedev.server.security.TrustCertsSSLSocketFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/RegistryLogin.javaindex 07e9198d76..522cca64d1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/RegistryLogin.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.administration.workspaceprovisioner;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.javaindex d2c770bd31..9d7cb7b057 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.administration.workspaceprovisioner;import java.io.Serializable;import java.util.concurrent.Future;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.javaindex b777e3c67d..803bd7e547 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobProperty.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobProperty.javaindex 1e6fd06772..b7ac070096 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobProperty.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobProperty.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.build;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 8e83c12d99..7574ec751d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -2,8 +2,8 @@ package io.onedev.server.model.support.build;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.JobMatch;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javaindex 7dc0dd5a0c..3ef4396ab1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.build;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.annotation.BuildQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex 5f100fbbb8..a67f709554 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -10,7 +10,7 @@ import java.util.Map;import java.util.Set;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;@@ -46,8 +46,7 @@ public class ProjectBuildSetting implements Serializable {private transient GlobalBuildSetting globalSetting;- @Valid- public List<JobProperty> getJobProperties() {+ public List<@Valid JobProperty> getJobProperties() {return jobProperties;}@@ -55,8 +54,7 @@ public class ProjectBuildSetting implements Serializable {this.jobProperties = jobProperties;}- @Valid- public List<JobSecret> getJobSecrets() {+ public List<@Valid JobSecret> getJobSecrets() {return jobSecrets;}@@ -64,8 +62,7 @@ public class ProjectBuildSetting implements Serializable {this.jobSecrets = jobSecrets;}- @Valid- public List<BuildPreservation> getBuildPreservations() {+ public List<@Valid BuildPreservation> getBuildPreservations() {return buildPreservations;}@@ -73,8 +70,7 @@ public class ProjectBuildSetting implements Serializable {this.buildPreservations = buildPreservations;}- @Valid- public List<DefaultFixedIssueFilter> getDefaultFixedIssueFilters() {+ public List<@Valid DefaultFixedIssueFilter> getDefaultFixedIssueFilters() {return defaultFixedIssueFilters;}@@ -108,9 +104,8 @@ public class ProjectBuildSetting implements Serializable {this.listParams = listParams;}- @Valid@Nullable- public List<NamedBuildQuery> getNamedQueries() {+ public List<@Valid NamedBuildQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotification.java b/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotification.javaindex 05550923ed..ef5fb6e053 100644--- a/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotification.java+++ b/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotification.java@@ -2,8 +2,8 @@ package io.onedev.server.model.support.channelnotification;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Pattern;import io.onedev.server.annotation.BuildQuery;import io.onedev.server.annotation.CodeCommentQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotificationSetting.java b/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotificationSetting.javaindex cae58e7c63..93593782af 100644--- a/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotificationSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/channelnotification/ChannelNotificationSetting.java@@ -5,9 +5,9 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;@@ -27,8 +27,7 @@ public class ChannelNotificationSetting implements ContributedProjectSetting, Va@Vertical@OmitName@NotNull- @Valid- public List<ChannelNotification> getNotifications() {+ public List<@Valid ChannelNotification> getNotifications() {return notifications;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.javaindex a241c8dcb8..c1436b39e1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java@@ -11,9 +11,9 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.eclipse.jgit.lib.ObjectId;import org.jspecify.annotations.Nullable;@@ -212,8 +212,7 @@ public class BranchProtection implements Serializable {}@Editable(order=700, description="Optionally specify path protection rules")- @Valid- public List<FileProtection> getFileProtections() {+ public List<@Valid FileProtection> getFileProtections() {return fileProtections;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/ConventionalCommitChecker.java b/server-core/src/main/java/io/onedev/server/model/support/code/ConventionalCommitChecker.javaindex 4644dd3463..be4114ff18 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/ConventionalCommitChecker.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/ConventionalCommitChecker.java@@ -7,7 +7,7 @@ import java.util.ArrayList;import java.util.List;import java.util.regex.Pattern;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.google.common.base.Joiner;import com.google.common.base.Splitter;diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.javaindex cbdce46819..0ee37dd168 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java@@ -4,9 +4,9 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/RegexpCommitChecker.java b/server-core/src/main/java/io/onedev/server/model/support/code/RegexpCommitChecker.javaindex 055774b889..c38a5d8476 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/RegexpCommitChecker.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/RegexpCommitChecker.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.code;import java.util.regex.PatternSyntaxException;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.RegExp;diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.javaindex e91f0640df..573b9d4cdd 100644--- a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java@@ -8,7 +8,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 70cd3ba92f..40b3041201 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -11,8 +11,8 @@ import java.util.Map;import java.util.Set;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import org.unbescape.html.HtmlEscape;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.javaindex 54fae27a2b..6365feb8e8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/CommitMessageFixSetting.java@@ -12,10 +12,10 @@ import java.util.Set;import java.util.regex.Matcher;import java.util.regex.Pattern;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;@@ -78,8 +78,7 @@ public class CommitMessageFixSetting implements Serializable, Validatable {@Editable(order=200, name="Fix Detection", description="Specify prefix/suffix patterns to detect fixed issues "+ "in commit messages. Each line of the commit message will be matched against each entry defined here")@NotNull- @Valid- public List<FixPattern> getFixPatterns() {+ public List<@Valid FixPattern> getFixPatterns() {return fixPatterns;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ExternalIssueTransformers.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ExternalIssueTransformers.javaindex 8e3a13a037..ff14c092b0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ExternalIssueTransformers.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ExternalIssueTransformers.java@@ -5,8 +5,8 @@ import java.util.ArrayList;import java.util.List;import java.util.regex.Pattern;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.javaindex 5e71c4827e..64f1f987b5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryUpdater;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.javaindex e11d41df79..d2668eb268 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java@@ -4,7 +4,7 @@ import java.io.Serializable;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 3410889c6e..f37aac1b41 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.issue;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex 8338890362..8dfd5c47fc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -11,8 +11,8 @@ import java.util.Map;import java.util.Set;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.annotation.BranchName;@@ -76,8 +76,7 @@ public class ProjectIssueSetting implements Serializable {}@Nullable- @Valid- public List<BoardSpec> getBoardSpecs() {+ public List<@Valid BoardSpec> getBoardSpecs() {return boardSpecs;}@@ -86,8 +85,7 @@ public class ProjectIssueSetting implements Serializable {}@Nullable- @Valid- public List<NamedIssueQuery> getNamedQueries() {+ public List<@Valid NamedIssueQuery> getNamedQueries() {return namedQueries;}@@ -95,8 +93,7 @@ public class ProjectIssueSetting implements Serializable {this.namedQueries = namedQueries;}- @Valid- public Map<String, TimesheetSetting> getTimesheetSettings() {+ public Map<String, @Valid TimesheetSetting> getTimesheetSettings() {return timesheetSettings;}@@ -105,8 +102,7 @@ public class ProjectIssueSetting implements Serializable {}@NotNull- @Valid- public List<TransitionSpec> getTransitionSpecs() {+ public List<@Valid TransitionSpec> getTransitionSpecs() {return transitionSpecs;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.javaindex df241ee70c..8c39b71aa5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Color;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.javaindex 6fa2dae50f..028569fac5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java@@ -10,9 +10,9 @@ import java.util.List;import java.util.regex.Matcher;import java.util.regex.Pattern;-import javax.validation.ValidationException;-import javax.validation.constraints.Max;-import javax.validation.constraints.Min;+import jakarta.validation.ValidationException;+import jakarta.validation.constraints.Max;+import jakarta.validation.constraints.Min;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.javaindex 0c574429ab..ccc1badb98 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimesheetSetting.java@@ -10,7 +10,7 @@ import io.onedev.server.service.SettingService;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex 5509b04935..65a0e99961 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -8,7 +8,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/FieldInstance.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/FieldInstance.javaindex 16000049e5..b70b8152a3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/FieldInstance.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/FieldInstance.java@@ -6,12 +6,12 @@ import java.util.HashSet;import java.util.Map;import java.util.Set;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.javaindex 9cd04d7ff8..766d6eebef 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/instance/ScriptingValue.java@@ -8,7 +8,7 @@ import java.util.Map;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.javaindex 3e01e74ebb..cf61ba078a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspecmodel.inputspec.booleaninput.BooleanInput;import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.javaindex a07d07f017..7b20ace24f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.javaindex 8729804cfb..4d963202a5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.javaindex 8ec8ebb2c5..689cbd04af 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java@@ -6,8 +6,8 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.PathMatcher;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.javaindex 4558021f94..4016d66171 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.floatinput.FloatInput;import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.javaindex 758389dd52..b47cd5b16c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.SubscriptionService;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.javaindex 241aa17ac9..3119daa62c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.integerinput.IntegerInput;import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.javaindex 24e864ed2d..aa238535b7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;import io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.javaindex 58f026727f..709d0d7e71 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java@@ -4,8 +4,8 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.javaindex 2d1afae097..89e914f3e9 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java@@ -9,8 +9,8 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 3a1071e5ba..2e7d7123c8 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex c85bdf8ffc..568cf50439 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -7,7 +7,7 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.javaindex dfca5ea127..b505a78cad 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java@@ -8,8 +8,8 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/ScriptingDefaultValue.javaindex da4081ab45..2e79928eb6 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/ScriptingDefaultValue.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.javaindex f85ddfb49c..3533221abb 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java@@ -7,7 +7,7 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.javaindex 605a826ec5..2bd7cb83be 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/UserChoiceField.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.field.spec.userchoicefield;import java.util.List;import java.util.Map;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.javaindex b7b19f48bb..1db0fa9e37 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/DefaultMultiValue.java@@ -10,8 +10,8 @@ import io.onedev.server.model.User;import io.onedev.server.util.EditContext;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex fb87881516..db7379b015 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -6,7 +6,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 6fd2fb9e8d..1633eea563 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -7,7 +7,7 @@ import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.javaindex 8593efec54..c399b2f1dd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/DefaultValue.java@@ -9,8 +9,8 @@ import io.onedev.server.model.User;import io.onedev.server.util.EditContext;import io.onedev.server.web.util.SuggestionUtils;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.javaindex 287c6c7bc2..ed5e0505d0 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/ScriptingDefaultValue.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ScriptChoice;import io.onedev.server.util.GroovyUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.javaindex 8e3cc793bf..cc579efc96 100755--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java@@ -7,7 +7,7 @@ import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/AutoSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/AutoSpec.javaindex 787faf2891..649eb6a2f8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/AutoSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/AutoSpec.java@@ -4,7 +4,7 @@ import java.util.Collection;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.javaindex cc8bd88e46..b715061a86 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/NoActivitySpec.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pack/NamedPackQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pack/NamedPackQuery.javaindex 0cb6d8bd71..1dd7cc8589 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pack/NamedPackQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pack/NamedPackQuery.java@@ -4,7 +4,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.PackQuery;import io.onedev.server.model.support.NamedQuery;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editablepublic class NamedPackQuery implements NamedQuery {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.javaindex cd02f2ae87..85f9e3b31e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pack/ProjectPackSetting.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;@@ -16,8 +16,7 @@ public class ProjectPackSetting implements Serializable {private List<NamedPackQuery> namedQueries;@Nullable- @Valid- public List<NamedPackQuery> getNamedQueries() {+ public List<@Valid NamedPackQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.javaindex 3be1d68fb0..95d345adaf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.pullrequest;import java.io.Serializable;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Embeddable;+import jakarta.persistence.Column;+import jakarta.persistence.Embeddable;import org.hibernate.annotations.OptimisticLock;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.javaindex 21503a71c4..8ce52df509 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java@@ -3,8 +3,8 @@ package io.onedev.server.model.support.pullrequest;import io.onedev.server.model.PullRequest;import org.jspecify.annotations.Nullable;-import javax.persistence.Column;-import javax.persistence.Embeddable;+import jakarta.persistence.Column;+import jakarta.persistence.Embeddable;import java.io.Serializable;@Embeddablediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javaindex 174a08a92f..03e6aaf377 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.pullrequest;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.javaindex 21c866db69..e15a8de3c7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java@@ -9,7 +9,7 @@ import java.util.Comparator;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.annotation.Editable;@@ -34,8 +34,7 @@ public class ProjectPullRequestSetting implements Serializable {private Boolean deleteSourceBranchAfterMerge;@Nullable- @Valid- public List<NamedPullRequestQuery> getNamedQueries() {+ public List<@Valid NamedPullRequestQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.javaindex f686df3970..518c88d40b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.java@@ -4,7 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.javaindex 6a89b40940..1f5fd2c8d7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.role;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.javaindex de4d9e8fbe..34e8685e82 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java@@ -10,7 +10,7 @@ import io.onedev.server.service.BuildService;import io.onedev.server.web.util.SuggestionUtils;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java b/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.javaindex 7cd5b29d8d..14dfa16fc8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java+++ b/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.widget;import io.onedev.server.annotation.Editable;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.Size;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/widget/WidgetTab.java b/server-core/src/main/java/io/onedev/server/model/support/widget/WidgetTab.javaindex e6c4c7dbab..e9e75271d5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/widget/WidgetTab.java+++ b/server-core/src/main/java/io/onedev/server/model/support/widget/WidgetTab.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.widget;import io.onedev.server.annotation.Editable;import org.apache.wicket.Component;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/model/support/wiki/SpecifiedPath.java b/server-core/src/main/java/io/onedev/server/model/support/wiki/SpecifiedPath.javaindex 52d7341fa6..28ad898fb6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/wiki/SpecifiedPath.java+++ b/server-core/src/main/java/io/onedev/server/model/support/wiki/SpecifiedPath.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.wiki;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Path;diff --git a/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java b/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.javaindex be21a6212e..aaeeae3634 100644--- a/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.wiki;import io.onedev.server.annotation.Editable;-import javax.validation.Valid;+import jakarta.validation.Valid;import org.jspecify.annotations.Nullable;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/NamedWorkspaceQuery.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/NamedWorkspaceQuery.javaindex d4296bb229..1643558710 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/NamedWorkspaceQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/NamedWorkspaceQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.workspace;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.WorkspaceQuery;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/ProjectWorkspaceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/ProjectWorkspaceSetting.javaindex ef2cac2ff6..fba395c713 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/ProjectWorkspaceSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/ProjectWorkspaceSetting.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.validation.Valid;+import jakarta.validation.Valid;import io.onedev.server.annotation.Editable;@@ -16,8 +16,7 @@ public class ProjectWorkspaceSetting implements Serializable {private List<NamedWorkspaceQuery> namedQueries;@Nullable- @Valid- public List<NamedWorkspaceQuery> getNamedQueries() {+ public List<@Valid NamedWorkspaceQuery> getNamedQueries() {return namedQueries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheConfig.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheConfig.javaindex 4b5cd36c09..f1ab2a0530 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheConfig.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheConfig.java@@ -8,10 +8,10 @@ import java.util.List;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import org.apache.commons.lang3.tuple.Pair;@@ -76,9 +76,8 @@ public class CacheConfig implements Serializable {}@Editable(order=300, name="Cache Entries", description = "Specify cache entries")- @Valid@Size(min=1, max=100)- public List<CacheEntry> getEntries() {+ public List<@Valid CacheEntry> getEntries() {return entries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheEntry.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheEntry.javaindex d4d40d4efc..2d6b8c3ab2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheEntry.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/CacheEntry.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CacheEntryFacade;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ConfigFile.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ConfigFile.javaindex 219d1f0c64..40a66e19e4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ConfigFile.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ConfigFile.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.ConfigFileFacade;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/EnvVar.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/EnvVar.javaindex f2b5daf3db..b2279bf5b4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/EnvVar.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.DependsOn;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/RegistryLogin.javaindex 009e0227c6..5a14572d3b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/RegistryLogin.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ShortcutConfig.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ShortcutConfig.javaindex 58321cf820..27d5044065 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ShortcutConfig.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/ShortcutConfig.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.javaindex cf88c177b4..e29719166f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java@@ -7,7 +7,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserData.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserData.javaindex c99863c968..c1440623df 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserData.java@@ -5,9 +5,9 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.UserDataFacade;@@ -38,9 +38,8 @@ public class UserData implements Serializable {}@Editable(order=200, name="Data Entries", description = "Specify data entries to persist across workspaces")- @Valid@Size(min=1, max=100)- public List<UserDataEntry> getEntries() {+ public List<@Valid UserDataEntry> getEntries() {return entries;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserDataEntry.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserDataEntry.javaindex 9a4295ea91..0eedbb8e2d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserDataEntry.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/UserDataEntry.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.workspace.spec;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.javaindex 80ae8f1d36..68287e20d3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java@@ -6,11 +6,11 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import org.apache.commons.io.FilenameUtils;@@ -192,8 +192,7 @@ public class WorkspaceSpec implements Serializable, Validatable {Optionally define user data for the workspace. User data populated by a workspace will be uploadedafter the workspace is deleted, and can be reused by other workspaces created by same user""")@DependsOn(property = "runInContainer")- @Valid- public List<UserData> getUserDatas() {+ public List<@Valid UserData> getUserDatas() {return userDatas;}@@ -214,8 +213,7 @@ public class WorkspaceSpec implements Serializable, Validatable {}@Editable(order = 400, name = "Environment Variables", description = "Optionally specify environment variables")- @Valid- public List<EnvVar> getEnvVars() {+ public List<@Valid EnvVar> getEnvVars() {return envVars;}@@ -226,8 +224,7 @@ public class WorkspaceSpec implements Serializable, Validatable {@Editable(order = 600, name = "Shortcuts", description = """Optionally specify list of shortcuts at top of workspace. When workspace is created,the first shortcut will be opened automatically""")- @Valid- public List<ShortcutConfig> getShortcutConfigs() {+ public List<@Valid ShortcutConfig> getShortcutConfigs() {return shortcutConfigs;}@@ -287,8 +284,7 @@ public class WorkspaceSpec implements Serializable, Validatable {<code>@workspace_token@</code> for user name, and access token for password""")@DependsOn(property = "runInContainer")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}@@ -298,8 +294,7 @@ public class WorkspaceSpec implements Serializable, Validatable {@Editable(order = 1550, group = "More Settings", description = "Optionally define config files for the workspace")@DependsOn(property = "runInContainer")- @Valid- public List<ConfigFile> getConfigFiles() {+ public List<@Valid ConfigFile> getConfigFiles() {return configFiles;}@@ -310,8 +305,7 @@ public class WorkspaceSpec implements Serializable, Validatable {@Editable(order = 1600, group = "More Settings", name = "Caches", description = """Optionally define caches for the workspace. Cache populated by a workspace will be uploadedafter the workspace is deleted, and can be used by other workspaces created after it""")- @Valid- public List<CacheConfig> getCacheConfigs() {+ public List<@Valid CacheConfig> getCacheConfigs() {return cacheConfigs;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.javaindex 9f009f9aa8..70d2d2affe 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.workspace.spec.shell;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.PosixFacility;import io.onedev.k8shelper.ShellFacility;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.javaindex 6398ec44ab..be58985d0c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.workspace.spec.shell;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.k8shelper.PowerShellFacility;import io.onedev.k8shelper.ShellFacility;diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/WorkspaceSpecTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/WorkspaceSpecTemplate.javaindex 9a4307b717..065fa3e7b4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/WorkspaceSpecTemplate.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/WorkspaceSpecTemplate.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.workspace.spec.template;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.spec.TaskAutomation;diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 0150e3fc21..10dbd11c9a 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -11,8 +11,8 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.shiro.authz.Permission;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex e8a6813159..a3552b3bba 100644--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -9,8 +9,8 @@ import java.util.Collection;import java.util.HashSet;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex 66e1967fc0..e013bed7e5 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -23,8 +23,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 31ba987e6e..599ec9feb4 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -17,9 +17,9 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.mail.internet.InternetAddress;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.mail.internet.InternetAddress;import org.apache.commons.lang3.StringUtils;import org.apache.commons.lang3.tuple.Pair;diff --git a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.javaindex f754c79f93..71e399e086 100644--- a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java@@ -19,8 +19,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex f6834ebcfe..c7bb7d3d2b 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -22,8 +22,8 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.lang3.StringUtils;import org.apache.commons.text.WordUtils;diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex de0582aaa6..6f54971d57 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -1,14 +1,14 @@package io.onedev.server.notification;import static java.nio.charset.StandardCharsets.UTF_8;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;import java.io.IOException;import java.util.concurrent.ExecutorService;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.core.HttpHeaders;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.core.HttpHeaders;import org.apache.http.HttpEntity;import org.apache.http.HttpStatus;diff --git a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.javaindex 18dee45830..6e6313a229 100644--- a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java@@ -8,8 +8,8 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.shiro.authz.Permission;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/pack/PackFilter.java b/server-core/src/main/java/io/onedev/server/pack/PackFilter.javaindex 925d806e81..8ea2c957d3 100644--- a/server-core/src/main/java/io/onedev/server/pack/PackFilter.java+++ b/server-core/src/main/java/io/onedev/server/pack/PackFilter.java@@ -4,18 +4,18 @@ import static org.apache.shiro.SecurityUtils.getSubject;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.EntityNotFoundException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.HttpHeaders;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.EntityNotFoundException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.HttpHeaders;import org.apache.shiro.authc.UsernamePasswordToken;import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.codec.Base64;+import org.apache.shiro.lang.codec.Base64;import org.apache.shiro.subject.support.DefaultSubjectContext;import org.apache.shiro.util.ThreadContext;diff --git a/server-core/src/main/java/io/onedev/server/pack/PackHandler.java b/server-core/src/main/java/io/onedev/server/pack/PackHandler.javaindex 886bde971e..141bbd15de 100644--- a/server-core/src/main/java/io/onedev/server/pack/PackHandler.java+++ b/server-core/src/main/java/io/onedev/server/pack/PackHandler.java@@ -3,8 +3,8 @@ package io.onedev.server.pack;import io.onedev.commons.loader.ExtensionPoint;import org.jspecify.annotations.Nullable;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import java.util.List;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultIdService.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultIdService.javaindex bc2211d608..baabf272b2 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultIdService.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultIdService.java@@ -1,12 +1,12 @@package io.onedev.server.persistence;-import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterAtomicLong;import io.onedev.server.cluster.ClusterService;import io.onedev.server.data.DataService;import io.onedev.server.model.AbstractEntity;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.sql.Connection;import java.sql.ResultSet;import java.sql.SQLException;@@ -25,7 +25,7 @@ public class DefaultIdService implements IdService {private final SessionFactoryService sessionFactoryService;- private final Map<Class<?>, IAtomicLong> nextIds = new HashMap<>();+ private final Map<Class<?>, ClusterAtomicLong> nextIds = new HashMap<>();@Injectpublic DefaultIdService(DataService dataService, ClusterService clusterService,@@ -58,7 +58,7 @@ public class DefaultIdService implements IdService {callWithTransaction(conn, () -> {for (var persistenceClass: sessionFactoryService.getMetadata().getEntityBindings()) {Class<?> entityClass = persistenceClass.getMappedClass();- var nextId = clusterService.getHazelcastInstance().getCPSubsystem().getAtomicLong(entityClass.getName());+ var nextId = clusterService.getAtomicLong(entityClass.getName());clusterService.initWithLead(nextId, () -> getMaxId(conn, entityClass) + 1);nextIds.put(entityClass, nextId);}@@ -76,16 +76,7 @@ public class DefaultIdService implements IdService {@Overridepublic void useId(Class<?> entityClass, long id) {- var nextAtomicId = nextIds.get(entityClass);- while (true) {- long nextId = nextAtomicId.getAndIncrement();- if (id+1 > nextId) {- if (nextAtomicId.compareAndSet(nextId, id+1))- break;- } else {- break;- }- }+ nextIds.get(entityClass).ensureAtLeast(Math.addExact(id, 1));}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.javaindex 4521e56d0a..bd3e683d9a 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionFactoryService.java@@ -1,6 +1,9 @@package io.onedev.server.persistence;+import static org.hibernate.cfg.AvailableSettings.DIALECT;+import java.util.Properties;+import java.util.Set;import org.hibernate.Interceptor;import org.hibernate.SessionFactory;@@ -9,7 +12,7 @@ import org.hibernate.boot.MetadataBuilder;import org.hibernate.boot.MetadataSources;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.hibernate.boot.registry.StandardServiceRegistryBuilder;-import org.hibernate.service.ServiceRegistry;+import org.hibernate.boot.registry.StandardServiceRegistry;import com.hazelcast.core.HazelcastInstance;@@ -17,8 +20,8 @@ import io.onedev.commons.utils.ClassUtils;import io.onedev.server.cluster.ClusterService;import io.onedev.server.model.AbstractEntity;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class DefaultSessionFactoryService implements SessionFactoryService {@@ -44,33 +47,56 @@ public class DefaultSessionFactoryService implements SessionFactoryService {HazelcastInstance hazelcastInstance = clusterService.getHazelcastInstance();Properties hibernateSettings = new Properties();hibernateSettings.putAll(hibernateConfig);- if (hazelcastInstance != null) {- hibernateSettings.put("hibernate.cache.hazelcast.instance_name", hazelcastInstance.getName());- } else {- hibernateSettings.put("hibernate.cache.use_second_level_cache", "false");- hibernateSettings.put("hibernate.cache.use_query_cache", "false");- hibernateSettings.put("hibernate.hikari.maximumPoolSize", "1");- }- ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()- .applySettings(hibernateSettings).build();- MetadataSources metadataSources = new MetadataSources(serviceRegistry);- for (Class<? extends AbstractEntity> each:- ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {- metadataSources.addAnnotatedClass(each);+ // Keep the configured dialect for OneDev's upgrade/maintenance decisions,+ // but let Hibernate detect standard dialects from JDBC metadata.+ if (!"false".equalsIgnoreCase(hibernateSettings.getProperty("hibernate.boot.allow_jdbc_metadata_access"))+ && Set.of("org.hibernate.dialect.HSQLDialect", "org.hibernate.dialect.MySQLDialect",+ "org.hibernate.dialect.MariaDBDialect")+ .contains(hibernateSettings.getProperty(DIALECT, ""))) {+ hibernateSettings.remove(DIALECT);}+ StandardServiceRegistry serviceRegistry = null;+ try {+ if (hazelcastInstance != null) {+ hibernateSettings.put("hibernate.cache.hazelcast.instance_name", hazelcastInstance.getName());+ // The cluster service owns the shared member, including its shutdown.+ hibernateSettings.put("hibernate.cache.hazelcast.shutdown_on_session_factory_close", "false");+ } else {+ hibernateSettings.put("hibernate.cache.use_second_level_cache", "false");+ hibernateSettings.put("hibernate.cache.use_query_cache", "false");+ hibernateSettings.put("hibernate.hikari.maximumPoolSize", "1");+ }+ serviceRegistry = new StandardServiceRegistryBuilder()+ .applySettings(hibernateSettings).build();+ MetadataSources metadataSources = new MetadataSources(serviceRegistry);+ for (Class<? extends AbstractEntity> each:+ ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {+ metadataSources.addAnnotatedClass(each);+ }- MetadataBuilder builder = metadataSources.getMetadataBuilder();- metadata = builder.applyPhysicalNamingStrategy(physicalNamingStrategy).build();- sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();+ MetadataBuilder builder = metadataSources.getMetadataBuilder();+ metadata = builder.applyPhysicalNamingStrategy(physicalNamingStrategy).build();+ sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();+ } catch (RuntimeException | Error e) {+ try {+ if (serviceRegistry != null)+ StandardServiceRegistryBuilder.destroy(serviceRegistry);+ } finally {+ stop();+ }+ throw e;+ }}@Overridepublic void stop() {- if (sessionFactory != null) {- sessionFactory.close();+ try {+ if (sessionFactory != null)+ sessionFactory.close();+ } finally {sessionFactory = null;+ metadata = null;}- metadata = null;}@Override@@ -83,4 +109,4 @@ public class DefaultSessionFactoryService implements SessionFactoryService {return sessionFactory;}-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionService.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionService.javaindex e7a0cd103b..6cd6eb4e17 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionService.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionService.java@@ -13,8 +13,8 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.exception.ServerNotReadyException;import io.onedev.server.util.ObjectReference;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class DefaultSessionService implements SessionService {diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionService.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionService.javaindex a26e8e7487..dadf81a92e 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionService.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionService.java@@ -23,11 +23,11 @@ import org.hibernate.Transaction;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.FlushModeType;-import javax.transaction.Status;-import javax.transaction.Synchronization;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.FlushModeType;+import jakarta.transaction.Status;+import jakarta.transaction.Synchronization;import java.util.ArrayList;import java.util.Collection;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/persistence/HazelcastLocalCacheRegionFactory.java b/server-core/src/main/java/io/onedev/server/persistence/HazelcastLocalCacheRegionFactory.javanew file mode 100644index 0000000000..b6c8d65b83--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/HazelcastLocalCacheRegionFactory.java@@ -0,0 +1,13 @@+package io.onedev.server.persistence;++import java.util.concurrent.TimeUnit;++public class HazelcastLocalCacheRegionFactory extends com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory {++ @Override+ public long getTimeout() {+ // Hazelcast timestamps use milliseconds, not Hibernate SimpleTimestamper's scaled units.+ return TimeUnit.SECONDS.toMillis(60);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.javaindex b611a0df17..4d1a9c3065 100644--- a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java+++ b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java@@ -3,29 +3,35 @@ package io.onedev.server.persistence;import static io.onedev.commons.utils.FileUtils.loadProperties;import static java.nio.charset.StandardCharsets.UTF_8;import static org.hibernate.cfg.AvailableSettings.DIALECT;-import static org.hibernate.cfg.AvailableSettings.DRIVER;-import static org.hibernate.cfg.AvailableSettings.PASS;-import static org.hibernate.cfg.AvailableSettings.URL;-import static org.hibernate.cfg.AvailableSettings.USER;+import static org.hibernate.cfg.AvailableSettings.JAKARTA_JDBC_DRIVER;+import static org.hibernate.cfg.AvailableSettings.JAKARTA_JDBC_PASSWORD;+import static org.hibernate.cfg.AvailableSettings.JAKARTA_JDBC_URL;+import static org.hibernate.cfg.AvailableSettings.JAKARTA_JDBC_USER;import java.io.File;import java.io.IOException;import java.util.Properties;+import java.util.Map;import org.apache.commons.io.FileUtils;import org.apache.commons.lang3.Strings;import org.hibernate.cfg.Environment;-import io.onedev.commons.utils.StringUtils;-public class HibernateConfig extends Properties {private static final long serialVersionUID = 1L;private static final String ENV_PASS_FILE ="hibernate_connection_password_file";+ // Existing installations and deployment manifests still use these OneDev configuration keys.+ private static final Map<String, String> LEGACY_CONNECTION_SETTINGS = Map.of(+ "hibernate.connection.driver_class", JAKARTA_JDBC_DRIVER,+ "hibernate.connection.url", JAKARTA_JDBC_URL,+ "hibernate.connection.username", JAKARTA_JDBC_USER,+ "hibernate.connection.password", JAKARTA_JDBC_PASSWORD);+private static final String[] ENVS = new String[] {- DIALECT, DRIVER, URL, USER, PASS, "hibernate.hikari.leakDetectionThreshold",+ DIALECT, JAKARTA_JDBC_DRIVER, JAKARTA_JDBC_URL, JAKARTA_JDBC_USER, JAKARTA_JDBC_PASSWORD, "hibernate.hikari.leakDetectionThreshold","hibernate.hikari.maxLifetime", "hibernate.hikari.connectionTimeout","hibernate.hikari.maximumPoolSize", "hibernate.hikari.validationTimeout","hibernate.show_sql", "hibernate.query.plan_cache_max_size",@@ -35,27 +41,36 @@ public class HibernateConfig extends Properties {public HibernateConfig(File installDir) {File file = new File(installDir, "conf/hibernate.properties");putAll(loadProperties(file));- put("hibernate.cache.hazelcast.shutdown_on_session_factory_close", "false");+ LEGACY_CONNECTION_SETTINGS.forEach((legacy, current) -> {+ Object value = remove(legacy);+ if (value != null)+ putIfAbsent(current, value);+ });+ if ("org.hibernate.dialect.MySQL5InnoDBDialect".equals(getProperty(DIALECT)))+ put(DIALECT, "org.hibernate.dialect.MySQLDialect");String value = System.getenv(ENV_PASS_FILE);if (value != null) {try {- setProperty(PASS, FileUtils.readFileToString(new File(value), UTF_8).trim());+ setProperty(JAKARTA_JDBC_PASSWORD, FileUtils.readFileToString(new File(value), UTF_8).trim());} catch (IOException e) {throw new RuntimeException(e);}}+ LEGACY_CONNECTION_SETTINGS.forEach((legacy, current) -> {+ String override = System.getenv(legacy.replace('.', '_'));+ if (override != null)+ setProperty(current, override);+ });for (String env: ENVS) {value = System.getenv(env.replace('.', '_'));if (value != null)setProperty(env, value);}- String url = getProperty(URL);+ String url = getProperty(JAKARTA_JDBC_URL);url = Strings.CS.replace(url, "${installDir}", installDir.getAbsolutePath());- if (url.contains(":sqlserver:") && !url.toLowerCase().contains("selectMethod=cursor".toLowerCase()))- url = StringUtils.stripEnd(url, ";") + ";selectMethod=cursor";- setProperty(URL, url);+ setProperty(JAKARTA_JDBC_URL, url);}public String getDialect() {@@ -63,19 +78,19 @@ public class HibernateConfig extends Properties {}public String getDriver() {- return getProperty(Environment.DRIVER);+ return getProperty(Environment.JAKARTA_JDBC_DRIVER);}public String getUrl() {- return getProperty(Environment.URL);+ return getProperty(Environment.JAKARTA_JDBC_URL);}public String getUser() {- return getProperty(Environment.USER);+ return getProperty(Environment.JAKARTA_JDBC_USER);}public String getPassword() {- return getProperty(Environment.PASS);+ return getProperty(Environment.JAKARTA_JDBC_PASSWORD);}public static boolean isHSQLDialect(String dialect) {diff --git a/server-core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java b/server-core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.javaindex 116b51b2ca..66ffa8305d 100644--- a/server-core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java+++ b/server-core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java@@ -3,17 +3,14 @@ package io.onedev.server.persistence;import java.io.Serializable;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.CallbackException;-import org.hibernate.EmptyInterceptor;+import org.hibernate.Interceptor;import org.hibernate.type.Type;@Singleton-public class HibernateInterceptor extends EmptyInterceptor {-- private static final long serialVersionUID = 1L;+public class HibernateInterceptor implements Interceptor {private final Set<PersistListener> listeners;@@ -23,11 +20,11 @@ public class HibernateInterceptor extends EmptyInterceptor {}@Override- public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException {+ public boolean onLoad(Object entity, Object id, Object[] state, String[] propertyNames,+ Type[] types) {boolean changed = false;for (PersistListener listener: listeners) {- if (listener.onLoad(entity, id, state, propertyNames, types))+ if (listener.onLoad(entity, (Serializable) id, state, propertyNames, types))changed = true;}@@ -35,11 +32,11 @@ public class HibernateInterceptor extends EmptyInterceptor {}@Override- public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState,- Object[] previousState, String[] propertyNames, Type[] types) throws CallbackException {+ public boolean onFlushDirty(Object entity, Object id, Object[] currentState,+ Object[] previousState, String[] propertyNames, Type[] types) {boolean changed = false;for (PersistListener listener: listeners) {- if (listener.onFlushDirty(entity, id, currentState, previousState, propertyNames, types))+ if (listener.onFlushDirty(entity, (Serializable) id, currentState, previousState, propertyNames, types))changed = true;}@@ -47,11 +44,11 @@ public class HibernateInterceptor extends EmptyInterceptor {}@Override- public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException {+ public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames,+ Type[] types) {boolean changed = false;for (PersistListener listener: listeners) {- if (listener.onSave(entity, id, state, propertyNames, types))+ if (listener.onSave(entity, (Serializable) id, state, propertyNames, types))changed = true;}@@ -59,10 +56,10 @@ public class HibernateInterceptor extends EmptyInterceptor {}@Override- public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException {+ public void onDelete(Object entity, Object id, Object[] state, String[] propertyNames,+ Type[] types) {for (PersistListener listener: listeners)- listener.onDelete(entity, id, state, propertyNames, types);+ listener.onDelete(entity, (Serializable) id, state, propertyNames, types);}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java b/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.javaindex 0c4e591182..ec5d39bf2d 100644--- a/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java+++ b/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java@@ -1,27 +1,32 @@package io.onedev.server.persistence;-import java.io.Serializable;-import java.util.Properties;+import java.util.EnumSet;-import org.hibernate.HibernateException;-import org.hibernate.MappingException;import org.hibernate.engine.spi.SharedSessionContractImplementor;-import org.hibernate.id.Configurable;-import org.hibernate.id.IdentifierGenerator;-import org.hibernate.service.ServiceRegistry;-import org.hibernate.type.Type;+import org.hibernate.generator.BeforeExecutionGenerator;+import org.hibernate.generator.EventType;+import org.hibernate.generator.EventTypeSets;import io.onedev.commons.loader.AppLoader;-public class IdGenerator implements IdentifierGenerator, Configurable {+public class IdGenerator implements BeforeExecutionGenerator {++ private static final long serialVersionUID = 1L;@Override- public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {+ public Object generate(SharedSessionContractImplementor session, Object object,+ Object currentValue, EventType eventType) {+ return currentValue != null ? currentValue+ : AppLoader.getInstance(IdService.class).nextId(object.getClass());}@Override- public Serializable generate(SharedSessionContractImplementor session, Object object) throws HibernateException {- return AppLoader.getInstance(IdService.class).nextId(object.getClass());+ public EnumSet<EventType> getEventTypes() {+ return EventTypeSets.INSERT_ONLY;}-}\ No newline at end of file+ @Override+ public boolean allowAssignedIdentifiers() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/PersistListener.java b/server-core/src/main/java/io/onedev/server/persistence/PersistListener.javaindex d869d48300..ef4dd23222 100644--- a/server-core/src/main/java/io/onedev/server/persistence/PersistListener.java+++ b/server-core/src/main/java/io/onedev/server/persistence/PersistListener.java@@ -2,21 +2,20 @@ package io.onedev.server.persistence;import java.io.Serializable;-import org.hibernate.CallbackException;import org.hibernate.type.Type;public interface PersistListener {boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException;+ Type[] types);boolean onFlushDirty(Object entity, Serializable id, Object[] currentState,- Object[] previousState, String[] propertyNames, Type[] types) throws CallbackException;+ Object[] previousState, String[] propertyNames, Type[] types);boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException;+ Type[] types);void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames,- Type[] types) throws CallbackException;+ Type[] types);}diff --git a/server-core/src/main/java/io/onedev/server/persistence/PostgreSQLDialect.java b/server-core/src/main/java/io/onedev/server/persistence/PostgreSQLDialect.javaindex debb586c6a..36a4a2e97b 100644--- a/server-core/src/main/java/io/onedev/server/persistence/PostgreSQLDialect.java+++ b/server-core/src/main/java/io/onedev/server/persistence/PostgreSQLDialect.java@@ -2,9 +2,9 @@ package io.onedev.server.persistence;import java.sql.Types;-import org.hibernate.dialect.PostgreSQL82Dialect;-import org.hibernate.type.descriptor.sql.BinaryTypeDescriptor;-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;+import org.hibernate.boot.model.TypeContributions;+import org.hibernate.service.ServiceRegistry;+import org.hibernate.type.descriptor.jdbc.VarbinaryJdbcType;/*** Map blob to bytea to avoid below issues:@@ -15,19 +15,20 @@ import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;* entities with blob fields out side of a transaction even if Hibernate session* is available*/-public class PostgreSQLDialect extends PostgreSQL82Dialect {+public class PostgreSQLDialect extends org.hibernate.dialect.PostgreSQLDialect {- public PostgreSQLDialect() {- super();- registerColumnType(Types.BLOB, "bytea");+ @Override+ protected String columnType(int sqlTypeCode) {+ return sqlTypeCode == Types.BLOB ? "bytea" : super.columnType(sqlTypeCode);}@Override- public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {- if (sqlTypeDescriptor.getSqlType() == java.sql.Types.BLOB) {- return BinaryTypeDescriptor.INSTANCE;- }- return super.remapSqlTypeDescriptor(sqlTypeDescriptor);+ public void contributeTypes(TypeContributions contributions, ServiceRegistry registry) {+ super.contributeTypes(contributions, registry);+ // Use binary binding for nulls as well as setBytes/getBytes for values.+ // A BLOB JDBC type binds null as oid, which PostgreSQL rejects for bytea.+ contributions.getTypeConfiguration().getJdbcTypeRegistry()+ .addDescriptor(Types.BLOB, VarbinaryJdbcType.INSTANCE);}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/SequenceGenerator.java b/server-core/src/main/java/io/onedev/server/persistence/SequenceGenerator.javaindex 2f5efa56a2..930e0b0779 100644--- a/server-core/src/main/java/io/onedev/server/persistence/SequenceGenerator.java+++ b/server-core/src/main/java/io/onedev/server/persistence/SequenceGenerator.java@@ -41,7 +41,7 @@ public class SequenceGenerator {Long nextSequence = getNextSequences().get(key);if (nextSequence == null) {Query<?> query = dao.getSession().createQuery(String.format("select max(%s) from %s where %s=:numberScope",- AbstractEntity.PROP_NUMBER, sequenceClass.getSimpleName(), AbstractEntity.PROP_NUMBER_SCOPE));+ AbstractEntity.PROP_NUMBER, sequenceClass.getSimpleName(), AbstractEntity.PROP_NUMBER_SCOPE), Long.class);query.setParameter(AbstractEntity.PROP_NUMBER_SCOPE, sequenceScope);Object result = query.uniqueResult();diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java b/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.javaindex c1c8ca0fa2..ac396f1b51 100644--- a/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java@@ -1,8 +1,8 @@package io.onedev.server.persistence;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.inject.Singleton;import org.hibernate.SessionFactory;diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionProvider.java b/server-core/src/main/java/io/onedev/server/persistence/SessionProvider.javaindex 474cb3ac8a..0c0e22ee89 100644--- a/server-core/src/main/java/io/onedev/server/persistence/SessionProvider.java+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionProvider.java@@ -1,8 +1,8 @@package io.onedev.server.persistence;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.inject.Singleton;import org.hibernate.Session;diff --git a/server-core/src/main/java/io/onedev/server/persistence/annotation/EntityId.java b/server-core/src/main/java/io/onedev/server/persistence/annotation/EntityId.javanew file mode 100644index 0000000000..cd5d64aff6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/annotation/EntityId.java@@ -0,0 +1,19 @@+package io.onedev.server.persistence.annotation;++import static java.lang.annotation.ElementType.FIELD;+import static java.lang.annotation.ElementType.METHOD;+import static java.lang.annotation.RetentionPolicy.RUNTIME;++import java.lang.annotation.Retention;+import java.lang.annotation.Target;++import org.hibernate.annotations.IdGeneratorType;++import io.onedev.server.persistence.IdGenerator;++/** Allocates OneDev identifiers while preserving IDs supplied by imports and system records. */+@IdGeneratorType(IdGenerator.class)+@Retention(RUNTIME)+@Target({FIELD, METHOD})+public @interface EntityId {+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Criterion.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Criterion.javanew file mode 100644index 0000000000..f49f1ab5c5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Criterion.java@@ -0,0 +1,13 @@+package io.onedev.server.persistence.dao;++import java.io.Serializable;+import java.util.function.Function;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;++/** A serializable restriction translated into Jakarta Criteria when executed. */+@FunctionalInterface+public interface Criterion extends Serializable {+ Predicate toPredicate(CriteriaBuilder builder, Function<String, Path<?>> paths);+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.javaindex 1d95c6f972..74b41fbfc7 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java@@ -4,7 +4,6 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.SessionService;import org.hibernate.HibernateException;import org.hibernate.Session;-import org.hibernate.criterion.DetachedCriteria;import java.util.List;@@ -39,11 +38,12 @@ public interface Dao {* If the id of the entity is null or zero, add it to the datastore and* assign it an id; otherwise, update the corresponding entity in the* data store with the properties of this entity. In either case the entity- * passed to this method will be attached to the session.+ * passed to this method will be attached to the session if new. For a detached+ * existing entity, its state is merged into the session's managed instance.* <p>* If an entity to update is already attached to the session, this method- * will have no effect. If an entity to update has the same id as another- * instance already attached to the session, an error will be thrown.+ * will have no effect. Subsequent changes to a detached input are not tracked;+ * load the entity in the current session before making further changes.** @param entity* the entity to be saved@@ -62,7 +62,7 @@ public interface Dao {* Query with specified criteria.** @param criteria- * hibernate {@link DetachedCriteria}+ * hibernate {@link io.onedev.server.persistence.dao.EntityCriteria}* @param firstResult* first result of the query. Set to 0 if this value should be ignored* @param maxResults@@ -94,7 +94,7 @@ public interface Dao {* Count entities of specified class matching specified criteria.** @return- * number of entities matching specified {@link DetachedCriteria}+ * number of entities matching specified {@link io.onedev.server.persistence.dao.EntityCriteria}*/<T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria);diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex 5cb7306490..bc90394e34 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -8,18 +8,16 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.SessionService;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;-import org.hibernate.Criteria;+import org.hibernate.query.Query;import org.hibernate.Session;-import org.hibernate.criterion.Projections;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.ObjectStreamException;import java.io.Serializable;import java.util.List;@Singleton-@SuppressWarnings("unchecked")public class DefaultDao implements Dao, Serializable {private final SessionService sessionService;@@ -35,34 +33,37 @@ public class DefaultDao implements Dao, Serializable {@Sessional@Overridepublic <T extends AbstractEntity> T get(Class<T> entityClass, Long entityId) {- return (T) getSession().get(entityClass, entityId);+ return getSession().find(entityClass, entityId);}@Sessional@Overridepublic <T extends AbstractEntity> T load(Class<T> entityClass, Long entityId) {- return (T) getSession().load(entityClass, entityId);+ return getSession().getReference(entityClass, entityId);}@Transactional@Overridepublic void persist(AbstractEntity entity) {boolean wasNew = entity.isNew();- getSession().saveOrUpdate(entity);+ if (wasNew)+ getSession().persist(entity);+ else if (!getSession().contains(entity))+ entity = getSession().merge(entity);listenerRegistry.post(new EntityPersisted(entity, wasNew));}@Transactional@Overridepublic void remove(AbstractEntity entity) {- getSession().delete(entity);+ getSession().remove(entity);listenerRegistry.post(new EntityRemoved(entity));}@Sessional@Overridepublic <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria, int firstResult, int maxResults) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());+ Query<T> criteria = entityCriteria.getExecutableCriteria(getSession());criteria.setFirstResult(firstResult);criteria.setMaxResults(maxResults);return criteria.list();@@ -77,7 +78,7 @@ public class DefaultDao implements Dao, Serializable {@Sessional@Overridepublic <T extends AbstractEntity> T find(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());+ Query<T> criteria = entityCriteria.getExecutableCriteria(getSession());criteria.setFirstResult(0);criteria.setMaxResults(1);return (T) criteria.uniqueResult();@@ -86,9 +87,7 @@ public class DefaultDao implements Dao, Serializable {@Sessional@Overridepublic <T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());- criteria.setProjection(Projections.rowCount());- return ((Long) criteria.uniqueResult()).intValue();+ return Math.toIntExact(entityCriteria.count(getSession()));}public Object writeReplace() throws ObjectStreamException {diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.javaindex 513ac5e81c..c0f9505c10 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java@@ -1,164 +1,124 @@-package io.onedev.server.persistence.dao;--import java.io.Serializable;--import org.apache.commons.lang3.SerializationUtils;-import org.hibernate.CacheMode;-import org.hibernate.Criteria;-import org.hibernate.FetchMode;-import org.hibernate.HibernateException;-import org.hibernate.LockMode;-import org.hibernate.Session;-import org.hibernate.criterion.CriteriaSpecification;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Projection;-import org.hibernate.engine.spi.SessionImplementor;-import org.hibernate.internal.CriteriaImpl;-import org.hibernate.sql.JoinType;-import org.hibernate.transform.ResultTransformer;--import io.onedev.server.model.AbstractEntity;--public class EntityCriteria<T extends AbstractEntity> implements CriteriaSpecification, Serializable {-- private final CriteriaImpl impl;-- private final Criteria criteria;-- protected EntityCriteria(String entityName) {- impl = new CriteriaImpl(entityName, null);- criteria = impl;- }-- protected EntityCriteria(String entityName, String alias) {- impl = new CriteriaImpl(entityName, alias, null);- criteria = impl;- }-- protected EntityCriteria(CriteriaImpl impl, Criteria criteria) {- this.impl = impl;- this.criteria = criteria;- }-- /**- * Get an executable instance of <literal>Criteria</literal>,- * to actually run the query.- */- public Criteria getExecutableCriteria(Session session) {- CriteriaImpl clone = (CriteriaImpl) SerializationUtils.clone(impl);- clone.setSession( ( SessionImplementor ) session );- return clone;- }-- public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz) {- return new EntityCriteria<T>(clazz.getName());- }-- public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz, String alias) {- return new EntityCriteria<T>(clazz.getName(), alias );- }-- public EntityCriteria<T> add(Criterion criterion) {- criteria.add(criterion);- return this;- }-- public EntityCriteria<T> addOrder(Order order) {- criteria.addOrder(order);- return this;- }-- public void setCacheable(boolean cacheable) {- criteria.setCacheable(cacheable);- }-- public void setCacheMode(CacheMode cacheMode) {- criteria.setCacheMode(cacheMode);- }-- public void setCacheRegion(String cacheRegion) {- criteria.setCacheRegion(cacheRegion);- }-- public EntityCriteria<T> createAlias(String associationPath, String alias)- throws HibernateException {- criteria.createAlias(associationPath, alias);- return this;- }-- public Criteria createCriteria(String associationPath, String alias)- throws HibernateException {- return criteria.createCriteria(associationPath, alias);- }-- public Criteria createCriteria(String associationPath)- throws HibernateException {- return criteria.createCriteria(associationPath);- }-- public String getAlias() {- return criteria.getAlias();- }-- public EntityCriteria<T> setFetchMode(String associationPath, FetchMode mode)- throws HibernateException {- criteria.setFetchMode(associationPath, mode);- return this;- }-- public EntityCriteria<T> setProjection(Projection projection) {- criteria.setProjection(projection);- return this;- }-- public EntityCriteria<T> setResultTransformer(ResultTransformer resultTransformer) {- criteria.setResultTransformer(resultTransformer);- return this;- }-- public String toString() {- return "DetachableCriteria(" + criteria.toString() + ')';- }-- CriteriaImpl getCriteriaImpl() {- return impl;- }-- public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType) throws HibernateException {- criteria.createAlias(associationPath, alias, joinType);- return this;- }-- public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {- criteria.createAlias(associationPath, alias, joinType, withClause);- return this;- }-- public EntityCriteria<T> createCriteria(String associationPath, JoinType joinType) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, joinType));- }-- public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType));- }-- public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType, withClause));- }-- public EntityCriteria<T> setComment(String comment) {- criteria.setComment(comment);- return this;- }-- public EntityCriteria<T> setLockMode(LockMode lockMode) {- criteria.setLockMode(lockMode);- return this;- }-- public EntityCriteria<T> setLockMode(String alias, LockMode lockMode) {- criteria.setLockMode(alias, lockMode);- return this;- }-}+package io.onedev.server.persistence.dao;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.function.Function;++import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import org.hibernate.CacheMode;+import org.hibernate.Session;+import org.hibernate.query.Query;++import io.onedev.server.model.AbstractEntity;++/** Serializable query description, independent of a Hibernate session. */+public class EntityCriteria<T extends AbstractEntity> implements Serializable {+ private final Class<T> entityClass;+ private final String alias;+ private final List<Criterion> restrictions = new ArrayList<>();+ private final List<Order> orders = new ArrayList<>();+ private final List<Association> associations = new ArrayList<>();+ private boolean cacheable;+ private CacheMode cacheMode;+ private String cacheRegion;++ private record Association(String path, JoinType joinType, EntityCriteria<?> criteria) implements Serializable {}++ private EntityCriteria(Class<T> entityClass, String alias) {+ this.entityClass = entityClass;+ this.alias = alias;+ }++ public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> type) {+ return of(type, null);+ }++ public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> type, String alias) {+ return new EntityCriteria<>(type, alias);+ }++ public EntityCriteria<T> add(Criterion criterion) { restrictions.add(criterion); return this; }+ public EntityCriteria<T> addOrder(Order order) { orders.add(order); return this; }+ public void setCacheable(boolean cacheable) { this.cacheable = cacheable; }+ public void setCacheMode(CacheMode cacheMode) { this.cacheMode = cacheMode; }+ public void setCacheRegion(String cacheRegion) { this.cacheRegion = cacheRegion; }+ public String getAlias() { return alias; }++ public EntityCriteria<T> createAlias(String path, String alias, JoinType joinType) {+ associations.add(new Association(path, joinType, new EntityCriteria<>(entityClass, alias)));+ return this;+ }++ public EntityCriteria<T> createCriteria(String path) { return createCriteria(path, JoinType.INNER); }++ public EntityCriteria<T> createCriteria(String path, JoinType joinType) {+ var child = new EntityCriteria<>(entityClass, null);+ associations.add(new Association(path, joinType, child));+ return child;+ }++ private Path<?> path(From<?, ?> from, String name, Map<String, From<?, ?>> aliases) {+ String[] parts = name.split("\\.");+ Path<?> result = aliases.getOrDefault(parts[0], from);+ int first = aliases.containsKey(parts[0]) ? 1 : 0;+ for (int i = first; i < parts.length; i++) result = result.get(parts[i]);+ return result;+ }++ private void collect(CriteriaBuilder builder, From<?, ?> from, Map<String, From<?, ?>> aliases,+ List<Predicate> predicates, List<jakarta.persistence.criteria.Order> queryOrders) {+ if (alias != null) aliases.put(alias, from);+ // Register aliases before evaluating restrictions, which may refer to them.+ Map<Association, From<?, ?>> joins = new HashMap<>();+ for (var association : associations) {+ String[] parts = association.path().split("\\.");+ From<?, ?> join = aliases.getOrDefault(parts[0], from);+ int first = aliases.containsKey(parts[0]) ? 1 : 0;+ for (int i = first; i < parts.length; i++) join = join.join(parts[i], association.joinType());+ joins.put(association, join);+ if (association.criteria().alias != null) aliases.put(association.criteria().alias, join);+ }+ Function<String, Path<?>> paths = name -> path(from, name, aliases);+ for (var restriction : restrictions) predicates.add(restriction.toPredicate(builder, paths));+ for (var order : orders) queryOrders.add(order.ascending()+ ? builder.asc(paths.apply(order.property())) : builder.desc(paths.apply(order.property())));+ for (var association : associations)+ association.criteria().collect(builder, joins.get(association), aliases, predicates, queryOrders);+ }++ private <R> Query<R> build(Session session, CriteriaQuery<R> criteria, Root<T> root, boolean count) {+ var predicates = new ArrayList<Predicate>();+ var queryOrders = new ArrayList<jakarta.persistence.criteria.Order>();+ collect(session.getCriteriaBuilder(), root, new HashMap<>(), predicates, queryOrders);+ criteria.where(predicates.toArray(Predicate[]::new));+ if (!count) criteria.orderBy(queryOrders);+ Query<R> query = session.createQuery(criteria).setCacheable(cacheable);+ if (cacheMode != null) query.setCacheMode(cacheMode);+ if (cacheRegion != null) query.setCacheRegion(cacheRegion);+ return query;+ }++ public Query<T> getExecutableCriteria(Session session) {+ var criteria = session.getCriteriaBuilder().createQuery(entityClass);+ Root<T> root = criteria.from(entityClass);+ criteria.select(root);+ return build(session, criteria, root, false);+ }++ public long count(Session session) {+ var builder = session.getCriteriaBuilder();+ var criteria = builder.createQuery(Long.class);+ Root<T> root = criteria.from(entityClass);+ criteria.select(builder.count(root));+ return build(session, criteria, root, true).getSingleResult();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/MatchMode.java b/server-core/src/main/java/io/onedev/server/persistence/dao/MatchMode.javanew file mode 100644index 0000000000..d743b0d5b0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/MatchMode.java@@ -0,0 +1,3 @@+package io.onedev.server.persistence.dao;++public enum MatchMode { EXACT, ANYWHERE }diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Order.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Order.javanew file mode 100644index 0000000000..a009e6cd8a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Order.java@@ -0,0 +1,8 @@+package io.onedev.server.persistence.dao;++import java.io.Serializable;++public record Order(String property, boolean ascending) implements Serializable {+ public static Order asc(String property) { return new Order(property, true); }+ public static Order desc(String property) { return new Order(property, false); }+}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Restrictions.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Restrictions.javanew file mode 100644index 0000000000..9abfb894d0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Restrictions.java@@ -0,0 +1,64 @@+package io.onedev.server.persistence.dao;++import java.util.Arrays;+import java.util.Collection;+import java.util.Locale;+import jakarta.persistence.criteria.Expression;++public final class Restrictions {+ private Restrictions() {}+ public static Criterion eq(String property, Object value) {+ return (builder, paths) -> builder.equal(paths.apply(property), value);+ }+ public static Criterion eqProperty(String first, String second) {+ return (builder, paths) -> builder.equal(paths.apply(first), paths.apply(second));+ }+ public static Criterion isNull(String property) {+ return (builder, paths) -> builder.isNull(paths.apply(property));+ }+ public static Criterion in(String property, Collection<?> values) {+ return (builder, paths) -> paths.apply(property).in(values);+ }+ public static Criterion in(String property, Object[] values) {+ return in(property, Arrays.asList(values));+ }+ public static Criterion not(Criterion criterion) {+ return (builder, paths) -> builder.not(criterion.toPredicate(builder, paths));+ }+ public static Criterion and(Criterion... criteria) {+ return (builder, paths) -> builder.and(Arrays.stream(criteria)+ .map(it -> it.toPredicate(builder, paths)).toArray(jakarta.persistence.criteria.Predicate[]::new));+ }+ public static Criterion or(Criterion... criteria) {+ return (builder, paths) -> builder.or(Arrays.stream(criteria)+ .map(it -> it.toPredicate(builder, paths)).toArray(jakarta.persistence.criteria.Predicate[]::new));+ }+ public static Criterion ilike(String property, String value) {+ return ilike(property, value, MatchMode.EXACT);+ }+ public static Criterion ilike(String property, String value, MatchMode mode) {+ String pattern = mode == MatchMode.ANYWHERE ? "%" + value + "%" : value;+ return (builder, paths) -> builder.like(builder.lower(paths.apply(property).as(String.class)),+ pattern.toLowerCase(Locale.ROOT));+ }++ @SuppressWarnings({"unchecked", "rawtypes"})+ public static Criterion gt(String property, Comparable<?> value) {+ return (builder, paths) -> builder.greaterThan((Expression) paths.apply(property), (Comparable) value);+ }++ @SuppressWarnings({"unchecked", "rawtypes"})+ public static Criterion ge(String property, Comparable<?> value) {+ return (builder, paths) -> builder.greaterThanOrEqualTo((Expression) paths.apply(property), (Comparable) value);+ }++ @SuppressWarnings({"unchecked", "rawtypes"})+ public static Criterion lt(String property, Comparable<?> value) {+ return (builder, paths) -> builder.lessThan((Expression) paths.apply(property), (Comparable) value);+ }++ @SuppressWarnings({"unchecked", "rawtypes"})+ public static Criterion le(String property, Comparable<?> value) {+ return (builder, paths) -> builder.lessThanOrEqualTo((Expression) paths.apply(property), (Comparable) value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/rest/AnonymousCheckFilter.java b/server-core/src/main/java/io/onedev/server/rest/AnonymousCheckFilter.javaindex 6d4a2dff1f..66ea2ad4fb 100644--- a/server-core/src/main/java/io/onedev/server/rest/AnonymousCheckFilter.java+++ b/server-core/src/main/java/io/onedev/server/rest/AnonymousCheckFilter.java@@ -2,13 +2,13 @@ package io.onedev.server.rest;import java.io.IOException;-import javax.inject.Inject;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.container.ContainerRequestContext;-import javax.ws.rs.container.ContainerRequestFilter;-import javax.ws.rs.container.ResourceInfo;-import javax.ws.rs.core.Context;-import javax.ws.rs.ext.Provider;+import jakarta.inject.Inject;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.ws.rs.container.ContainerRequestContext;+import jakarta.ws.rs.container.ContainerRequestFilter;+import jakarta.ws.rs.container.ResourceInfo;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.ext.Provider;import org.apache.shiro.authz.UnauthenticatedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/DefaultServletContainer.java b/server-core/src/main/java/io/onedev/server/rest/DefaultServletContainer.javaindex f517dec05f..109cea52dd 100644--- a/server-core/src/main/java/io/onedev/server/rest/DefaultServletContainer.java+++ b/server-core/src/main/java/io/onedev/server/rest/DefaultServletContainer.java@@ -2,11 +2,11 @@ package io.onedev.server.rest;import java.io.IOException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;import org.glassfish.jersey.server.ResourceConfig;import org.glassfish.jersey.servlet.ServletContainer;diff --git a/server-core/src/main/java/io/onedev/server/rest/EnumParamConverterProvider.java b/server-core/src/main/java/io/onedev/server/rest/EnumParamConverterProvider.javaindex f11703084b..ccb0ff6316 100644--- a/server-core/src/main/java/io/onedev/server/rest/EnumParamConverterProvider.java+++ b/server-core/src/main/java/io/onedev/server/rest/EnumParamConverterProvider.java@@ -5,12 +5,12 @@ import java.lang.reflect.Type;import java.util.Arrays;import java.util.stream.Collectors;-import javax.annotation.Priority;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.QueryParam;-import javax.ws.rs.ext.ParamConverter;-import javax.ws.rs.ext.ParamConverterProvider;-import javax.ws.rs.ext.Provider;+import jakarta.annotation.Priority;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.ext.ParamConverter;+import jakarta.ws.rs.ext.ParamConverterProvider;+import jakarta.ws.rs.ext.Provider;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/rest/JacksonContextResolver.java b/server-core/src/main/java/io/onedev/server/rest/JacksonContextResolver.javaindex ce5a19a72c..8939d4517e 100644--- a/server-core/src/main/java/io/onedev/server/rest/JacksonContextResolver.java+++ b/server-core/src/main/java/io/onedev/server/rest/JacksonContextResolver.java@@ -1,8 +1,8 @@package io.onedev.server.rest;-import javax.inject.Inject;-import javax.ws.rs.ext.ContextResolver;-import javax.ws.rs.ext.Provider;+import jakarta.inject.Inject;+import jakarta.ws.rs.ext.ContextResolver;+import jakarta.ws.rs.ext.Provider;import com.fasterxml.jackson.databind.ObjectMapper;diff --git a/server-core/src/main/java/io/onedev/server/rest/JerseyApplication.java b/server-core/src/main/java/io/onedev/server/rest/JerseyApplication.javaindex ed7f26396d..5a658b0615 100644--- a/server-core/src/main/java/io/onedev/server/rest/JerseyApplication.java+++ b/server-core/src/main/java/io/onedev/server/rest/JerseyApplication.java@@ -1,6 +1,6 @@package io.onedev.server.rest;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.glassfish.hk2.api.ServiceLocator;import org.glassfish.jersey.CommonProperties;diff --git a/server-core/src/main/java/io/onedev/server/rest/JerseyExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/JerseyExceptionMapper.javaindex 662ea5ebcd..e5784106aa 100644--- a/server-core/src/main/java/io/onedev/server/rest/JerseyExceptionMapper.java+++ b/server-core/src/main/java/io/onedev/server/rest/JerseyExceptionMapper.java@@ -1,11 +1,11 @@package io.onedev.server.rest;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.ext.ExceptionMapper;-import javax.ws.rs.ext.Provider;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.ext.ExceptionMapper;+import jakarta.ws.rs.ext.Provider;import org.eclipse.jetty.http.HttpStatus;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/rest/ParamCheckFilter.java b/server-core/src/main/java/io/onedev/server/rest/ParamCheckFilter.javaindex 0e3302756a..6a2fd7de95 100644--- a/server-core/src/main/java/io/onedev/server/rest/ParamCheckFilter.java+++ b/server-core/src/main/java/io/onedev/server/rest/ParamCheckFilter.java@@ -5,17 +5,17 @@ import java.lang.reflect.Parameter;import java.util.HashSet;import java.util.Set;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.QueryParam;-import javax.ws.rs.container.ContainerRequestContext;-import javax.ws.rs.container.ContainerRequestFilter;-import javax.ws.rs.container.ResourceInfo;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.UriInfo;-import javax.ws.rs.ext.Provider;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.container.ContainerRequestContext;+import jakarta.ws.rs.container.ContainerRequestFilter;+import jakarta.ws.rs.container.ResourceInfo;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.core.UriInfo;+import jakarta.ws.rs.ext.Provider;import io.onedev.server.rest.resource.TriggerJobResource;diff --git a/server-core/src/main/java/io/onedev/server/rest/QueryParamStringConverterProvider.java b/server-core/src/main/java/io/onedev/server/rest/QueryParamStringConverterProvider.javaindex ddd9d5e1a7..33489023a4 100644--- a/server-core/src/main/java/io/onedev/server/rest/QueryParamStringConverterProvider.java+++ b/server-core/src/main/java/io/onedev/server/rest/QueryParamStringConverterProvider.java@@ -3,10 +3,10 @@ package io.onedev.server.rest;import java.lang.annotation.Annotation;import java.lang.reflect.Type;-import javax.ws.rs.QueryParam;-import javax.ws.rs.ext.ParamConverter;-import javax.ws.rs.ext.ParamConverterProvider;-import javax.ws.rs.ext.Provider;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.ext.ParamConverter;+import jakarta.ws.rs.ext.ParamConverterProvider;+import jakarta.ws.rs.ext.Provider;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/rest/ResourceConfigProvider.java b/server-core/src/main/java/io/onedev/server/rest/ResourceConfigProvider.javaindex 083036b28e..32da9d647c 100644--- a/server-core/src/main/java/io/onedev/server/rest/ResourceConfigProvider.java+++ b/server-core/src/main/java/io/onedev/server/rest/ResourceConfigProvider.java@@ -1,6 +1,6 @@package io.onedev.server.rest;-import javax.inject.Provider;+import jakarta.inject.Provider;import org.glassfish.jersey.server.ResourceConfig;diff --git a/server-core/src/main/java/io/onedev/server/rest/ValidationConfigurationContextResolver.java b/server-core/src/main/java/io/onedev/server/rest/ValidationConfigurationContextResolver.javaindex 1b6857b59e..42e1180b6b 100644--- a/server-core/src/main/java/io/onedev/server/rest/ValidationConfigurationContextResolver.java+++ b/server-core/src/main/java/io/onedev/server/rest/ValidationConfigurationContextResolver.java@@ -1,10 +1,10 @@package io.onedev.server.rest;-import javax.validation.ValidatorFactory;-import javax.ws.rs.container.ResourceContext;-import javax.ws.rs.core.Context;-import javax.ws.rs.ext.ContextResolver;-import javax.ws.rs.ext.Provider;+import jakarta.validation.ValidatorFactory;+import jakarta.ws.rs.container.ResourceContext;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.ext.ContextResolver;+import jakarta.ws.rs.ext.Provider;import org.glassfish.jersey.server.validation.ValidationConfig;import org.glassfish.jersey.server.validation.internal.InjectingConstraintValidatorFactory;diff --git a/server-core/src/main/java/io/onedev/server/rest/ValidationExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/ValidationExceptionMapper.javaindex 500c780daf..9feef21f23 100644--- a/server-core/src/main/java/io/onedev/server/rest/ValidationExceptionMapper.java+++ b/server-core/src/main/java/io/onedev/server/rest/ValidationExceptionMapper.java@@ -1,11 +1,11 @@package io.onedev.server.rest;-import javax.annotation.Priority;-import javax.servlet.http.HttpServletResponse;-import javax.validation.ValidationException;-import javax.ws.rs.core.Response;-import javax.ws.rs.ext.ExceptionMapper;-import javax.ws.rs.ext.Provider;+import jakarta.annotation.Priority;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.validation.ValidationException;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.ext.ExceptionMapper;+import jakarta.ws.rs.ext.Provider;/*** Must have this although we have a general JerseyExceptionMapper (and in turn takes care of ValidationExceptiondiff --git a/server-core/src/main/java/io/onedev/server/rest/WebApplicationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/rest/WebApplicationExceptionHandler.javaindex 7018647ab9..19f941889b 100644--- a/server-core/src/main/java/io/onedev/server/rest/WebApplicationExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/rest/WebApplicationExceptionHandler.java@@ -5,7 +5,7 @@ import io.onedev.server.exception.HttpResponseBody;import io.onedev.server.exception.handler.AbstractExceptionHandler;import org.eclipse.jetty.http.HttpStatus;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.WebApplicationException;public class WebApplicationExceptionHandler extends AbstractExceptionHandler<WebApplicationException> {diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.javaindex 328cd0876d..660ca785df 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java@@ -4,19 +4,19 @@ import static io.onedev.server.security.SecurityUtils.canManageProject;import static io.onedev.server.security.SecurityUtils.getAuthUser;import static io.onedev.server.security.SecurityUtils.isAdministrator;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.javaindex 5b3d0974b9..63ed41f7f2 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java@@ -5,20 +5,20 @@ import static io.onedev.server.security.SecurityUtils.isAdministrator;import java.util.Collection;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.javaindex 64d0c66115..0952f9ac8e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java@@ -3,17 +3,17 @@ package io.onedev.server.rest.resource;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.javaindex 638dedf14f..1dc991b5ba 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java@@ -2,22 +2,22 @@ package io.onedev.server.rest.resource;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.service.AgentService;import io.onedev.server.service.AgentTokenService;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.javaindex c771e0d323..ecca54854d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java@@ -1,22 +1,22 @@package io.onedev.server.rest.resource;-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;-import static javax.ws.rs.core.Response.ok;+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;+import static jakarta.ws.rs.core.Response.ok;import java.io.InputStream;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.shiro.authz.UnauthorizedException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.javaindex ab455e72ba..c30f3011bb 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.javaindex f23006fb83..42f3372f9c 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;@Path("/build-labels")@Consumes(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.javaindex a6aab1861f..130f71e545 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java@@ -15,17 +15,17 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.StreamingOutput;import java.io.IOException;import java.io.OutputStream;import java.nio.ByteBuffer;import static java.nio.charset.StandardCharsets.UTF_8;-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;@Api(description="Build log stream resource is operated with build id, which is different from build number. "+ "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.javaindex 7cec8062c2..3c276b0e5e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java@@ -6,19 +6,19 @@ import java.util.Iterator;import java.util.List;import java.util.Objects;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.javaindex 658bb6d963..dbb75d1bac 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java@@ -1,15 +1,15 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.javaindex c7dac2499c..49acca1a85 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java@@ -2,19 +2,19 @@ package io.onedev.server.rest.resource;import static io.onedev.server.security.SecurityUtils.getAuthUser;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.javaindex 67535a40e6..16f39f0284 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.javaindex 4f3951b7de..f44ad72279 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java@@ -3,24 +3,24 @@ package io.onedev.server.rest.resource;import java.util.Collection;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.service.AuditService;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueAuthorizationResource.javaindex 8c8e9f6a01..e716f1b933 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueAuthorizationResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.javaindex 183771d5ef..9d0fe7f057 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java@@ -5,18 +5,18 @@ import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;import static io.onedev.server.security.SecurityUtils.getUser;import static io.onedev.server.security.SecurityUtils.isAdministrator;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.javaindex 1259405e1a..3173fead52 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java@@ -3,18 +3,18 @@ package io.onedev.server.rest.resource;import static io.onedev.server.security.SecurityUtils.canAccessIssue;import static io.onedev.server.security.SecurityUtils.canEditIssueLink;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.javaindex 0e9abaff3e..13d5a8fe5e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java@@ -12,23 +12,23 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.javaindex 358a8bc044..c70ff41cd8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.javaindex 7ee7416b6f..1712264f93 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.javaindex 21dda97ad4..dec56ed1d7 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java@@ -2,19 +2,19 @@ package io.onedev.server.rest.resource;import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.javaindex 06665ef42f..0d8e01f864 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.javaindex 3bc467d95c..90c17f0f71 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java@@ -19,15 +19,15 @@ import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.ValidationException;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.ValidationException;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import java.io.Serializable;@Path("/job-runs")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.javaindex 1baf2f7126..b7b262bf34 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java@@ -2,24 +2,24 @@ package io.onedev.server.rest.resource;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.service.AuditService;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.javaindex 4f753a9b0b..d63da4921e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.javaindex 32146b11e7..11dca41a81 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.javaindex 6eca0cca5c..6beaeafc4d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;@Api(name="Package Label")@Path("/package-labels")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.javaindex 2d81ab1797..19cb024631 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java@@ -5,18 +5,18 @@ import static java.util.stream.Collectors.toList;import java.util.Collection;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.javaindex c595843a4a..9ba052a4e3 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java@@ -1,16 +1,16 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 628acc27ee..6bb9e1d513 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@ -14,29 +14,29 @@ import java.util.List;import java.util.Objects;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.Id;-import javax.validation.Valid;-import javax.validation.Validator;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.Id;+import jakarta.validation.Valid;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.jspecify.annotations.Nullable;import com.fasterxml.jackson.annotation.JsonProperty;@@ -377,8 +377,11 @@ public class ProjectResource {@Path("/{projectId}/setting")@POSTpublic Response updateSetting(@PathParam("projectId") Long projectId, @NotNull ProjectSetting setting) {- for (var boardSpec: setting.getIssueSetting().getBoardSpecs())- boardSpec.populateEditColumns();+ var boardSpecs = setting.getIssueSetting().getBoardSpecs();+ if (boardSpecs != null) {+ for (var boardSpec: boardSpecs)+ boardSpec.populateEditColumns();+ }var violations = validator.validate(setting);if (!violations.isEmpty()) {var violation = violations.iterator().next();@@ -700,8 +703,7 @@ public class ProjectResource {private ArrayList<ContributedProjectSetting> contributedSettings = new ArrayList<>();- @Valid- public ArrayList<BranchProtection> getBranchProtections() {+ public ArrayList<@Valid BranchProtection> getBranchProtections() {return branchProtections;}@@ -709,8 +711,7 @@ public class ProjectResource {this.branchProtections = branchProtections;}- @Valid- public ArrayList<TagProtection> getTagProtections() {+ public ArrayList<@Valid TagProtection> getTagProtections() {return tagProtections;}@@ -773,8 +774,7 @@ public class ProjectResource {this.workspaceSetting = workspaceSetting;}- @Valid- public ArrayList<NamedCommitQuery> getNamedCommitQueries() {+ public ArrayList<@Valid NamedCommitQuery> getNamedCommitQueries() {return namedCommitQueries;}@@ -782,8 +782,7 @@ public class ProjectResource {this.namedCommitQueries = namedCommitQueries;}- @Valid- public ArrayList<NamedCodeCommentQuery> getNamedCodeCommentQueries() {+ public ArrayList<@Valid NamedCodeCommentQuery> getNamedCodeCommentQueries() {return namedCodeCommentQueries;}@@ -791,8 +790,7 @@ public class ProjectResource {this.namedCodeCommentQueries = namedCodeCommentQueries;}- @Valid- public ArrayList<WebHook> getWebHooks() {+ public ArrayList<@Valid WebHook> getWebHooks() {return webHooks;}@@ -800,8 +798,7 @@ public class ProjectResource {this.webHooks = webHooks;}- @Valid- public ArrayList<ContributedProjectSetting> getContributedSettings() {+ public ArrayList<@Valid ContributedProjectSetting> getContributedSettings() {return contributedSettings;}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.javaindex 9e1caac347..af1a44b42a 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java@@ -2,18 +2,18 @@ package io.onedev.server.rest.resource;import java.util.ArrayList;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.javaindex 1c94edb46e..3c75858f44 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;@Path("/pull-request-labels")@Consumes(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 370fbfc35d..657e833ba5 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -3,7 +3,7 @@ package io.onedev.server.rest.resource;import static io.onedev.server.model.PullRequestReview.Status.EXCLUDED;import static io.onedev.server.model.PullRequestReview.Status.PENDING;import static java.util.stream.Collectors.toList;-import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;+import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE;import java.io.InputStream;import java.io.Serializable;@@ -13,21 +13,21 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.javaindex faac1ba483..a3ab24e03f 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java@@ -6,12 +6,12 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;@Path("/pull-request-watches")@Consumes(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.javaindex 948933c12d..e68d0522fd 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java@@ -11,21 +11,21 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.commons.codec.binary.Base64;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.javaindex 0563e7b193..4d4be566d8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java@@ -2,26 +2,26 @@ package io.onedev.server.rest.resource;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.service.AuditService;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ServerResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ServerResource.javaindex 71f3581804..146fd0a942 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ServerResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ServerResource.java@@ -1,10 +1,10 @@package io.onedev.server.rest.resource;-import javax.inject.Singleton;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Singleton;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;import io.onedev.server.OneDev;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.javaindex 58c3498ab3..2dcb5ebe90 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java@@ -6,18 +6,18 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;@@ -263,7 +263,7 @@ public class SettingResource {@Api(order=1900)@Path("/groovy-scripts")@POST- public Response setGroovyScripts(@NotNull @Valid List<GroovyScript> groovyScripts) {+ public Response setGroovyScripts(@NotNull List<@Valid GroovyScript> groovyScripts) {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();var oldAuditContent = VersionedXmlDoc.fromBean(settingService.getGroovyScripts()).toXML();@@ -290,7 +290,7 @@ public class SettingResource {@Api(order=2100)@Path("/job-executors")@POST- public Response setJobExecutors(@NotNull @Valid List<JobExecutor> jobExecutors) {+ public Response setJobExecutors(@NotNull List<@Valid JobExecutor> jobExecutors) {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();var oldAuditContent = VersionedXmlDoc.fromBean(settingService.getJobExecutors()).toXML();@@ -415,7 +415,7 @@ public class SettingResource {@Api(order=2800)@Path("/contributed-settings")@POST- public Response setContributedSettings(@NotNull @Valid List<ContributedAdministrationSetting> contributedSettings) {+ public Response setContributedSettings(@NotNull List<@Valid ContributedAdministrationSetting> contributedSettings) {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();var oldAuditContent = getAuditContent(settingService.getContributedSettings());diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.javaindex d4bd673cb3..fbb9167012 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java@@ -4,17 +4,17 @@ import static io.onedev.server.security.SecurityUtils.getAuthUser;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/SsoProviderResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/SsoProviderResource.javaindex c087db6829..fac97c8487 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/SsoProviderResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/SsoProviderResource.java@@ -2,21 +2,21 @@ package io.onedev.server.rest.resource;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.javaindex 587ea27101..11d5b41ab8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java@@ -4,19 +4,19 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.UriInfo;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.util.ThreadContext;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.javaindex 101eee322c..0bbbf7396d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java@@ -1,17 +1,17 @@package io.onedev.server.rest.resource;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex e849458e32..4d06d0a395 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -14,25 +14,25 @@ import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.authz.UnauthenticatedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.javaindex 4d54f764c5..cd1459b2e1 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/WorkerResource.java@@ -16,25 +16,25 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.HEAD;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.POST;-import javax.ws.rs.PUT;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.HEAD;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.PUT;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.commons.lang.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.javaindex 6115bb5e99..091b5aa6fa 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java@@ -3,22 +3,22 @@ package io.onedev.server.rest.resource;import java.io.Serializable;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.NotAcceptableException;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.NotAcceptableException;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/support/FileEditRequest.java b/server-core/src/main/java/io/onedev/server/rest/resource/support/FileEditRequest.javaindex 0d6c0d57c6..d64a9f3b53 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/support/FileEditRequest.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/support/FileEditRequest.java@@ -2,7 +2,7 @@ package io.onedev.server.rest.resource.support;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;public abstract class FileEditRequest implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRun.java b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRun.javaindex 3474d82290..ccf244d94d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRun.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRun.java@@ -5,9 +5,9 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnCommit.java b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnCommit.javaindex 0606e29d5f..c9b6deb222 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnCommit.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnCommit.java@@ -1,8 +1,8 @@package io.onedev.server.rest.resource.support;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.Build;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnPullRequest.java b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnPullRequest.javaindex e8c75c6e4d..c1419df80d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/support/JobRunOnPullRequest.java@@ -1,6 +1,6 @@package io.onedev.server.rest.resource.support;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.Build;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.javaindex 0e6198e393..3cbc9061b8 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.buildmetric;import java.util.ArrayList;import java.util.List;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;public class AndBuildMetricCriteria extends BuildMetricCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.javaindex 30f1339cc2..f2cb965de4 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.javaindex cc47cbfbaa..be5c51347a 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.javaindex f5d618efa2..132e9519bd 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.javaindex b247d10176..d235a85263 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.buildmetric;import java.io.Serializable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.javaindex f1d6ce2d92..31ae66460a 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.buildmetric;import java.util.Date;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.util.QueryUtils;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.javaindex 1cec1c2113..6a6497f08f 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.javaindex df126b60b4..f821fff02d 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;public class NotBuildMetricCriteria extends BuildMetricCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.javaindex ead1f8d64b..906bfe82f0 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.buildmetric;import java.util.ArrayList;import java.util.List;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;public class OrBuildMetricCriteria extends BuildMetricCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.javaindex 13de15f55b..3e8602b009 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamEmptyCriteria.javaindex 9efbd6773d..5f3f273231 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestEmptyCriteria.javaindex 44d733b7d8..fe734c048a 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestEmptyCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.javaindex ff8b5a23fe..3b0205d465 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.buildmetric;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import io.onedev.server.model.support.BuildMetric;diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.javaindex 9158ea0bc9..b7b4bc6507 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexService.java@@ -26,8 +26,8 @@ import java.nio.charset.StandardCharsets;import java.util.List;import java.util.concurrent.atomic.AtomicReference;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.codec.digest.DigestUtils;import org.apache.commons.lang.SerializationUtils;diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.javaindex c0c42833e1..2b003b137b 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchService.java@@ -18,8 +18,8 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicReference;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.lang3.SerializationUtils;import org.apache.lucene.document.Document;diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.javaindex 4d381835b6..d9ae449955 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java@@ -39,7 +39,7 @@ public class AfterCriteria extends CommitCriteria {public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);for (String value: values) {- if (!commit.getCommitterIdent().getWhen().after(DateUtils.parseRelaxed(value)))+ if (!commit.getCommitterIdent().getWhenAsInstant().isAfter(DateUtils.parseRelaxed(value).toInstant()))return false;}return true;diff --git a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.javaindex af1875539d..334f200b73 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java@@ -39,7 +39,7 @@ public class BeforeCriteria extends CommitCriteria {public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);for (String value: values) {- if (!commit.getCommitterIdent().getWhen().before(DateUtils.parseRelaxed(value)))+ if (!commit.getCommitterIdent().getWhenAsInstant().isBefore(DateUtils.parseRelaxed(value).toInstant()))return false;}return true;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.javaindex d879e40301..89b4e60ec6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Agent;import io.onedev.server.model.AgentAttribute;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.javaindex cdd7976004..6f9f616129 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java@@ -10,11 +10,11 @@ import static io.onedev.server.util.QueryUtils.getPath;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.javaindex 0cb1488cd6..7e900302cf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.agent;import static io.onedev.server.search.entity.agent.AgentQueryLexer.Is;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Agent;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.javaindex 98ac204530..b1fb56d323 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Agent;import io.onedev.server.model.AgentAttribute;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.javaindex 49f7be638b..6e77fa6993 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.BuildService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.javaindex 0fc72fdcb9..d7346797ed 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Agent;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.javaindex e28c7cd24b..2e4cddf6a5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Agent;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.javaindex 451eb4a829..fb3b34230e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java@@ -10,11 +10,11 @@ import static io.onedev.server.util.QueryUtils.getPath;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.javaindex 29db8ef36a..bcc36b70cd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.javaindex 95f56acdb9..dd5ea4c2e0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.agent;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.AgentService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.javaindex d2b20e3f11..f27a9fe70e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Agent;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.javaindex a6b2218464..0e7446594b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.javaindex c9681cf5b3..de4420cd1a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Agent;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.javaindex 4268c0f37f..6784cbcebb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.javaindex dce60bb908..dc3d2f0575 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.agent;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Agent;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.javaindex e60293c96e..277e7b29e9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.javaindex 84173c79fe..1075892dda 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex 95cf907b89..027f24627d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.javaindex 9bf9bb4d65..c6b839b6de 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex 4bfe0dd927..78fffa70c8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.javaindex 770b7db07b..32acae99d6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.javaindex 421406eaec..c2a6f67c6d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.BuildDependence;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.javaindex c7f9cd6958..3526727f4d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.BuildDependence;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.javaindex d3e7846ac7..99fcc2d768 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.javaindex 90dbd5a1d6..88c3115d8f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.javaindex 681e231716..be00e3f3fa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 29a0612126..e12ec7548a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -6,11 +6,11 @@ import java.util.HashSet;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.javaindex d21cfbc7a6..1dee84b92a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.build;import java.util.ArrayList;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.apache.commons.lang3.math.NumberUtils;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex 06705be722..885e4706f0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.javaindex e195714ffb..e7cbf1f458 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.BuildLabel;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.javaindex dca9eaed12..26056e1462 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.build;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.javaindex f245c3fd78..67b45506b7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java@@ -3,12 +3,12 @@ package io.onedev.server.search.entity.build;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.javaindex 5081310498..0d7fb1c966 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java@@ -3,12 +3,12 @@ package io.onedev.server.search.entity.build;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.javaindex abe1da6755..5fad8dad9b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.javaindex 884b52ccb4..9e4d024c56 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.javaindex 2200d4192f..74dd6bea0e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.javaindex f83016b545..5d5b461e33 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.javaindex 4cbb71793a..eaaa8b6ecc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.javaindex 8cee0a0196..c6d63e31b5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.javaindex 810fdfec2f..f92c6ea4e0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.entityreference.BuildReference;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.javaindex f60016a136..f3f7b95de9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.javaindex 12ad75f726..3e4462c3ec 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.javaindex 8df9401a75..daac270f3c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 79aad71519..1f36c753cb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.javaindex d57b76cea5..e6f546505d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.build;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex 1dd89ca8a7..9f35054cc1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.javaindex 5316ba56ad..b45bfc3c9e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.javaindex 34c1ddcb71..222ec6b67d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.Constants;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.javaindex 1b74bb8ad7..909d7bec42 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javaindex 3c007bc919..e4ffd65d25 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.javaindex 89ea412200..2da1cd3a73 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javaindex 7cf20c022f..51146988de 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.build;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.javaindex 30dc589171..07cf4611ad 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.javaindex acba541b22..c24654c8f7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.codecomment;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex 847b3f2f82..385b27d1fc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.codecomment;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.javaindex 52c33d938f..51bb7ae05f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.codecomment;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.javaindex 3da54420ad..3de2e0f0a5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java@@ -4,11 +4,11 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.javaindex 20bf535b25..66e8a196ae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.codecomment;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.model.support.LastActivity;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.javaindex 1ebced43d0..a26c6b00b1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java@@ -2,12 +2,12 @@ package io.onedev.server.search.entity.codecomment;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.javaindex 4e52ab7587..100f71b767 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentMention;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.javaindex a093c264b6..7d1134b754 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.javaindex 66896cb3c8..701485604e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.javaindex 8c4b9fce68..165c9cefbf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java@@ -2,12 +2,12 @@ package io.onedev.server.search.entity.codecomment;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.javaindex e375551c0e..d895826dd6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.javaindex d47471eafb..5b3cfc77d3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex 3934d26e4b..60f04ca74a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java@@ -6,12 +6,12 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.javaindex ba0ec3ae72..515887c1f3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.javaindex 1ef3874067..54d8a86c0b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.codecomment;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.CodeComment;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.javaindex 5d901b3ab2..2db438fad8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.javaindex 4bbf8cbd90..eace069ee1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java@@ -4,9 +4,9 @@ import java.util.ArrayList;import java.util.List;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex ffd17e31f1..43336967c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -7,9 +7,9 @@ import java.util.List;import java.util.Map;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.javaindex 05d1d4652d..31de8c3fb9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex 8ca535748d..b1c3888818 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java@@ -6,12 +6,12 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.javaindex 6fe771519b..30c7495d76 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java@@ -2,12 +2,12 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.javaindex 29706577bf..397be2a6d7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.javaindex 4f77151e03..94b351ae14 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java@@ -3,9 +3,9 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.javaindex 266120b32d..3c1cddcf07 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.javaindex cbd539ff34..a58f92f549 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.javaindex e9737ca8aa..e8f1b5c029 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.javaindex 24f968629e..bbdc913fa9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;import java.util.Date;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.javaindex 0b1947074b..d2ea45578a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.javaindex d648b89222..c038e6ef48 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java@@ -4,11 +4,11 @@ import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;import static io.onedev.server.model.Issue.PROP_TOTAL_ESTIMATED_TIME;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.javaindex a08da5f19c..db7e51e1c2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex 6567ec2e4f..df79d82fe5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -6,12 +6,12 @@ import java.util.Map;import java.util.Set;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex b3acb0c076..976dba95d9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -9,10 +9,10 @@ import java.util.List;import java.util.Objects;import java.util.stream.Collectors;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.exception.NotAcceptableException;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex e773aed26d..2a5a9df442 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -7,10 +7,10 @@ import java.util.HashSet;import java.util.Set;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.javaindex d73c3199e5..b45daaf78b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.issue;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.javaindex 8288500273..a3be0de03d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javaindex e665fe4484..0cf17a7a0c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.javaindex 6c261fe063..41a1a85b57 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.javaindex 8f0e0504bb..8702e94c8c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.javaindex da9c8d34b6..a5087744b5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.issue;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FloatFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FloatFieldCriteria.javaindex 293de09ee4..d9bf59fccb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FloatFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FloatFieldCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.issue;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.javaindex f857d10633..fcdda31028 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java@@ -4,11 +4,11 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.javaindex 5cd06db048..271228e802 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java@@ -4,12 +4,12 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueLink;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.javaindex ccca94796b..c777cf8139 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.javaindex c1b7ffa4fb..d29fca2194 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.javaindex d676c02817..333ff3e6c4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWatch;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IntegerFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IntegerFieldCriteria.javaindex 74417b4ad3..80605a9222 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IntegerFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IntegerFieldCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.javaindex ca20dd1faa..78b0c9c93a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.javaindex cbd4a2cc84..5b597f05b7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java@@ -1,14 +1,14 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.javaindex 2d19538443..d380bc50db 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueSchedule;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.javaindex 939bdbead2..15c02036d2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationFieldCriteria.java@@ -4,9 +4,9 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.javaindex 7c5acab39c..a0487ebacd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.issue;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.support.LastActivity;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.javaindex 93069b2117..424d0e95fb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java@@ -10,14 +10,14 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.hibernate.Hibernate;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.javaindex 5d3c749d35..c00740b1d1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java@@ -2,12 +2,12 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.javaindex 920b6180e5..8a2e1c17b8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueMention;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.javaindex c4aefeaeee..4efb67d300 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.javaindex dc642f3038..0b8c192650 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java@@ -4,11 +4,11 @@ import static io.onedev.server.model.Issue.NAME_PROGRESS;import static io.onedev.server.model.Issue.PROP_PROGRESS;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.javaindex 503940a7ba..6cc1a6ee08 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.javaindex 444ffec7b2..4c2c164bea 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.javaindex 82cbdbf88d..612a394ae6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.javaindex 3b9d5cab38..ad51106814 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.entityreference.IssueReference;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferencedInCurrentBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferencedInCurrentBranchCriteria.javaindex b6d9fee918..866bb31056 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferencedInCurrentBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferencedInCurrentBranchCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.issue;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.javaindex 3b77f84bf3..7e97c1173f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.javaindex 1ae2b9a767..12a0f01616 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java@@ -4,11 +4,11 @@ import static io.onedev.server.model.Issue.NAME_SPENT_TIME;import static io.onedev.server.model.Issue.PROP_TOTAL_SPENT_TIME;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 04ea78fa9a..27b144d232 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -6,10 +6,10 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.javaindex 0119fd0402..65f4db0493 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.issue;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex 5fdb125cd1..316f6ba86d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.issue;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 096df03ebe..c63e48b3ae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.javaindex 7684750e79..722b1fdd08 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.javaindex 59666463b5..f830a7fc50 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.javaindex 44208fd095..56d20be258 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.javaindex 6e1834f277..a6e6356488 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.javaindex 602d797280..3ef4cde816 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.javaindex b6fd9ac5ed..25ca02ee76 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.javaindex 39836b94e7..df67f46d75 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.javaindex 5704dabf5f..1e9f2d872a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.javaindex ba837c39eb..23b29dc225 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.issue;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWatch;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.javaindex 660d0974ea..bf8104a4fd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Pack;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.javaindex 5a48a9dc9f..b3b8b6872e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.LabelSpec;import io.onedev.server.model.Pack;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.javaindex 71ec67e360..6ac93904d4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pack;import static io.onedev.commons.utils.match.WildcardUtils.matchString;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Pack;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.javaindex 7dda313dc6..48c9b5fa7a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.javaindex 9c1ce21208..4178ee3c87 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pack;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Pack;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.javaindex 2db6b19845..1cc742f035 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pack;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.javaindex 0387648219..858573047a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pack;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Pack;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.javaindex 895394082b..9ca8f9a11a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Pack;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.javaindex f332e8cee9..b775a11cf2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.javaindex 32fc51ae81..dde31cc230 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pack;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Pack;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.javaindex 14682b7393..09a72ee343 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pack;import static io.onedev.commons.utils.match.WildcardUtils.matchString;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Pack;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.javaindex 87e02751de..1fe5ba945b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.javaindex 20be3624e9..916b50a3c7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.javaindex e0100ca67a..0b3ce55d44 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Project;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.javaindex d2158edead..9c6b191091 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.javaindex fb555c21fd..9695039431 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java@@ -5,11 +5,11 @@ import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;import java.util.ArrayList;import java.util.List;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import org.apache.commons.lang3.math.NumberUtils;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.javaindex 9ad9d8a733..5153480250 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.ProjectService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.javaindex f2fff5a8c0..0498ce0a25 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.javaindex 99e25549ba..766dc634e5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.javaindex b3152c9a03..42c4fcfd5c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.LabelSpec;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.javaindex 1513cb5772..66aedf8bde 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.project;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Project;import io.onedev.server.model.ProjectLastActivityDate;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.javaindex 14c2b50827..29036aabfa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Project;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.javaindex 978a0c358a..b869c0ef80 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.ProjectService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.javaindex 8897a0c27c..13b03c3e0e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.javaindex a635fb5581..7ffc1c4030 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javaindex b2ea58cfa6..2583325612 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.project;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.javaindex 439bf6949b..fcb5b16d0d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.javaindex cfa6a1bd47..efc0c08801 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.javaindex 708da602b4..c8c9bbc80f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Project;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.javaindex 906f7374c2..2841b72035 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.javaindex 2295774454..1b6547152f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.project;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.OneDev;import io.onedev.server.service.ProjectService;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex e840b37b0e..612924e981 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.javaindex b63eadb65d..2746fdbb97 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.javaindex f5027a6ac5..29479c3bd8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.javaindex 2d7cb00f1b..f879063163 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAssignment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javaindex 54789dc134..e83f245777 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.javaindex e4e102bfd1..b37555cb96 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex c3382f4072..c6e1401b0c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -6,12 +6,12 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.javaindex b1de912fe8..1d5aca9c9b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.javaindex 974a80b90e..146cc6b775 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.javaindex 9f7c2d9792..d15e95a09a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.javaindex 3c2458a20f..eaec18390a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex 1cc3a79ccb..a542220673 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequest.Status;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.javaindex 2ed4cb26c8..8a6e9061b7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.javaindex 52066a4c09..0b4d136bbf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java@@ -4,11 +4,11 @@ import java.util.ArrayList;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex 81d07074b2..b593a6c733 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex 3d446b32fb..47a9283dde 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.javaindex 5fd1ca7bfe..bd483eb8ce 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.javaindex 7e9e0a15c2..232e219422 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.javaindex 5b11364d7d..c12d60a5a9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.javaindex fd47ae6cda..1baaf66e3c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredByMe;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.javaindex 5e64d75c06..8904e0a258 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java@@ -3,12 +3,12 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredBy;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestWatch;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex 30725b7c1f..26589b7221 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Collection;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 68e71c71be..514bc3af56 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -4,10 +4,10 @@ import java.util.Collection;import java.util.HashSet;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.javaindex f0694af671..f21e511784 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.LabelSpec;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.javaindex 6f32306a4c..69ef1b7ba5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.LastActivity;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.javaindex 84dc6062d3..e7640d5803 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.javaindex 11ed1bf388..d2a4061c60 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestMention;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.javaindex 6e0dcf3e5b..05dc0860a3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.javaindex c92ff2597e..529aa6f698 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequest.Status;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.javaindex 5c99799d42..4a97fa62ea 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.javaindex 903c84661f..e58d455585 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.javaindex c483dbb158..0f5701cbb2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.javaindex 559e0b1e1d..c23507ce48 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequest.Status;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.javaindex cbbd992ba0..0634709891 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.javaindex a703bd952d..57d0c10a51 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.entityreference.PullRequestReference;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 2182147320..e198084767 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.javaindex 2005db0d7b..bccd9a6c81 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.javaindex e8f2e05625..bebdce1029 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex a714105eec..08e90134e9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.javaindex 953aeae9b5..515cf37a2e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.javaindex a4f2db1ca9..d5bed021ca 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.javaindex 225b6225a3..d138eb20e6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex d8e2872ada..7498cb628c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.javaindex dae269d5bb..7e6e512934 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.javaindex 1551b98451..656a65ddc1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.javaindex 5825d3b3d0..a83488bb8f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.javaindex cfcaf40f01..3a83ac8150 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.javaindex bd70730f0a..ba2b2f36a3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.javaindex 220e52c679..dc960405d4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.javaindex 2b24b392bc..432c9bbe1e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.javaindex 6fbda84e8a..53b65da6d2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Expression;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.javaindex b011530892..38d8ba26aa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.javaindex b6664e4dde..5bd7da7421 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.javaindex 7c9d3783b1..e34dee1313 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.javaindex d57cdc8f67..a73401ddfd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex f32dd5b260..8f9f2d188d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.javaindex 45909e7843..09ad53dd0e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.pullrequest;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.javaindex 76027db9f8..0ff7b66ab7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.javaindex c5e6a765fa..fa7d2da410 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java@@ -3,12 +3,12 @@ package io.onedev.server.search.entity.pullrequest;import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedBy;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestWatch;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.javaindex 0629384a9a..5b452256ec 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.workspace;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Workspace;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.javaindex 2fdc3e7fc5..93eee8b754 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchCriteria.java@@ -1,13 +1,13 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchEmptyCriteria.javaindex 1c7df90e7e..72b9ff0902 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/BranchEmptyCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Workspace;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CommitCriteria.javaindex 3cb22adecc..48fe4aba46 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CommitCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.javaindex 76e0ee2763..c2c47a6d2d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.workspace;import java.util.Date;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Workspace;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.javaindex 9b78b842f9..ef59c15eb7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.workspace;import static io.onedev.server.web.translation.Translation._T;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByUserCriteria.javaindex ede8f9dd0a..d2b6a86652 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByUserCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByUserCriteria.java@@ -3,11 +3,11 @@ package io.onedev.server.search.entity.workspace;import java.util.Objects;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Workspace;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/FuzzyCriteria.javaindex 75e948838b..82ca6a6f8c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/FuzzyCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.javaindex f2d190a40d..ecb21218d1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.javaindex b5f45acb24..7f076a95d7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueEmptyCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/NumberCriteria.javaindex a77ec43fd0..a205625480 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/NumberCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ProjectCriteria.javaindex 568f3ff445..c8433b59a4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ProjectCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.javaindex ac9a3233a9..5bf9877a4d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.javaindex c1b744648c..15d931136b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestEmptyCriteria.java@@ -1,9 +1,9 @@package io.onedev.server.search.entity.workspace;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/RanOnCriteria.javaindex 693d512206..190ff8c648 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/RanOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/RanOnCriteria.java@@ -1,12 +1,12 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ReferenceCriteria.javaindex 80fe071c46..5da1717c5c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ReferenceCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ReferenceCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.entityreference.WorkspaceReference;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/SpecCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/SpecCriteria.javaindex f6bf147839..7ddbbe8bcc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/SpecCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/SpecCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Workspace;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/StatusCriteria.javaindex 7ef6d965e8..676b91dd3a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/StatusCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/StatusCriteria.java@@ -1,11 +1,11 @@package io.onedev.server.search.entity.workspace;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Workspace;import io.onedev.server.util.ProjectScope;diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.javaindex 29b58f7def..ddb393990d 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextService.java@@ -14,8 +14,8 @@ import java.util.Map;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.javaindex 5bcd51d3a7..7e2272e023 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextService.java@@ -16,8 +16,8 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.javaindex 8cb9ed0224..c7778bd4de 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextService.java@@ -15,8 +15,8 @@ import java.util.Map;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.javaindex 67bb68e567..7699a8ace0 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextService.java@@ -22,7 +22,7 @@ import java.util.Map;import java.util.function.Function;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.CharArraySet;diff --git a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.javaindex 544ba9fac6..b267fb75db 100644--- a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java@@ -1,14 +1,14 @@package io.onedev.server.security;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.core.HttpHeaders;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.ws.rs.core.HttpHeaders;import org.apache.shiro.authc.UsernamePasswordToken;-import org.apache.shiro.codec.Base64;+import org.apache.shiro.lang.codec.Base64;import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;import org.apache.shiro.web.util.WebUtils;diff --git a/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java b/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.javaindex 4035974dfe..5fee44a33b 100644--- a/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java@@ -14,12 +14,12 @@ import org.apache.shiro.util.ThreadContext;import java.io.IOException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletRequest;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletRequest;@Singletonpublic class BearerAuthenticationFilter extends ExceptionHandleFilter {diff --git a/server-core/src/main/java/io/onedev/server/security/CodePullAuthorizationSource.java b/server-core/src/main/java/io/onedev/server/security/CodePullAuthorizationSource.javaindex 3efa04e83b..8d27661821 100644--- a/server-core/src/main/java/io/onedev/server/security/CodePullAuthorizationSource.java+++ b/server-core/src/main/java/io/onedev/server/security/CodePullAuthorizationSource.java@@ -1,6 +1,6 @@package io.onedev.server.security;-import javax.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletRequest;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/security/CorsFilter.java b/server-core/src/main/java/io/onedev/server/security/CorsFilter.javaindex 096752c21f..881f4f6493 100644--- a/server-core/src/main/java/io/onedev/server/security/CorsFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/CorsFilter.java@@ -2,11 +2,11 @@ package io.onedev.server.security;import io.onedev.server.service.SettingService;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.*;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.*;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import java.io.IOException;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.javaindex 632737bffd..c206fd0f58 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java@@ -9,8 +9,8 @@ import java.io.Serializable;import java.text.MessageFormat;import java.util.HashSet;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.AuthenticationInfo;diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.javaindex 6737dc66a5..f2e434b959 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java@@ -10,8 +10,8 @@ import java.util.HashMap;import java.util.HashSet;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.AuthenticationInfo;diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultFilterChainResolver.java b/server-core/src/main/java/io/onedev/server/security/DefaultFilterChainResolver.javaindex 55f4db2f1a..a7939e755c 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultFilterChainResolver.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultFilterChainResolver.java@@ -2,8 +2,8 @@ package io.onedev.server.security;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import io.onedev.server.pack.PackFilter;import org.apache.shiro.web.filter.mgt.FilterChainManager;diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java b/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.javaindex a2164268ff..da9384e2a3 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultPasswordService.java@@ -3,7 +3,7 @@ package io.onedev.server.security;import io.onedev.commons.utils.StringUtils;import org.apache.shiro.authc.credential.PasswordService;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import java.util.regex.Pattern;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java b/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.javaindex a94c3b9f22..00866582b9 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java@@ -4,7 +4,7 @@ import io.onedev.server.util.CryptoUtils;import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.web.mgt.CookieRememberMeManager;-import javax.inject.Singleton;+import jakarta.inject.Singleton;@Singletonpublic class DefaultRememberMeManager extends CookieRememberMeManager {@@ -20,11 +20,12 @@ public class DefaultRememberMeManager extends CookieRememberMeManager {}@Override- protected PrincipalCollection deserialize(byte[] serializedIdentity) {- PrincipalCollection principals = super.deserialize(serializedIdentity);+ protected RememberedIdentity deserialize(byte[] serializedIdentity) {+ RememberedIdentity identity = super.deserialize(serializedIdentity);+ PrincipalCollection principals = identity != null ? identity.principals() : null;if (principals != null && principals.getPrimaryPrincipal() instanceof String) {if (SecurityUtils.getAuthUser((String) principals.getPrimaryPrincipal()) != null)- return principals;+ return identity;elsereturn null;} else {diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultShiroFilterConfiguration.java b/server-core/src/main/java/io/onedev/server/security/DefaultShiroFilterConfiguration.javaindex e3e1808780..b4f721507a 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultShiroFilterConfiguration.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultShiroFilterConfiguration.java@@ -1,6 +1,6 @@package io.onedev.server.security;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.apache.shiro.web.config.ShiroFilterConfiguration;diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultWebEnvironment.java b/server-core/src/main/java/io/onedev/server/security/DefaultWebEnvironment.javaindex c1bce8586f..b81ab831fd 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultWebEnvironment.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultWebEnvironment.java@@ -1,7 +1,7 @@package io.onedev.server.security;-import org.apache.shiro.ShiroException;-import org.apache.shiro.util.Initializable;+import org.apache.shiro.lang.ShiroException;+import org.apache.shiro.lang.util.Initializable;import org.apache.shiro.web.config.ShiroFilterConfiguration;import org.apache.shiro.web.filter.mgt.FilterChainResolver;import org.apache.shiro.web.mgt.WebSecurityManager;diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultWebSecurityManager.java b/server-core/src/main/java/io/onedev/server/security/DefaultWebSecurityManager.javaindex 7c02fb2ecc..f40cd93c81 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultWebSecurityManager.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultWebSecurityManager.java@@ -12,10 +12,10 @@ import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;import org.apache.shiro.web.subject.WebSubjectContext;import org.apache.shiro.web.subject.support.WebDelegatingSubject;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;import java.util.Collection;import java.util.Set;diff --git a/server-core/src/main/java/io/onedev/server/security/ExceptionHandleFilter.java b/server-core/src/main/java/io/onedev/server/security/ExceptionHandleFilter.javaindex 486df2e0f7..17c61ed2b7 100644--- a/server-core/src/main/java/io/onedev/server/security/ExceptionHandleFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/ExceptionHandleFilter.java@@ -6,13 +6,13 @@ import org.apache.shiro.web.util.WebUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletResponse;import java.io.IOException;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;public abstract class ExceptionHandleFilter extends PathMatchingFilter {diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex f5da706bc0..8841c21f16 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -11,13 +11,13 @@ import java.util.HashSet;import java.util.Map;import java.util.concurrent.Callable;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.core.HttpHeaders;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.ws.rs.core.HttpHeaders;import org.apache.shiro.authz.Permission;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.SimplePrincipalCollection;+import org.apache.shiro.subject.ImmutablePrincipalCollection;import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;import org.apache.shiro.web.mgt.WebSecurityManager;@@ -99,15 +99,25 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static final String PRINCIPAL_ANONYMOUS = "anonymous";public static final PrincipalCollection PRINCIPALS_ANONYMOUS =- new SimplePrincipalCollection(PRINCIPAL_ANONYMOUS, "");+ ImmutablePrincipalCollection.ofSinglePrincipal(PRINCIPAL_ANONYMOUS, "");+ public static Subject getSubject() {+ Subject subject = ThreadContext.getSubject();+ if (subject == null) {+ // Shiro 3 no longer installs a VM-global security manager for web applications.+ subject = asAnonymous();+ ThreadContext.bind(subject);+ }+ return subject;+ }+public static void checkPermission(Permission permission) {if (!getSubject().isPermitted(permission))throw new UnauthorizedException();}public static PrincipalCollection asPrincipals(String principal) {- return new SimplePrincipalCollection(principal, "");+ return ImmutablePrincipalCollection.ofSinglePrincipal(principal, "");}public static Subject asSubject(PrincipalCollection principals) {diff --git a/server-core/src/main/java/io/onedev/server/service/EntityService.java b/server-core/src/main/java/io/onedev/server/service/EntityService.javaindex ced3fdb47b..4d4d0a35b0 100644--- a/server-core/src/main/java/io/onedev/server/service/EntityService.java+++ b/server-core/src/main/java/io/onedev/server/service/EntityService.java@@ -4,7 +4,6 @@ import java.util.List;import io.onedev.server.persistence.dao.EntityCriteria;import org.hibernate.HibernateException;-import org.hibernate.criterion.DetachedCriteria;import io.onedev.server.model.AbstractEntity;@@ -45,7 +44,7 @@ public interface EntityService<T extends AbstractEntity> {* Query with specified criteria.** @param criteria- * hibernate {@link DetachedCriteria}+ * hibernate {@link io.onedev.server.persistence.dao.EntityCriteria}* @param firstResult* first result of the query. Set to 0 if this value should be ignored* @param maxResults@@ -80,7 +79,7 @@ public interface EntityService<T extends AbstractEntity> {* Count entities of specified class matching specified criteria.** @return- * number of entities matching specified {@link DetachedCriteria}+ * number of entities matching specified {@link io.onedev.server.persistence.dao.EntityCriteria}*/int count(EntityCriteria<T> entityCriteria);diff --git a/server-core/src/main/java/io/onedev/server/service/IssueService.java b/server-core/src/main/java/io/onedev/server/service/IssueService.javaindex e544998348..2812091016 100644--- a/server-core/src/main/java/io/onedev/server/service/IssueService.java+++ b/server-core/src/main/java/io/onedev/server/service/IssueService.java@@ -6,10 +6,10 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.apache.shiro.subject.Subject;@@ -55,8 +55,8 @@ public interface IssueService extends EntityService<Issue> {@Nullable Criteria<Issue> criteria, CriteriaQuery<?> query, CriteriaBuilder builder,From<Issue, Issue> issue);- List<javax.persistence.criteria.Order> buildOrders(EntityQuery<Issue> query, CriteriaBuilder builder,- From<Issue, Issue> issue, List<javax.persistence.criteria.Order> preferOrders);+ List<jakarta.persistence.criteria.Order> buildOrders(EntityQuery<Issue> query, CriteriaBuilder builder,+ From<Issue, Issue> issue, List<jakarta.persistence.criteria.Order> preferOrders);List<Issue> query(Subject subject, @Nullable ProjectScope projectScope, EntityQuery<Issue> query,boolean loadExtraInfo, int firstResult, int maxResults);diff --git a/server-core/src/main/java/io/onedev/server/service/ProjectService.java b/server-core/src/main/java/io/onedev/server/service/ProjectService.javaindex d2ca2efebb..ad5ed3ea9c 100644--- a/server-core/src/main/java/io/onedev/server/service/ProjectService.java+++ b/server-core/src/main/java/io/onedev/server/service/ProjectService.java@@ -9,9 +9,9 @@ import java.util.concurrent.Future;import java.util.function.Consumer;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.javaindex 211e5d6319..fc3e39a9dc 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.LabelSpec;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityService.java b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityService.javaindex 08296b5467..9ba6503cf3 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityService.java@@ -10,7 +10,7 @@ import org.hibernate.Session;import io.onedev.server.model.AbstractEntity;import io.onedev.server.util.ReflectionUtils;-import javax.inject.Inject;+import jakarta.inject.Inject;public abstract class BaseEntityService<T extends AbstractEntity> implements EntityService<T> {diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenAuthorizationService.javaindex 5c510e0087..87b6264719 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenAuthorizationService.java@@ -2,7 +2,7 @@ package io.onedev.server.service.impl;import java.util.Collection;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.AccessToken;import io.onedev.server.model.AccessTokenAuthorization;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenService.javaindex 0be3ade1cb..dbdfecdb1b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAccessTokenService.java@@ -3,8 +3,8 @@ package io.onedev.server.service.impl;import java.util.concurrent.Callable;import java.util.concurrent.TimeUnit;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.shiro.authc.DisabledAccountException;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentAttributeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentAttributeService.javaindex d9e7a94548..7b7ee3ec98 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentAttributeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentAttributeService.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.Iterator;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.hibernate.query.Query;import org.slf4j.Logger;@@ -43,9 +43,9 @@ public class DefaultAgentAttributeService extends BaseEntityService<AgentAttribuvar hazelcastInstance = clusterService.getHazelcastInstance();attributeNames = hazelcastInstance.getMap("agentAttributeNames");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("agentAttributeCacheInited");+ var cacheInited = clusterService.getAtomicLong("agentAttributeCacheInited");clusterService.initWithLead(cacheInited, () -> {- Query<?> query = dao.getSession().createQuery("select name from AgentAttribute");+ Query<?> query = dao.getSession().createQuery("select name from AgentAttribute", String.class);for (Object name: query.list())attributeNames.put((String) name, (String) name);return 1L;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.javaindex 2a04cd554d..acc488965e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java@@ -16,16 +16,16 @@ import java.util.Properties;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeoutException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.Strings;import org.eclipse.jetty.websocket.api.Session;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;@@ -127,11 +127,10 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements AgeosNames = hazelcastInstance.getMap("agentOsNames");osArchs = hazelcastInstance.getMap("agentOsArchs");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("agentCacheInited");+ var cacheInited = clusterService.getAtomicLong("agentCacheInited");clusterService.initWithLead(cacheInited, () -> {- @SuppressWarnings("unchecked")Query<Object[]> query = dao.getSession().createQuery(String.format("select %s, %s from Agent",- Agent.PROP_OS_NAME, Agent.PROP_OS_ARCH));+ Agent.PROP_OS_NAME, Agent.PROP_OS_ARCH), Object[].class);for (Object[] row: query.list()) {osNames.put((String) row[0], (String) row[0]);osArchs.put((String) row[1], (String) row[1]);@@ -220,7 +219,7 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Ageif (prevSession != null) {try {prevSession.disconnect();- } catch (IOException ignored) {+ } catch (RuntimeException ignored) {}}@@ -240,7 +239,7 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Age}private void removeReferences(Agent agent) {- Query<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");+ var query = getSession().createMutationQuery("update Build set agent=null where agent=:agent");query.setParameter("agent", agent);query.executeUpdate();}@@ -299,7 +298,7 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Ageif (query.getCriteria() != null)criteriaQuery.where(query.getCriteria().getPredicate(null, criteriaQuery, root, builder));- List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: query.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentTokenService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentTokenService.javaindex 1c8e80d416..bf1cf498e7 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentTokenService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentTokenService.java@@ -4,10 +4,10 @@ import static java.util.stream.Collectors.toSet;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.Agent;import io.onedev.server.model.AgentToken;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAlertService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAlertService.javaindex 3fe436c47e..95e13d1e8a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAlertService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAlertService.java@@ -7,10 +7,10 @@ import java.util.Date;import java.util.HashMap;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.collect.Sets;@@ -145,7 +145,7 @@ public class DefaultAlertService extends BaseEntityService<Alert> implements Ale@Transactional@Overridepublic void clear() {- var query = getSession().createQuery("delete from Alert");+ var query = getSession().createMutationQuery("delete from Alert");query.executeUpdate();webSocketService.notifyObservablesChange(Sets.newHashSet(Alert.getChangeObservable()), WicketUtils.getPageKey());}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBaseAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBaseAuthorizationService.javaindex d192071ca4..5c75189e2b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBaseAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBaseAuthorizationService.java@@ -3,7 +3,7 @@ package io.onedev.server.service.impl;import java.util.Collection;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.javaindex 2c963985b7..db65e043c3 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java@@ -3,9 +3,9 @@ package io.onedev.server.service.impl;import java.util.ArrayList;import java.util.List;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.javaindex bd270b106b..6291078715 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildMetricService.java@@ -19,21 +19,21 @@ import java.util.Map;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.EntityManagerFactory;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Selection;-import javax.persistence.metamodel.EntityType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.EntityManagerFactory;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Selection;+import jakarta.persistence.metamodel.EntityType;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -144,7 +144,7 @@ public class DefaultBuildMetricService implements BuildMetricService {selections.add(buildJoin.get(PROP_FINISH_TIME_GROUPS).get(PROP_DAY));- criteriaQuery.multiselect(selections);+ criteriaQuery.select(builder.array(selections.toArray(Selection<?>[]::new)));Map<Integer, T> metrics = new HashMap<>();@@ -172,7 +172,7 @@ public class DefaultBuildMetricService implements BuildMetricService {var hazelcastInstance = clusterService.getHazelcastInstance();reportNames = hazelcastInstance.getMap("buildReportNames");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("buildMetricCacheInited");+ var cacheInited = clusterService.getAtomicLong("buildMetricCacheInited");clusterService.initWithLead(cacheInited, () -> {EntityManagerFactory emf = dao.getSession().getEntityManagerFactory();for (EntityType<?> entityType: emf.getMetamodel().getEntities()) {@@ -180,7 +180,7 @@ public class DefaultBuildMetricService implements BuildMetricService {if (BuildMetric.class.isAssignableFrom(entityClass)) {String queryString = String.format("select build.%s.id, build.%s, metric.%s from %s metric inner join metric.%s build",PROP_PROJECT, PROP_JOB_NAME, PROP_REPORT, entityClass.getSimpleName(), PROP_BUILD);- Query<?> query = dao.getSession().createQuery(queryString);+ Query<?> query = dao.getSession().createQuery(queryString, Object[].class);for (Object[] fields: (List<Object[]>)query.list())populateReportNames(new Key((Long)fields[0], entityClass), (String)fields[1], (String)fields[2]);}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.javaindex d821da626a..3237912123 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildParamService.java@@ -7,8 +7,8 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.hibernate.query.Query;import org.slf4j.Logger;@@ -50,14 +50,14 @@ public class DefaultBuildParamService extends BaseEntityService<BuildParam> implvar hazelcastInstance = clusterService.getHazelcastInstance();paramNames = hazelcastInstance.getMap("buildParamNames");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("buildParamCacheInited");+ var cacheInited = clusterService.getAtomicLong("buildParamCacheInited");clusterService.initWithLead(cacheInited, () -> {Map<Long, Long> projectIds = new HashMap<>();- Query<?> query = dao.getSession().createQuery("select id, project.id from Build");+ Query<?> query = dao.getSession().createQuery("select id, project.id from Build", Object[].class);for (Object[] fields: (List<Object[]>)query.list())projectIds.put((Long)fields[0], (Long)fields[1]);- query = dao.getSession().createQuery("select build.id, name from BuildParam");+ query = dao.getSession().createQuery("select build.id, name from BuildParam", Object[].class);for (Object[] fields: (List<Object[]>)query.list()) {Long projectId = projectIds.get(fields[0]);if (projectId != null)diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildQueryPersonalizationService.javaindex aa402feb6e..6f592514bb 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildQueryPersonalizationService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.BuildQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.javaindex 6b2313dba6..3aca553e7e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java@@ -1,6 +1,5 @@package io.onedev.server.service.impl;-import static com.google.common.collect.Lists.newArrayList;import static edu.emory.mathcs.backport.java.util.Collections.sort;import static io.onedev.commons.utils.LockUtils.read;import static io.onedev.commons.utils.LockUtils.write;@@ -25,7 +24,7 @@ import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static io.onedev.server.util.SiteSyncUtils.isVersionFile;import static java.lang.Long.valueOf;import static java.util.Arrays.asList;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import java.io.BufferedOutputStream;import java.io.File;@@ -50,23 +49,23 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Selection;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Selection;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.commons.lang3.tuple.ImmutablePair;import org.apache.commons.lang3.tuple.Pair;@@ -74,11 +73,11 @@ import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.glassfish.jersey.client.ClientProperties;import org.hibernate.Session;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;+import org.hibernate.query.sqm.tree.domain.SqmPath;import org.jspecify.annotations.Nullable;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;@@ -387,7 +386,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui@Overridepublic Map<Long, Long> queryUnfinished() {Query<?> query = getSession().createQuery("select id, project.id from Build where "- + "status=:waiting or status=:pending or status=:running");+ + "status=:waiting or status=:pending or status=:running", Object[].class);query.setParameter("waiting", Build.Status.WAITING);query.setParameter("pending", Build.Status.PENDING);query.setParameter("running", Build.Status.RUNNING);@@ -549,7 +548,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buivar groupPath = group.getPath(root.get(PROP_FINISH_TIME_GROUPS));criteriaQuery.groupBy(groupPath);- criteriaQuery.multiselect(newArrayList(+ criteriaQuery.select(builder.array(groupPath,builder.avg(root.get(PROP_PENDING_DURATION)),builder.avg(root.get(PROP_RUNNING_DURATION))));@@ -581,7 +580,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buivar groupPath = group.getPath(root.get(PROP_FINISH_TIME_GROUPS));criteriaQuery.groupBy(groupPath);- criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));+ criteriaQuery.select(builder.array(groupPath, builder.count(root)));Map<Integer, Integer> stats = new HashMap<>();for (var result: getSession().createQuery(criteriaQuery).getResultList())@@ -665,7 +664,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui@SuppressWarnings("rawtypes")private void applyOrders(From<Build, Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,EntityQuery<Build> query) {- List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: query.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));@@ -675,8 +674,8 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buiboolean found = false;for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath- && ((SingularAttributePath) order.getExpression()).getAttribute().getName().equals(Build.PROP_SUBMIT_DATE)) {+ if (order.getExpression() instanceof SqmPath+ && ((SqmPath) order.getExpression()).getReferencedPathSource().getPathName().equals(Build.PROP_SUBMIT_DATE)) {found = true;break;}@@ -745,7 +744,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buiprivate void fillStatus(Project project, Collection<ObjectId> commitIds,Map<ObjectId, Map<String, Collection<StatusInfo>>> commitStatuses) {Query<?> query = getSession().createQuery("select commitHash, jobName, status, refName, request.id from Build "- + "where project=:project and commitHash in :commitHashes");+ + "where project=:project and commitHash in :commitHashes", Object[].class);query.setParameter("project", project);query.setParameter("commitHashes", commitIds.stream().map(it->it.name()).collect(Collectors.toList()));for (Object[] row: (List<Object[]>)query.list()) {@@ -854,9 +853,9 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buicache = hazelcastInstance.getMap("buildCache");jobNames = hazelcastInstance.getMap("jobNames");- var buildCacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("buildCacheInited");+ var buildCacheInited = clusterService.getAtomicLong("buildCacheInited");clusterService.initWithLead(buildCacheInited, () -> {- Query<?> query = dao.getSession().createQuery("select id, project.id, number, commitHash, jobName from Build");+ Query<?> query = dao.getSession().createQuery("select id, project.id, number, commitHash, jobName from Build", Object[].class);for (Object[] fields : (List<Object[]>) query.list()) {Long buildId = (Long) fields[0];Long projectId = (Long) fields[1];@@ -891,7 +890,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements BuiList<Selection<?>> selections = new ArrayList<>();for (String field: fields)selections.add(root.get(field));- query.multiselect(selections);+ query.select(builder.array(selections.toArray(Selection<?>[]::new)));return query;}@@ -1013,7 +1012,7 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui@Overridepublic Collection<Build> query(Agent agent, Status status) {EntityCriteria<Build> criteria = EntityCriteria.of(Build.class);- EntityCriteria<Build> agentCriteria = criteria.createCriteria(Build.PROP_AGENT, org.hibernate.sql.JoinType.INNER_JOIN);+ EntityCriteria<Build> agentCriteria = criteria.createCriteria(Build.PROP_AGENT, jakarta.persistence.criteria.JoinType.INNER);if (status != null)agentCriteria.add(Restrictions.eq(Build.PROP_STATUS, status));return query(criteria);@@ -1028,10 +1027,10 @@ public class DefaultBuildService extends BaseEntityService<Build> implements BuiCriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<ProjectBuildStatusStat> criteriaQuery = builder.createQuery(ProjectBuildStatusStat.class);Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(ProjectBuildStatusStat.class,root.get(Build.PROP_PROJECT).get(Project.PROP_ID),root.get(Build.PROP_STATUS),- builder.count(root));+ builder.count(root)));criteriaQuery.groupBy(root.get(Build.PROP_PROJECT), root.get(Build.PROP_STATUS));criteriaQuery.where(root.get(Build.PROP_PROJECT).in(projects));diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentMentionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentMentionService.javaindex 1e24c05962..cee3de6c9c 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentMentionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentMentionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentMention;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentQueryPersonalizationService.javaindex a731c28ee1..f9df78b22c 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentQueryPersonalizationService.java@@ -1,8 +1,8 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.CodeCommentQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentReplyService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentReplyService.javaindex bba4f4fa0a..0bee3d1574 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentReplyService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentReplyService.java@@ -4,12 +4,12 @@ import java.util.ArrayList;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.javaindex 9bb20937b2..aab6aa0e0f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java@@ -14,13 +14,13 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import org.apache.commons.lang3.time.DateUtils;import org.eclipse.jgit.lib.FileMode;@@ -28,10 +28,10 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Criterion;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;+import org.hibernate.query.sqm.tree.domain.SqmPath;import org.jspecify.annotations.Nullable;import com.google.common.base.Preconditions;@@ -182,9 +182,9 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> imDate oldestDate = null;for (RevCommit commit: historyCommits) {PersonIdent committer = commit.getCommitterIdent();- if (committer != null && committer.getWhen() != null- && (oldestDate == null || committer.getWhen().before(oldestDate))) {- oldestDate = committer.getWhen();+ if (committer != null+ && (oldestDate == null || Date.from(committer.getWhenAsInstant()).before(oldestDate))) {+ oldestDate = Date.from(committer.getWhenAsInstant());}}@@ -263,7 +263,7 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> imquery.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));- List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: commentQuery.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));@@ -276,11 +276,11 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> imvar found = false;for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath) {- var expr = (SingularAttributePath) order.getExpression();- if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)- && expr.getPathSource() instanceof SingularAttributePath- && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(CodeComment.PROP_LAST_ACTIVITY)) {+ if (order.getExpression() instanceof SqmPath) {+ var expr = (SqmPath) order.getExpression();+ if (expr.getReferencedPathSource().getPathName().equals(LastActivity.PROP_DATE)+ && expr.getLhs() instanceof SqmPath+ && ((SqmPath) expr.getLhs()).getReferencedPathSource().getPathName().equals(CodeComment.PROP_LAST_ACTIVITY)) {found = true;break;}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentStatusChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentStatusChangeService.javaindex 343270f8be..caea04ed2f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentStatusChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentStatusChangeService.java@@ -5,12 +5,12 @@ import java.util.Collection;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentTouchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentTouchService.javaindex d6cb8e6ba6..d817a8971d 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentTouchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentTouchService.java@@ -5,10 +5,10 @@ import static java.lang.String.format;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.service.CodeCommentTouchService;import io.onedev.server.service.ProjectService;@@ -50,7 +50,7 @@ public class DefaultCodeCommentTouchService extends BaseEntityService<CodeCommentransactionService.runAfterCommit(() -> transactionService.runAsync(() -> {var innerProject = projectService.load(projectId);if (!newComment) {- var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));+ var query = getSession().createMutationQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));query.setParameter("project", innerProject);query.setParameter(PROP_COMMENT_ID, commentId);query.executeUpdate();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCommitQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCommitQueryPersonalizationService.javaindex e9bb9ed44d..4a6985819b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCommitQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCommitQueryPersonalizationService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.CommitQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardGroupShareService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardGroupShareService.javaindex 74d47e05ea..d362b1af3d 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardGroupShareService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardGroupShareService.java@@ -5,8 +5,8 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardService.javaindex f07ec166da..340092d8fc 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardService.java@@ -9,12 +9,12 @@ import io.onedev.server.model.*;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.EntityCriteria;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.*;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.*;import java.util.ArrayList;import java.util.Collection;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardUserShareService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardUserShareService.javaindex 7fa7757654..ee15bf2add 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardUserShareService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardUserShareService.java@@ -5,8 +5,8 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardVisitService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardVisitService.javaindex 723b26b7ab..caf7001610 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardVisitService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultDashboardVisitService.java@@ -2,7 +2,7 @@ package io.onedev.server.service.impl;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.DashboardVisit;import io.onedev.server.persistence.annotation.Transactional;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.javaindex 7b7401617a..44d2bb4077 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java@@ -4,8 +4,8 @@ import java.util.Arrays;import java.util.HashMap;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.eclipse.jgit.lib.PersonIdent;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.javaindex 99aeb4b36f..143a14628f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGitLfsLockService.java@@ -1,8 +1,8 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGpgKeyService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGpgKeyService.javaindex 1fe25be68d..fc84ffe363 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGpgKeyService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGpgKeyService.java@@ -6,8 +6,8 @@ import java.util.LinkedHashSet;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.bouncycastle.openpgp.PGPPublicKey;@@ -48,7 +48,7 @@ public class DefaultGpgKeyService extends BaseEntityService<GpgKey> implements Gpublic void on(SystemStarting event) {var hazelcastInstance = clusterService.getHazelcastInstance();entityIds = hazelcastInstance.getMap("gpgKeyEntityIds");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("gpgKeyCacheInited");+ var cacheInited = clusterService.getAtomicLong("gpgKeyCacheInited");clusterService.initWithLead(cacheInited, () -> {for (GpgKey key: query()) {for (Long keyId: key.getKeyIds())diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupAuthorizationService.javaindex 42225cee53..6ebccda7cc 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupAuthorizationService.java@@ -3,7 +3,7 @@ package io.onedev.server.service.impl;import java.util.Collection;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupEntitlementService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupEntitlementService.javaindex 6686eed1b1..67f493e976 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupEntitlementService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupEntitlementService.java@@ -4,7 +4,7 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.javaindex e314821072..73e511eaa4 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultGroupService.java@@ -1,16 +1,16 @@package io.onedev.server.service.impl;-import static org.hibernate.criterion.Restrictions.eq;+import static io.onedev.server.persistence.dao.Restrictions.eq;import java.util.List;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;import com.hazelcast.core.HazelcastInstance;@@ -114,7 +114,7 @@ public class DefaultGroupService extends BaseEntityService<Group> implements Grousage.add(settingService.onDeleteGroup(group.getName()));usage.checkInUse("Group '" + group.getName() + "'");- var query = getSession().createQuery("update SsoProvider set defaultGroup=null where defaultGroup=:group");+ var query = getSession().createMutationQuery("update SsoProvider set defaultGroup=null where defaultGroup=:group");query.setParameter("group", group);query.executeUpdate();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.javaindex ea271f5d19..2c64a9201b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java@@ -4,7 +4,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.hibernate.query.Query;@@ -54,12 +54,11 @@ public class DefaultIssueAuthorizationService extends BaseEntityService<IssueAutdao.persist(authorization);}- @SuppressWarnings("unchecked")@Sessional@Overridepublic Set<Long> getAuthorizedIssueIds(User user) {Query<Long> query = getSession().createQuery(- "select issue.id from IssueAuthorization where user=:user");+ "select issue.id from IssueAuthorization where user=:user", Long.class);query.setParameter("user", user);return new HashSet<>(query.list());}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.javaindex a7a0b7989f..8d909275f1 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueChangeService.java@@ -14,12 +14,12 @@ import java.util.Map;import java.util.Objects;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.Constants;@@ -28,8 +28,8 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.joda.time.DateTime;import org.jspecify.annotations.Nullable;import org.quartz.CronScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentReactionService.javaindex 1060130c72..0d2904f452 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentReactionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentReactionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentService.javaindex cae1aff52e..282339340e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueCommentService.java@@ -5,14 +5,14 @@ import java.util.Collection;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;--import org.hibernate.criterion.Restrictions;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;++import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueFieldService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueFieldService.javaindex 1232242b43..7f59e49f93 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueFieldService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueFieldService.java@@ -4,11 +4,10 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import javax.inject.Singleton;-import javax.persistence.Query;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;@@ -31,12 +30,12 @@ public class DefaultIssueFieldService extends BaseEntityService<IssueField> implids.add(field.getId());}if (!ids.isEmpty()) {- Query query = getSession().createQuery("delete from IssueField where issue = :issue and id not in (:ids)");+ var query = getSession().createMutationQuery("delete from IssueField where issue = :issue and id not in (:ids)");query.setParameter("issue", issue);query.setParameter("ids", ids);query.executeUpdate();} else {- Query query = getSession().createQuery("delete from IssueField where issue = :issue");+ var query = getSession().createMutationQuery("delete from IssueField where issue = :issue");query.setParameter("issue", issue);query.executeUpdate();}@@ -57,7 +56,7 @@ public class DefaultIssueFieldService extends BaseEntityService<IssueField> impl@Transactional@Overridepublic void onRenameGroup(String oldName, String newName) {- Query query = getSession().createQuery("update IssueField set value=:newName where type=:type and value=:oldName");+ var query = getSession().createMutationQuery("update IssueField set value=:newName where type=:type and value=:oldName");query.setParameter("type", FieldSpec.GROUP);query.setParameter("oldName", oldName);query.setParameter("newName", newName);@@ -67,7 +66,7 @@ public class DefaultIssueFieldService extends BaseEntityService<IssueField> impl@Transactional@Overridepublic void onRenameUser(String oldName, String newName) {- Query query = getSession().createQuery("update IssueField set value=:newName where type=:type and value=:oldName");+ var query = getSession().createMutationQuery("update IssueField set value=:newName where type=:type and value=:oldName");query.setParameter("type", FieldSpec.USER);query.setParameter("oldName", oldName);query.setParameter("newName", newName);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.javaindex a31ca457bc..a53c3b315b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java@@ -6,11 +6,11 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import org.hibernate.Hibernate;import org.hibernate.query.Query;@@ -134,7 +134,7 @@ public class DefaultIssueLinkService extends BaseEntityService<IssueLink> implemCriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);Root<IssueLink> root = criteriaQuery.from(IssueLink.class);- criteriaQuery.multiselect(root, root.get(IssueLink.PROP_SOURCE), root.get(IssueLink.PROP_TARGET));+ criteriaQuery.select(builder.array(root, root.get(IssueLink.PROP_SOURCE), root.get(IssueLink.PROP_TARGET)));criteriaQuery.where(builder.or(builder.equal(root.get(IssueLink.PROP_SOURCE), issue),diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueMentionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueMentionService.javaindex 38af39b078..af65daecfe 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueMentionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueMentionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueMention;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueQueryPersonalizationService.javaindex b96f58db9d..a0a33028a1 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueQueryPersonalizationService.java@@ -7,11 +7,11 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.IssueQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.javaindex 7ba76c733f..7d520a70d3 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueScheduleService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueScheduleService.javaindex 58b8d86177..94743cdfab 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueScheduleService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueScheduleService.java@@ -4,10 +4,10 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Iterator;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.javaindex 94d1a9bba4..006b100f72 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java@@ -19,27 +19,28 @@ import java.util.List;import java.util.Map;import java.util.UUID;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;+import org.hibernate.query.MutationQuery;+import org.hibernate.query.sqm.tree.domain.SqmPath;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -203,9 +204,9 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssHazelcastInstance hazelcastInstance = clusterService.getHazelcastInstance();idCache = hazelcastInstance.getMap("issueIds");- var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("issueCacheInited");+ var cacheInited = clusterService.getAtomicLong("issueCacheInited");clusterService.initWithLead(cacheInited, () -> {- Query<?> query = dao.getSession().createQuery("select id, project.id, number from Issue");+ Query<?> query = dao.getSession().createQuery("select id, project.id, number from Issue", Object[].class);for (Object[] fields: (List<Object[]>)query.list()) {Long issueId = (Long) fields[0];Long projectId = (Long)fields[1];@@ -308,7 +309,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issdao.persist(issue);}- private javax.persistence.criteria.Order getOrder(EntitySort sort, CriteriaBuilder builder, From<Issue, Issue> issue) {+ private jakarta.persistence.criteria.Order getOrder(EntitySort sort, CriteriaBuilder builder, From<Issue, Issue> issue) {if (Issue.SORT_FIELDS.containsKey(sort.getField())) {if (sort.getDirection() == Direction.ASCENDING)return builder.asc(QueryUtils.getPath(issue, Issue.SORT_FIELDS.get(sort.getField()).getProperty()));@@ -326,10 +327,10 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss@SuppressWarnings("rawtypes")@Override- public List<javax.persistence.criteria.Order> buildOrders(EntityQuery<Issue> query, CriteriaBuilder builder,+ public List<jakarta.persistence.criteria.Order> buildOrders(EntityQuery<Issue> query, CriteriaBuilder builder,From<Issue, Issue> issue,- List<javax.persistence.criteria.Order> preferOrders) {- List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> preferOrders) {+ List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: query.getSorts())orders.add(getOrder(sort, builder, issue));@@ -341,11 +342,11 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issvar found = false;for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath) {- var expr = (SingularAttributePath) order.getExpression();- if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)- && expr.getPathSource() instanceof SingularAttributePath- && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(Issue.PROP_LAST_ACTIVITY)) {+ if (order.getExpression() instanceof SqmPath) {+ var expr = (SqmPath) order.getExpression();+ if (expr.getReferencedPathSource().getPathName().equals(LastActivity.PROP_DATE)+ && expr.getLhs() instanceof SqmPath+ && ((SqmPath) expr.getLhs()).getReferencedPathSource().getPathName().equals(Issue.PROP_LAST_ACTIVITY)) {found = true;break;}@@ -371,7 +372,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IsscriteriaQuery.where(buildPredicates(subject, projectScope, query.getCriteria(), criteriaQuery, builder, root));var criteria = query.getCriteria();- List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> preferOrders = new ArrayList<>();if (criteria != null)preferOrders.addAll(criteria.getPreferOrders(builder, root));criteriaQuery.orderBy(buildOrders(query, builder, root, preferOrders));@@ -417,9 +418,9 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IsscriteriaQuery.where(buildPredicates(subject, projectScope, criteria, criteriaQuery, builder, root));- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(IssueTimes.class,builder.sum(root.get(PROP_OWN_ESTIMATED_TIME)),- builder.sum(root.get(PROP_OWN_SPENT_TIME)));+ builder.sum(root.get(PROP_OWN_SPENT_TIME))));return getSession().createQuery(criteriaQuery).uniqueResult();}@@ -556,19 +557,18 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss}- @SuppressWarnings("unchecked")@Sessional@Overridepublic Collection<String> getUndefinedStates() {Collection<String> undefinedStates = getIssueSetting().getUndefinedStates();- Query<String> query = getSession().createQuery("select distinct state from Issue");+ Query<String> query = getSession().createQuery("select distinct state from Issue", String.class);for (String state: query.getResultList()) {if (getIssueSetting().getStateSpec(state) == null)undefinedStates.add(state);}- query = getSession().createQuery("select distinct state from IssueStateHistory");+ query = getSession().createQuery("select distinct state from IssueStateHistory", String.class);for (String state: query.getResultList()) {if (getIssueSetting().getStateSpec(state) == null)undefinedStates.add(state);@@ -603,7 +603,6 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss}}- @SuppressWarnings("unchecked")@Sessional@Overridepublic Collection<String> getUndefinedFields() {@@ -611,7 +610,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssundefinedFields.addAll(settingService.getUndefinedIssueFields());undefinedFields.addAll(roleService.getUndefinedIssueFields());- Query<String> query = getSession().createQuery("select distinct name from IssueField");+ Query<String> query = getSession().createQuery("select distinct name from IssueField", String.class);for (String fieldName: query.getResultList()) {FieldSpec field = getIssueSetting().getFieldSpec(fieldName);if (field == null)@@ -655,7 +654,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssundefinedFieldValues.addAll(settingService.getUndefinedIssueFieldValues());- Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");+ Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice", Object[].class);query.setParameter("choice", FieldSpec.ENUMERATION);for (Object[] row: (List<Object[]>)query.getResultList()) {String fieldName = (String) row[0];@@ -704,50 +703,50 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issfor (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE) {- Query<?> query = getSession().createQuery("update Issue set state=:newState, stateOrdinal=:newStateOrdinal where state=:oldState");+ var query = getSession().createMutationQuery("update Issue set state=:newState, stateOrdinal=:newStateOrdinal where state=:oldState");query.setParameter("oldState", entry.getKey());query.setParameter("newState", entry.getValue().getNewState());query.setParameter("newStateOrdinal", getIssueSetting().getStateOrdinal(entry.getValue().getNewState()));query.executeUpdate();- query = getSession().createQuery("update IssueStateHistory set state=:newState where state=:oldState");+ query = getSession().createMutationQuery("update IssueStateHistory set state=:newState where state=:oldState");query.setParameter("oldState", entry.getKey());query.setParameter("newState", entry.getValue().getNewState());query.executeUpdate();} else {- Query<?> query = getSession().createQuery("delete from IssueField where issue in (select issue from Issue issue where issue.state=:state)");+ var query = getSession().createMutationQuery("delete from IssueField where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueComment where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueComment where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueChange where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueChange where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueVote where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueVote where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueWatch where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueWatch where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueAuthorization where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueAuthorization where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueStateHistory where issue in (select issue from Issue issue where issue.state=:state)");+ query = getSession().createMutationQuery("delete from IssueStateHistory where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from Issue where state=:state");+ query = getSession().createMutationQuery("delete from Issue where state=:state");query.setParameter("state", entry.getKey());query.executeUpdate();- query = getSession().createQuery("delete from IssueStateHistory where state=:state");+ query = getSession().createMutationQuery("delete from IssueStateHistory where state=:state");query.setParameter("state", entry.getKey());query.executeUpdate();}@@ -792,13 +791,13 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssroleService.fixUndefinedIssueFields(resolutions);for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- Query<?> query;+ MutationQuery query;if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query = getSession().createQuery("update IssueField set name=:newName where name=:oldName");+ query = getSession().createMutationQuery("update IssueField set name=:newName where name=:oldName");query.setParameter("oldName", entry.getKey());query.setParameter("newName", entry.getValue().getNewField());} else {- query = getSession().createQuery("delete from IssueField where name=:fieldName");+ query = getSession().createMutationQuery("delete from IssueField where name=:fieldName");query.setParameter("fieldName", entry.getKey());}query.executeUpdate();@@ -842,19 +841,18 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss}}- @SuppressWarnings("rawtypes")@Transactional@Overridepublic void fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {for (String deletion: resolutionEntry.getValue().getDeletions()) {- Query query = getSession().createQuery("delete from IssueField where name=:fieldName and value=:fieldValue");+ var query = getSession().createMutationQuery("delete from IssueField where name=:fieldName and value=:fieldValue");query.setParameter("fieldName", resolutionEntry.getKey());query.setParameter("fieldValue", deletion);query.executeUpdate();}for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {- Query query = getSession().createQuery("update IssueField set value=:newValue where name=:fieldName and value=:oldValue");+ var query = getSession().createMutationQuery("update IssueField set value=:newValue where name=:fieldName and value=:oldValue");query.setParameter("fieldName", resolutionEntry.getKey());query.setParameter("oldValue", renameEntry.getKey());query.setParameter("newValue", renameEntry.getValue());@@ -906,7 +904,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Isspublic void fixStateAndFieldOrdinals() {int stateOrdinal = 0;for (StateSpec state: getIssueSetting().getStateSpecs()) {- Query query = getSession().createQuery("update Issue set stateOrdinal=:stateOrdinal "+ var query = getSession().createMutationQuery("update Issue set stateOrdinal=:stateOrdinal "+ "where state=:state and stateOrdinal!=:stateOrdinal");query.setParameter("state", state.getName());query.setParameter("stateOrdinal", stateOrdinal);@@ -914,7 +912,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssstateOrdinal++;}- Query query = getSession().createQuery("select distinct name, value, ordinal from IssueField where type=:choice");+ Query query = getSession().createQuery("select distinct name, value, ordinal from IssueField where type=:choice", Object[].class);query.setParameter("choice", FieldSpec.ENUMERATION);for (Object[] row: (List<Object[]>)query.getResultList()) {@@ -925,11 +923,11 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Issif (specifiedChoices != null) {long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);if (ordinal != newOrdinal) {- query = getSession().createQuery("update IssueField set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");- query.setParameter("fieldName", name);- query.setParameter("fieldValue", value);- query.setParameter("newOrdinal", newOrdinal);- query.executeUpdate();+ var updateQuery = getSession().createMutationQuery("update IssueField set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");+ updateQuery.setParameter("fieldName", name);+ updateQuery.setParameter("fieldValue", value);+ updateQuery.setParameter("newOrdinal", newOrdinal);+ updateQuery.executeUpdate();}}}@@ -1008,9 +1006,9 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssCriteriaQuery<IterationAndIssueState> criteriaQuery = builder.createQuery(IterationAndIssueState.class);Root<IssueSchedule> root = criteriaQuery.from(IssueSchedule.class);Join<Issue, Issue> issueJoin = root.join(IssueSchedule.PROP_ISSUE, JoinType.INNER);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(IterationAndIssueState.class,root.get(IssueSchedule.PROP_ITERATION).get(Iteration.PROP_ID),- issueJoin.get(Issue.PROP_STATE));+ issueJoin.get(Issue.PROP_STATE)));List<Predicate> iterationPredicates = new ArrayList<>();for (Iteration iteration: iterations)@@ -1297,10 +1295,10 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements IssCriteriaQuery<ProjectIssueStateStat> criteriaQuery = builder.createQuery(ProjectIssueStateStat.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(ProjectIssueStateStat.class,root.get(Issue.PROP_PROJECT).get(Project.PROP_ID),root.get(Issue.PROP_STATE_ORDINAL),- builder.count(root));+ builder.count(root)));criteriaQuery.groupBy(root.get(Issue.PROP_PROJECT), root.get(Issue.PROP_STATE_ORDINAL));Collection<Project> projectsWithConfidentialIssuePermission = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueStateHistoryService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueStateHistoryService.javaindex 2f731f9edb..52a6aeb5b7 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueStateHistoryService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueStateHistoryService.java@@ -1,6 +1,5 @@package io.onedev.server.service.impl;-import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.model.AbstractEntity.PROP_ID;import static io.onedev.server.model.IssueStateHistory.PROP_DATE;import static io.onedev.server.model.IssueStateHistory.PROP_DURATION;@@ -15,19 +14,19 @@ import java.util.Date;import java.util.HashMap;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.apache.shiro.subject.Subject;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.jetbrains.annotations.Nullable;import io.onedev.server.service.IssueService;@@ -118,7 +117,7 @@ public class DefaultIssueStateHistoryService extends BaseEntityService<IssueStatvar statePath = root.get(PROP_STATE);criteriaQuery.groupBy(timePath, statePath);- criteriaQuery.multiselect(newArrayList(+ criteriaQuery.select(builder.array(timePath, statePath, builder.avg(root.get(PROP_DURATION))));Map<Integer, Map<String, Integer>> stats = new HashMap<>();@@ -152,7 +151,7 @@ public class DefaultIssueStateHistoryService extends BaseEntityService<IssueStatvar statePath = root.get(PROP_STATE);criteriaQuery.groupBy(timePath, statePath);- criteriaQuery.multiselect(newArrayList(timePath, statePath, builder.count(root)));+ criteriaQuery.select(builder.array(timePath, statePath, builder.count(root)));Map<Integer, Map<String, Integer>> stats = new HashMap<>();for (var result: getSession().createQuery(criteriaQuery).getResultList()) {@@ -179,7 +178,7 @@ public class DefaultIssueStateHistoryService extends BaseEntityService<IssueStatvar statePath = root.get(PROP_STATE);if (startDate != null) {- criteriaQuery.multiselect(newArrayList(root.get(PROP_ISSUE).get(Issue.PROP_ID), statePath));+ criteriaQuery.select(builder.array(root.get(PROP_ISSUE).get(Issue.PROP_ID), statePath));Subquery<Date> subquery = criteriaQuery.subquery(Date.class);Root<IssueStateHistory> subRoot = subquery.from(IssueStateHistory.class);@@ -199,7 +198,7 @@ public class DefaultIssueStateHistoryService extends BaseEntityService<IssueStat}}- criteriaQuery.multiselect(newArrayList(root.get(PROP_ISSUE).get(Issue.PROP_ID), statePath));+ criteriaQuery.select(builder.array(root.get(PROP_ISSUE).get(Issue.PROP_ID), statePath));var predicates = new ArrayList<Predicate>(issuePredicates);if (startDate != null)@@ -212,7 +211,7 @@ public class DefaultIssueStateHistoryService extends BaseEntityService<IssueStatvar timePath = statsGroup.getPath(root.get(PROP_TIME_GROUPS));- criteriaQuery.multiselect(newArrayList(timePath, statePath, root.get(PROP_ISSUE).get(Issue.PROP_ID)));+ criteriaQuery.select(builder.array(timePath, statePath, root.get(PROP_ISSUE).get(Issue.PROP_ID)));Map<Integer, Map<String, Integer>> stats = new HashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueTouchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueTouchService.javaindex 038b81e484..e808f303ec 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueTouchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueTouchService.java@@ -8,13 +8,13 @@ import java.util.Collection;import java.util.HashSet;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaDelete;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaDelete;+import jakarta.persistence.criteria.Root;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@ -73,7 +73,7 @@ public class DefaultIssueTouchService extends BaseEntityService<IssueTouch>criteriaDelete.where(builder.equal(root.get(PROP_PROJECT), innerProject),root.get(PROP_ISSUE_ID).in(partition));- getSession().createQuery(criteriaDelete).executeUpdate();+ getSession().createMutationQuery(criteriaDelete).executeUpdate();}}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueVoteService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueVoteService.javaindex e5f14affa1..c69ca1d0ee 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueVoteService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueVoteService.java@@ -1,7 +1,7 @@package io.onedev.server.service.impl;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;import io.onedev.server.service.IssueVoteService;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWatchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWatchService.javaindex 8358d0f186..4ac813bf88 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWatchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWatchService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWatch;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.javaindex cc684dd72d..4cbcc14938 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.javaindex 48baed0577..2fa709d0f1 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkService.java@@ -12,14 +12,14 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Predicate;import org.apache.shiro.subject.Subject;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import edu.emory.mathcs.backport.java.util.Arrays;@@ -71,7 +71,7 @@ public class DefaultIssueWorkService extends BaseEntityService<IssueWork> implempredicates.add(builder.lessThanOrEqualTo(root.get(PROP_DATE), toDate));criteriaQuery.where(predicates.toArray(new Predicate[0]));- List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> preferOrders = new ArrayList<>();if (issueQuery.getCriteria() != null)preferOrders.addAll(issueQuery.getCriteria().getPreferOrders(builder, issue));criteriaQuery.orderBy(issueService.buildOrders(issueQuery, builder, issue, preferOrders));diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIterationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIterationService.javaindex dffb8e5a07..82004faf89 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIterationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIterationService.java@@ -2,10 +2,10 @@ package io.onedev.server.service.impl;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Iteration;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLabelSpecService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLabelSpecService.javaindex 473baedd86..8c08e3a372 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLabelSpecService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLabelSpecService.java@@ -2,9 +2,9 @@ package io.onedev.server.service.impl;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.LabelSpec;import io.onedev.server.persistence.annotation.Transactional;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkAuthorizationService.javaindex 35eb5fd9d5..1a9b162bb8 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkAuthorizationService.java@@ -2,7 +2,7 @@ package io.onedev.server.service.impl;import java.util.Collection;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkSpecService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkSpecService.javaindex 7ca32fec03..ac2918df48 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkSpecService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultLinkSpecService.java@@ -4,11 +4,11 @@ import java.util.Comparator;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;-import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterAtomicLong;import io.onedev.server.cluster.ClusterService;import io.onedev.server.event.Listen;@@ -48,7 +48,7 @@ public class DefaultLinkSpecService extends BaseEntityService<LinkSpec> implemenidCache = hazelcastInstance.getMap("linkSpecIds");cache = hazelcastInstance.getMap("linkSpecCache");- IAtomicLong cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("linkSpecCacheInited");+ ClusterAtomicLong cacheInited = clusterService.getAtomicLong("linkSpecCacheInited");clusterService.initWithLead(cacheInited, () -> {for (LinkSpec spec : query(true))updateCache(spec.getFacade());diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultManagedFutureService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultManagedFutureService.javaindex cabb7b740e..59d664ded1 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultManagedFutureService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultManagedFutureService.java@@ -6,8 +6,8 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.Future;import java.util.function.Consumer;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.jspecify.annotations.Nullable;import org.quartz.ScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultMembershipService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultMembershipService.javaindex 569248475f..44e2e0ff83 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultMembershipService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultMembershipService.java@@ -6,13 +6,13 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;import org.hibernate.query.Query;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobReferenceService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobReferenceService.javaindex bd89c29e1a..58c9e0a0e4 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobReferenceService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobReferenceService.java@@ -6,9 +6,9 @@ import static io.onedev.server.model.PackBlobReference.PROP_PACK_BLOB;import java.io.ObjectStreamException;import java.io.Serializable;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.javaindex 525a053a12..6a6f7438d9 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackBlobService.java@@ -13,7 +13,7 @@ import static io.onedev.server.model.PackBlob.getPacksRelativeDirPath;import static io.onedev.server.model.PackBlobReference.PROP_PACK_BLOB;import static io.onedev.server.util.Digest.SHA256;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import static org.apache.commons.io.IOUtils.copy;import java.io.BufferedOutputStream;@@ -32,24 +32,24 @@ import java.util.Date;import java.util.List;import java.util.UUID;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Root;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.JoinType;+import jakarta.persistence.criteria.Root;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.glassfish.jersey.client.ClientProperties;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.joda.time.DateTime;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;@@ -258,7 +258,7 @@ public class DefaultPackBlobService extends BaseEntityService<PackBlob>CriteriaQuery<Object[]> referenceAndBlobQuery = builder.createQuery(Object[].class);Root<PackBlobReference> referenceRoot = referenceAndBlobQuery.from(PackBlobReference.class);Join<PackBlob, PackBlob> blobJoin = referenceRoot.join(PackBlobReference.PROP_PACK_BLOB, JoinType.INNER);- referenceAndBlobQuery.multiselect(referenceRoot, blobJoin);+ referenceAndBlobQuery.select(builder.array(referenceRoot, blobJoin));referenceAndBlobQuery.where(referenceRoot.get(PackBlobReference.PROP_PACK).in(packs));for (var pack : packs)diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackLabelService.javaindex 11f6ac4801..89f10bbb7b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackLabelService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackLabelService.java@@ -3,9 +3,9 @@ package io.onedev.server.service.impl;import java.util.ArrayList;import java.util.Collection;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackQueryPersonalizationService.javaindex c216521672..cf3a7b6c7f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackQueryPersonalizationService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.PackQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.javaindex c6352a165b..48c8ace308 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java@@ -10,7 +10,7 @@ import static io.onedev.server.model.Pack.PROP_VERSION;import static io.onedev.server.model.Pack.SORT_FIELDS;import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;import static java.lang.Math.min;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;import java.io.Serializable;import java.util.ArrayList;@@ -22,18 +22,18 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import org.apache.shiro.subject.Subject;import org.hibernate.Session;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import org.jspecify.annotations.Nullable;@@ -101,7 +101,7 @@ public class DefaultPackService extends BaseEntityService<Pack>private void applyOrders(From<Pack, Pack> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,List<EntitySort> sorts) {- List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: sorts) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));@@ -213,9 +213,9 @@ public class DefaultPackService extends BaseEntityService<Pack>CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<ProjectPackTypeStat> criteriaQuery = builder.createQuery(ProjectPackTypeStat.class);Root<Pack> root = criteriaQuery.from(Pack.class);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(ProjectPackTypeStat.class,root.get(Pack.PROP_PROJECT).get(Project.PROP_ID),- root.get(Pack.PROP_TYPE), builder.count(root));+ root.get(Pack.PROP_TYPE), builder.count(root)));criteriaQuery.groupBy(root.get(PROP_PROJECT), root.get(Pack.PROP_TYPE));criteriaQuery.where(root.get(PROP_PROJECT).in(projects));@@ -293,7 +293,7 @@ public class DefaultPackService extends BaseEntityService<Pack>criteria.add(Restrictions.eq(PROP_TYPE, type));criteria.add(Restrictions.ilike(PROP_NAME, name.toLowerCase()));if (sortComparator == null)- criteria.addOrder(org.hibernate.criterion.Order.asc(PROP_ID));+ criteria.addOrder(io.onedev.server.persistence.dao.Order.asc(PROP_ID));var packs = query(criteria);if (sortComparator != null)packs.sort(sortComparator);@@ -308,11 +308,10 @@ public class DefaultPackService extends BaseEntityService<Pack>criteria.add(Restrictions.eq(PROP_TYPE, type));if (includePrerelease != null)criteria.add(Restrictions.eq(PROP_PRERELEASE, includePrerelease));- criteria.addOrder(org.hibernate.criterion.Order.asc(PROP_ID));+ criteria.addOrder(io.onedev.server.persistence.dao.Order.asc(PROP_ID));return query(criteria);}- @SuppressWarnings("unchecked")@Sessional@Overridepublic List<Pack> queryLatests(Project project, String type, String nameTerm,@@ -332,7 +331,7 @@ public class DefaultPackService extends BaseEntityService<Pack>queryString += " order by p1.name";- Query<Pack> query = getSession().createQuery(queryString);+ Query<Pack> query = getSession().createQuery(queryString, Pack.class);query.setParameter("project", project);query.setParameter("type", type);if (nameTerm != null)diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPendingSuggestionApplyService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPendingSuggestionApplyService.javaindex 00a38fb0e0..6598983d56 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPendingSuggestionApplyService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPendingSuggestionApplyService.java@@ -3,12 +3,12 @@ package io.onedev.server.service.impl;import java.util.ArrayList;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaDelete;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaDelete;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;import org.eclipse.jgit.lib.ObjectId;@@ -98,7 +98,7 @@ public class DefaultPendingSuggestionApplyService extends BaseEntityService<PendcriteriaDelete.where(builder.equal(root.get(PendingSuggestionApply.PROP_REQUEST), request));}- getSession().createQuery(criteriaDelete).executeUpdate();+ getSession().createMutationQuery(criteriaDelete).executeUpdate();}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectEntitlementService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectEntitlementService.javaindex 3ff18bbe11..9e6c9f1b31 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectEntitlementService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectEntitlementService.java@@ -4,7 +4,7 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLabelService.javaindex 44039ef6b5..009842a4d4 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLabelService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLabelService.java@@ -7,9 +7,9 @@ import io.onedev.server.model.LabelSpec;import io.onedev.server.model.Project;import io.onedev.server.model.ProjectLabel;import io.onedev.server.persistence.annotation.Sessional;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import java.util.ArrayList;import java.util.Collection;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLastEventDateService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLastEventDateService.javaindex f6bc66cb90..024ea49d7a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLastEventDateService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectLastEventDateService.java@@ -2,7 +2,7 @@ package io.onedev.server.service.impl;import java.util.Date;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.javaindex 00fdbcd422..f8f7c283a0 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java@@ -49,16 +49,16 @@ import java.util.concurrent.Future;import java.util.concurrent.locks.Lock;import java.util.function.Consumer;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.ws.rs.core.MediaType;import org.apache.commons.lang3.math.NumberUtils;import org.apache.shiro.authz.UnauthorizedException;@@ -73,9 +73,9 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.lib.StoredConfig;import org.hibernate.Session;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;+import org.hibernate.query.sqm.tree.domain.SqmPath;import org.jspecify.annotations.Nullable;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;@@ -452,19 +452,19 @@ public class DefaultProjectService extends BaseEntityService<Project>Collection<Project> forkChildren = fork.getForkDescendants();forkChildren.add(fork);for (Project forkChild : forkChildren) {- Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",+ var query = getSession().createMutationQuery(String.format("update Issue set %s=:fork where %s=:descendant",Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));query.setParameter("fork", fork);query.setParameter("descendant", forkChild);query.executeUpdate();- query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",+ query = getSession().createMutationQuery(String.format("update Build set %s=:fork where %s=:descendant",Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));query.setParameter("fork", fork);query.setParameter("descendant", forkChild);query.executeUpdate();- query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",+ query = getSession().createMutationQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));query.setParameter("fork", fork);query.setParameter("descendant", forkChild);@@ -472,7 +472,7 @@ public class DefaultProjectService extends BaseEntityService<Project>}}- Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",+ var query = getSession().createMutationQuery(String.format("update Project set %s=null where %s=:forkedFrom",Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));query.setParameter("forkedFrom", project);query.executeUpdate();@@ -483,7 +483,7 @@ public class DefaultProjectService extends BaseEntityService<Project>pullRequestService.discard(user, request, "Source project is deleted.");}- query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",+ query = getSession().createMutationQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));query.setParameter("sourceProject", project);query.executeUpdate();@@ -1031,11 +1031,11 @@ public class DefaultProjectService extends BaseEntityService<Project>var found = false;for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath) {- var expr = (SingularAttributePath) order.getExpression();- if (expr.getAttribute().getName().equals(ProjectLastActivityDate.PROP_VALUE)- && expr.getPathSource() instanceof SingularAttributePath- && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(Project.PROP_LAST_ACTIVITY_DATE)) {+ if (order.getExpression() instanceof SqmPath) {+ var expr = (SqmPath) order.getExpression();+ if (expr.getReferencedPathSource().getPathName().equals(ProjectLastActivityDate.PROP_VALUE)+ && expr.getLhs() instanceof SqmPath+ && ((SqmPath) expr.getLhs()).getReferencedPathSource().getPathName().equals(Project.PROP_LAST_ACTIVITY_DATE)) {found = true;break;}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestAssignmentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestAssignmentService.javaindex 8db9e0c03d..01ed8a9688 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestAssignmentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestAssignmentService.java@@ -2,8 +2,8 @@ package io.onedev.server.service.impl;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;import io.onedev.server.service.PullRequestAssignmentService;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.javaindex 4866c1ecbe..f46a3a3549 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestChangeService.java@@ -5,15 +5,15 @@ import java.util.Date;import java.util.List;import java.util.Objects;-import javax.inject.Inject;-import javax.inject.Singleton;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;++import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.EntityCriteria;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentReactionService.javaindex 83f57708d9..b3d5ae3552 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentReactionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentReactionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentService.javaindex 06a6ffdf06..86b9d0fa68 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestCommentService.java@@ -5,14 +5,14 @@ import java.util.Collection;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.javaindex 509a9933cc..6f2fb13304 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java@@ -3,9 +3,9 @@ package io.onedev.server.service.impl;import java.util.ArrayList;import java.util.Collection;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Root;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Root;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestMentionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestMentionService.javaindex c2ad2f7d57..c776122f4d 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestMentionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestMentionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestMention;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestQueryPersonalizationService.javaindex d02a03ae38..824aa86d67 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestQueryPersonalizationService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestQueryPersonalization;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.javaindex a90e00845a..a36aa0770e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java@@ -1,6 +1,6 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.javaindex 03a636a3c8..5d01b0210b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java@@ -4,12 +4,12 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Join;+import jakarta.persistence.criteria.Root;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.javaindex 08d29ce0d9..bab948210c 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java@@ -1,7 +1,6 @@package io.onedev.server.service.impl;import static com.google.common.base.Preconditions.checkNotNull;-import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.model.PullRequest.PROP_CLOSE_DATE;import static io.onedev.server.model.PullRequest.PROP_CLOSE_TIME_GROUPS;import static io.onedev.server.model.PullRequest.PROP_DURATION;@@ -32,15 +31,15 @@ import java.util.Objects;import java.util.Set;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import org.apache.commons.lang3.tuple.ImmutablePair;import org.apache.commons.lang3.tuple.Pair;@@ -48,10 +47,10 @@ import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Criterion;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;+import org.hibernate.query.sqm.tree.domain.SqmPath;import org.joda.time.DateTime;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;@@ -244,20 +243,20 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>gitService.deleteRefs(request.getTargetProject(), refs);- Query<?> query = getSession().createQuery(String.format(+ var query = getSession().createMutationQuery(String.format("update CodeComment set %s=null where %s=:request",CodeComment.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST,CodeComment.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST));query.setParameter("request", request);query.executeUpdate();- query = getSession().createQuery(String.format("update CodeCommentReply set %s=null where %s=:request",+ query = getSession().createMutationQuery(String.format("update CodeCommentReply set %s=null where %s=:request",CodeCommentReply.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST,CodeCommentReply.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST));query.setParameter("request", request);query.executeUpdate();- query = getSession().createQuery(String.format("update CodeCommentStatusChange set %s=null where %s=:request",+ query = getSession().createMutationQuery(String.format("update CodeCommentStatusChange set %s=null where %s=:request",CodeCommentStatusChange.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST,CodeCommentStatusChange.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST));query.setParameter("request", request);@@ -1036,11 +1035,11 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>var found = false;for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath) {- var expr = (SingularAttributePath) order.getExpression();- if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)- && expr.getPathSource() instanceof SingularAttributePath- && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(PullRequest.PROP_LAST_ACTIVITY)) {+ if (order.getExpression() instanceof SqmPath) {+ var expr = (SqmPath) order.getExpression();+ if (expr.getReferencedPathSource().getPathName().equals(LastActivity.PROP_DATE)+ && expr.getLhs() instanceof SqmPath+ && ((SqmPath) expr.getLhs()).getReferencedPathSource().getPathName().equals(PullRequest.PROP_LAST_ACTIVITY)) {found = true;break;}@@ -1132,9 +1131,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<ProjectPullRequestStatusStat> criteriaQuery = builder.createQuery(ProjectPullRequestStatusStat.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(ProjectPullRequestStatusStat.class,root.get(PullRequest.PROP_TARGET_PROJECT).get(Project.PROP_ID),- root.get(PROP_STATUS), builder.count(root));+ root.get(PROP_STATUS), builder.count(root)));criteriaQuery.groupBy(root.get(PullRequest.PROP_TARGET_PROJECT), root.get(PROP_STATUS));criteriaQuery.where(root.get(PullRequest.PROP_TARGET_PROJECT).in(projects));@@ -1163,7 +1162,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>var groupPath = statsGroup.getPath(root.get(PROP_CLOSE_TIME_GROUPS));criteriaQuery.groupBy(groupPath);- criteriaQuery.multiselect(newArrayList(+ criteriaQuery.select(builder.array(groupPath,builder.avg(root.get(PROP_DURATION))));@@ -1196,7 +1195,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>var groupPath = statsGroup.getPath(root.get(PROP_SUBMIT_TIME_GROUPS));criteriaQuery.groupBy(groupPath);- criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));+ criteriaQuery.select(builder.array(groupPath, builder.count(root)));Map<Integer, Integer> openStats = new HashMap<>();for (var result: getSession().createQuery(criteriaQuery).getResultList())@@ -1212,7 +1211,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>groupPath = statsGroup.getPath(root.get(PROP_CLOSE_TIME_GROUPS));criteriaQuery.groupBy(groupPath);- criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));+ criteriaQuery.select(builder.array(groupPath, builder.count(root)));Map<Integer, Integer> mergeStats = new HashMap<>();for (var result: getSession().createQuery(criteriaQuery).getResultList())@@ -1325,9 +1324,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>@Overridepublic List<PullRequest> queryAfter(Long projectId, Long afterRequestId, int count) {EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(org.hibernate.criterion.Restrictions.eq(PullRequest.PROP_TARGET_PROJECT + ".id", projectId));- criteria.add(org.hibernate.criterion.Restrictions.gt("id", afterRequestId));- criteria.addOrder(org.hibernate.criterion.Order.asc("id"));+ criteria.add(io.onedev.server.persistence.dao.Restrictions.eq(PullRequest.PROP_TARGET_PROJECT + ".id", projectId));+ criteria.add(io.onedev.server.persistence.dao.Restrictions.gt("id", afterRequestId));+ criteria.addOrder(io.onedev.server.persistence.dao.Order.asc("id"));return query(criteria, 0, count);}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestTouchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestTouchService.javaindex 91df2c8a8e..cc82c7b3b5 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestTouchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestTouchService.java@@ -5,10 +5,10 @@ import static java.lang.String.format;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.event.Listen;import io.onedev.server.event.ListenerRegistry;@@ -50,7 +50,7 @@ public class DefaultPullRequestTouchService extends BaseEntityService<PullRequestransactionService.runAfterCommit(() -> transactionService.runAsync(() -> {var innerProject = projectService.load(projectId);if (!newRequest) {- var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));+ var query = getSession().createMutationQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));query.setParameter("project", innerProject);query.setParameter(PROP_REQUEST_ID, requestId);query.executeUpdate();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestUpdateService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestUpdateService.javaindex c3437353ae..a7c2d3eb9e 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestUpdateService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestUpdateService.java@@ -2,12 +2,12 @@ package io.onedev.server.service.impl;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestWatchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestWatchService.javaindex 88e659cd30..98e57300f7 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestWatchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestWatchService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestWatch;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultResourceService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultResourceService.javaindex 713dda1bfc..f08b46f613 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultResourceService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultResourceService.java@@ -18,8 +18,8 @@ import java.util.Set;import java.util.concurrent.Future;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultReviewedDiffService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultReviewedDiffService.javaindex efccd48c4e..a470c7e58a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultReviewedDiffService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultReviewedDiffService.java@@ -8,10 +8,10 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.joda.time.DateTime;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;@@ -87,7 +87,7 @@ public class DefaultReviewedDiffService extends BaseEntityService<ReviewedDiff>@Overridepublic void doWorks(List<Prioritized> works) {transactionService.run(() -> {- var query = getSession().createQuery("delete from ReviewedDiff where date < :date");+ var query = getSession().createMutationQuery("delete from ReviewedDiff where date < :date");query.setParameter("date", new DateTime().minusDays(MAX_PRESERVE_DAYS).toDate());query.executeUpdate();});diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.javaindex cfc240da53..c7bdede06a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRoleService.java@@ -6,19 +6,18 @@ import java.util.HashSet;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.ReplicationMode;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import org.jspecify.annotations.Nullable;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.hazelcast.core.HazelcastInstance;-import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterAtomicLong;import io.onedev.server.cluster.ClusterService;import io.onedev.server.event.Listen;@@ -77,7 +76,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleS@Transactional@Overridepublic void replicate(Role role) {- getSession().replicate(role, ReplicationMode.OVERWRITE);+ getSession().merge(role);idService.useId(Role.class, role.getId());var facade = role.getFacade();@@ -90,7 +89,7 @@ public class DefaultRoleService extends BaseEntityService<Role> implements RoleSHazelcastInstance hazelcastInstance = clusterService.getHazelcastInstance();cache = new RoleCache(hazelcastInstance.getMap("roleCache"));- IAtomicLong cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("roleCacheInited");+ ClusterAtomicLong cacheInited = clusterService.getAtomicLong("roleCacheInited");clusterService.initWithLead(cacheInited, () -> {for (var role: query())cache.put(role.getId(), role.getFacade());diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.javaindex f5c7037b64..d29e332b35 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultRunCacheService.java@@ -21,8 +21,8 @@ import java.util.Date;import java.util.List;import java.util.function.Consumer;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.joda.time.DateTime;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.javaindex 9f694f6654..658ac30500 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java@@ -1,7 +1,7 @@package io.onedev.server.service.impl;import static io.onedev.server.model.Setting.PROP_KEY;-import static org.hibernate.criterion.Restrictions.eq;+import static io.onedev.server.persistence.dao.Restrictions.eq;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -18,13 +18,13 @@ import java.util.concurrent.ConcurrentHashMap;import org.bouncycastle.openpgp.PGPException;import org.bouncycastle.openpgp.PGPKeyRingGenerator;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.validation.Validator;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.validation.Validator;import org.apache.commons.codec.binary.Base64;-import org.apache.shiro.crypto.AesCipherService;-import org.apache.shiro.crypto.CipherService;+import org.apache.shiro.crypto.cipher.AesCipherService;+import org.apache.shiro.crypto.cipher.CipherService;import org.jspecify.annotations.Nullable;import io.onedev.commons.loader.ManagedSerializedForm;@@ -136,7 +136,7 @@ public class DefaultSettingService extends BaseEntityService<Setting> implements@Overridepublic String getSystemUUID() {- return new String(cipherService.decrypt(Base64.decodeBase64(((String)getSettingValue(Key.SYSTEM_UUID)).getBytes()), UUID_ENCRYPTION_KEY).getBytes());+ return new String(cipherService.decrypt(Base64.decodeBase64(((String)getSettingValue(Key.SYSTEM_UUID)).getBytes()), UUID_ENCRYPTION_KEY).getClonedBytes());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSshKeyService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSshKeyService.javaindex d41d7aaea4..9052b411aa 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSshKeyService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSshKeyService.java@@ -5,10 +5,10 @@ import java.util.Date;import java.util.HashMap;import java.util.Map;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;-import org.hibernate.criterion.SimpleExpression;+import io.onedev.server.persistence.dao.Restrictions;+import io.onedev.server.persistence.dao.Criterion;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -31,7 +31,7 @@ public class DefaultSshKeyService extends BaseEntityService<SshKey> implements S@Sessional@Overridepublic SshKey findByFingerprint(String fingerprint) {- SimpleExpression eq = Restrictions.eq("fingerprint", fingerprint);+ Criterion eq = Restrictions.eq("fingerprint", fingerprint);EntityCriteria<SshKey> entityCriteria = EntityCriteria.of(SshKey.class).add(eq);entityCriteria.setCacheable(true);return find(entityCriteria);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoAccountService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoAccountService.javaindex 6acfefec08..1e46db8b41 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoAccountService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoAccountService.java@@ -1,8 +1,8 @@package io.onedev.server.service.impl;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.SsoAccount;import io.onedev.server.model.SsoProvider;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoProviderService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoProviderService.javaindex 7d77278bc3..abfbddb0e6 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoProviderService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSsoProviderService.java@@ -2,10 +2,10 @@ package io.onedev.server.service.impl;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.SsoProvider;import io.onedev.server.persistence.annotation.Sessional;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultStopwatchService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultStopwatchService.javaindex d2d028060a..6b4a0638c4 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultStopwatchService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultStopwatchService.java@@ -5,10 +5,10 @@ import static io.onedev.server.model.Stopwatch.PROP_USER;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUrlService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUrlService.javaindex 2d65de5467..37e32d5bf1 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUrlService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUrlService.java@@ -18,8 +18,8 @@ import org.apache.wicket.util.encoding.UrlEncoder;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.nio.charset.StandardCharsets;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserAuthorizationService.javaindex 3c7cfd7d75..1c407bc327 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserAuthorizationService.java@@ -3,7 +3,7 @@ package io.onedev.server.service.impl;import java.util.Collection;import java.util.List;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import io.onedev.server.service.UserAuthorizationService;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserEntitlementService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserEntitlementService.javaindex 2a9a5a21ab..6bcb4ebf30 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserEntitlementService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserEntitlementService.java@@ -4,7 +4,7 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.javaindex a3205a7ede..8adc54414c 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserInvitationService.java@@ -6,12 +6,12 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.javaindex 43018f43b3..9b793d3375 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java@@ -24,16 +24,15 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.function.Consumer;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;--import org.hibernate.ReplicationMode;-import org.hibernate.criterion.Restrictions;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.persistence.criteria.Subquery;++import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -169,7 +168,7 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS@Transactional@Overridepublic void replicate(User user) {- getSession().replicate(user, ReplicationMode.OVERWRITE);+ getSession().merge(user);idService.useId(User.class, user.getId());var facade = user.getFacade();if (facade.getId() > 0)@@ -236,107 +235,107 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSpublic void delete(User user) {checkUsage(user);- Query<?> query = getSession().createQuery("update PullRequest set submitter=:unknown where submitter=:submitter");+ var query = getSession().createMutationQuery("update PullRequest set submitter=:unknown where submitter=:submitter");query.setParameter("submitter", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Pack set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update Pack set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Audit set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update Audit set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Build set submitter=:unknown where submitter=:submitter");+ query = getSession().createMutationQuery("update Build set submitter=:unknown where submitter=:submitter");query.setParameter("submitter", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Build set canceller=:unknown where canceller=:canceller");+ query = getSession().createMutationQuery("update Build set canceller=:unknown where canceller=:canceller");query.setParameter("canceller", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update PullRequest set lastActivity.user=:unknown where lastActivity.user=:user");+ query = getSession().createMutationQuery("update PullRequest set lastActivity.user=:unknown where lastActivity.user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update PullRequestReaction set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update PullRequestReaction set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update PullRequestChange set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update PullRequestChange set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update PullRequestComment set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update PullRequestComment set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update PullRequestCommentReaction set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update PullRequestCommentReaction set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update CodeComment set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update CodeComment set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update CodeComment set lastActivity.user=:unknown where lastActivity.user=:user");+ query = getSession().createMutationQuery("update CodeComment set lastActivity.user=:unknown where lastActivity.user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update CodeCommentReply set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update CodeCommentReply set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update CodeCommentStatusChange set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update CodeCommentStatusChange set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Issue set submitter=:unknown where submitter=:submitter");+ query = getSession().createMutationQuery("update Issue set submitter=:unknown where submitter=:submitter");query.setParameter("submitter", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update Issue set lastActivity.user=:unknown where lastActivity.user=:user");+ query = getSession().createMutationQuery("update Issue set lastActivity.user=:unknown where lastActivity.user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update IssueReaction set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update IssueReaction set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update IssueComment set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update IssueComment set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update IssueCommentReaction set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update IssueCommentReaction set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update IssueWorkReaction set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update IssueWorkReaction set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();- query = getSession().createQuery("update IssueChange set user=:unknown where user=:user");+ query = getSession().createMutationQuery("update IssueChange set user=:unknown where user=:user");query.setParameter("user", user);query.setParameter("unknown", getUnknown());query.executeUpdate();diff --git a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.javaindex 1731cec5e5..49d7f0787e 100644--- a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java@@ -11,8 +11,8 @@ import org.apache.sshd.common.digest.BuiltinDigests;import org.apache.sshd.server.auth.AsyncAuthException;import org.apache.sshd.server.session.ServerSession;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.security.GeneralSecurityException;import java.security.PrivateKey;import java.security.PublicKey;diff --git a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshService.java b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshService.javaindex ed8d9ab0db..392be9c4a2 100644--- a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshService.java+++ b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshService.java@@ -11,8 +11,8 @@ import java.security.PrivateKey;import java.security.PublicKey;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.sshd.client.SshClient;import org.apache.sshd.client.keyverifier.RequiredServerKeyVerifier;diff --git a/server-core/src/main/java/io/onedev/server/taskschedule/DefaultTaskScheduler.java b/server-core/src/main/java/io/onedev/server/taskschedule/DefaultTaskScheduler.javaindex 3406973ad5..f84ddf61ed 100644--- a/server-core/src/main/java/io/onedev/server/taskschedule/DefaultTaskScheduler.java+++ b/server-core/src/main/java/io/onedev/server/taskschedule/DefaultTaskScheduler.java@@ -3,7 +3,7 @@ package io.onedev.server.taskschedule;import java.util.Properties;import java.util.UUID;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;diff --git a/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java b/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.javaindex adfe1eb247..e22c02b37f 100644--- a/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java+++ b/server-core/src/main/java/io/onedev/server/updatecheck/DefaultUpdateCheckService.java@@ -1,7 +1,7 @@package io.onedev.server.updatecheck;import org.jspecify.annotations.Nullable;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import java.util.Date;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/util/CryptoUtils.java b/server-core/src/main/java/io/onedev/server/util/CryptoUtils.javaindex 19c1faae4b..34eb12f2f3 100644--- a/server-core/src/main/java/io/onedev/server/util/CryptoUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/CryptoUtils.java@@ -4,7 +4,7 @@ import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;import org.apache.commons.codec.binary.Base64;import org.apache.commons.lang3.RandomStringUtils;-import org.apache.shiro.crypto.AesCipherService;+import org.apache.shiro.crypto.cipher.AesCipherService;import javax.crypto.SecretKeyFactory;import javax.crypto.spec.PBEKeySpec;@@ -53,7 +53,7 @@ public class CryptoUtils {}public static byte[] decrypt(byte[] data) {- return cipherService.decrypt(data, getCipherKey()).getBytes();+ return cipherService.decrypt(data, getCipherKey()).getClonedBytes();}private static class KeyPair {diff --git a/server-core/src/main/java/io/onedev/server/util/EmailAddressUtils.java b/server-core/src/main/java/io/onedev/server/util/EmailAddressUtils.javaindex fe99acc07b..ea41551e8a 100644--- a/server-core/src/main/java/io/onedev/server/util/EmailAddressUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/EmailAddressUtils.java@@ -2,7 +2,7 @@ package io.onedev.server.util;import org.apache.commons.lang3.StringUtils;-import javax.mail.internet.InternetAddress;+import jakarta.mail.internet.InternetAddress;public class EmailAddressUtils {diff --git a/server-core/src/main/java/io/onedev/server/util/HibernateProxyHelper.java b/server-core/src/main/java/io/onedev/server/util/HibernateProxyHelper.javanew file mode 100644index 0000000000..6fbccbe807--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/HibernateProxyHelper.java@@ -0,0 +1,13 @@+package io.onedev.server.util;++import org.hibernate.proxy.HibernateProxy;++public final class HibernateProxyHelper {+ private HibernateProxyHelper() {}++ @SuppressWarnings("rawtypes")+ public static Class getClassWithoutInitializingProxy(Object entity) {+ var initializer = HibernateProxy.extractLazyInitializer(entity);+ return initializer != null ? initializer.getPersistentClass() : entity.getClass();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java b/server-core/src/main/java/io/onedev/server/util/HttpUtils.javaindex b621b5687e..9e2f8e9dab 100644--- a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/HttpUtils.java@@ -3,8 +3,8 @@ package io.onedev.server.util;import org.apache.commons.codec.binary.Base64;import org.jspecify.annotations.Nullable;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.core.HttpHeaders;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.ws.rs.core.HttpHeaders;import static java.nio.charset.StandardCharsets.UTF_8;import static org.apache.commons.lang3.StringUtils.substringAfter;diff --git a/server-core/src/main/java/io/onedev/server/util/IterationSort.java b/server-core/src/main/java/io/onedev/server/util/IterationSort.javaindex ba8110eacc..edd75a75bd 100644--- a/server-core/src/main/java/io/onedev/server/util/IterationSort.java+++ b/server-core/src/main/java/io/onedev/server/util/IterationSort.java@@ -1,7 +1,7 @@package io.onedev.server.util;import org.eclipse.jgit.util.StringUtils;-import org.hibernate.criterion.Order;+import io.onedev.server.persistence.dao.Order;import io.onedev.server.model.Iteration;diff --git a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.javaindex 4c859da4ef..b00cd75de9 100644--- a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java@@ -6,10 +6,10 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;import org.jspecify.annotations.Nullable;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import java.util.List;public class JerseyUtils {diff --git a/server-core/src/main/java/io/onedev/server/util/Path.java b/server-core/src/main/java/io/onedev/server/util/Path.javaindex a0ae85f973..d118bfdcd8 100644--- a/server-core/src/main/java/io/onedev/server/util/Path.java+++ b/server-core/src/main/java/io/onedev/server/util/Path.java@@ -39,8 +39,8 @@ public class Path implements Serializable {this(path, new PathNode.Indexed(indexedPathNode));}- public Path(javax.validation.Path path) {- for (javax.validation.Path.Node node: path) {+ public Path(jakarta.validation.Path path) {+ for (jakarta.validation.Path.Node node: path) {if (node.getIndex() != null)nodes.add(new PathNode.Indexed(node.getIndex()));if (node.getName() != null)diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java b/server-core/src/main/java/io/onedev/server/util/ProjectScope.javaindex 6d078bcb6c..27641430b1 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScope.java@@ -4,9 +4,9 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.model.Project;import io.onedev.server.model.support.ProjectBelonging;diff --git a/server-core/src/main/java/io/onedev/server/util/QueryUtils.java b/server-core/src/main/java/io/onedev/server/util/QueryUtils.javaindex 970fb04167..db48fd153c 100644--- a/server-core/src/main/java/io/onedev/server/util/QueryUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/QueryUtils.java@@ -3,8 +3,8 @@ package io.onedev.server.util;import java.util.Date;import java.util.regex.Pattern;-import javax.persistence.criteria.Path;-import javax.validation.ValidationException;+import jakarta.persistence.criteria.Path;+import jakarta.validation.ValidationException;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.javaindex 72a6720991..d5952f7f4a 100644--- a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java@@ -6,8 +6,8 @@ import static io.onedev.commons.utils.LockUtils.write;import static io.onedev.k8shelper.KubernetesHelper.BEARER;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;import static java.nio.charset.StandardCharsets.UTF_8;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;-import static javax.ws.rs.core.Response.Status.NO_CONTENT;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;import java.io.BufferedOutputStream;import java.io.File;@@ -21,11 +21,11 @@ import java.util.concurrent.Callable;import java.util.concurrent.locks.Lock;import java.util.function.Consumer;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkExecutionService.java b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkExecutionService.javaindex b57036816d..4f54efff6a 100644--- a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkExecutionService.java+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkExecutionService.java@@ -9,8 +9,8 @@ import org.apache.shiro.util.ThreadContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.*;import java.util.concurrent.BlockingQueue;import java.util.concurrent.PriorityBlockingQueue;diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutionService.java b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutionService.javaindex ab7e738793..3d29b3d727 100644--- a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutionService.java+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutionService.java@@ -14,8 +14,8 @@ import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import io.onedev.server.service.SettingService;import io.onedev.server.security.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.javaindex 847adbfe2e..0358889ab3 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java@@ -11,11 +11,11 @@ import java.util.Set;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.javaindex cbfa9a6e1c..b59063cbbc 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java@@ -8,12 +8,12 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;import org.apache.lucene.document.LongPoint;import org.apache.lucene.search.BooleanClause.Occur;diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.javaindex 48aa242a05..ad55576b4e 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java@@ -5,11 +5,11 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.javaindex b61c1f54b1..673c0430d5 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java@@ -11,11 +11,11 @@ import java.util.Set;import java.util.stream.Collectors;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Predicate;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Predicate;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.javaindex bfd95d11a5..c9c4e45adf 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java@@ -2,6 +2,7 @@ package io.onedev.server.util.facade;import java.util.HashMap;import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;import org.jspecify.annotations.Nullable;@@ -13,6 +14,12 @@ import io.onedev.server.util.MapProxy;public class EmailAddressCache extends MapProxy<Long, EmailAddressFacade> {private static final long serialVersionUID = 1L;++ // Keep only lookup hints: email addresses can change on another cluster node.+ private final Map<String, Long> idsByValue = new ConcurrentHashMap<>();++ // Validate each hint against the replicated record, including primary-address changes.+ private final Map<Long, Long> primaryIdsByUser = new ConcurrentHashMap<>();public EmailAddressCache(Map<Long, EmailAddressFacade> delegate) {super(delegate);@@ -35,18 +42,36 @@ public class EmailAddressCache extends MapProxy<Long, EmailAddressFacade> {return null;}+ var id = idsByValue.get(value);+ if (id != null) {+ var facade = get(id);+ if (facade != null && facade.getValue().equals(value))+ return facade;+ idsByValue.remove(value, id);+ }for (EmailAddressFacade facade: values()) {- if (facade.getValue().equals(value))+ if (facade.getValue().equals(value)) {+ idsByValue.put(value, facade.getId());return facade;+ }}return null;}@Nullablepublic EmailAddressFacade findPrimary(Long userId) {+ var id = primaryIdsByUser.get(userId);+ if (id != null) {+ var facade = get(id);+ if (facade != null && facade.isPrimary() && facade.getOwnerId().equals(userId))+ return facade;+ primaryIdsByUser.remove(userId, id);+ }for (EmailAddressFacade facade: values()) {- if (facade.isPrimary() && facade.getOwnerId().equals(userId))+ if (facade.isPrimary() && facade.getOwnerId().equals(userId)) {+ primaryIdsByUser.put(userId, facade.getId());return facade;+ }}return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.javaindex ac69113b4b..0f73a40ade 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java@@ -11,7 +11,9 @@ import java.util.Comparator;import java.util.HashMap;import java.util.HashSet;import java.util.List;+import java.util.Locale;import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;import org.jspecify.annotations.Nullable;@@ -29,6 +31,11 @@ public class ProjectCache extends MapProxy<Long, ProjectFacade> {private static final long serialVersionUID = 1L;+ // Keep only lookup hints and validate against the current replicated records.+ private final Map<String, Long> idsByPath = new ConcurrentHashMap<>();++ private final Map<String, Long> idsByKey = new ConcurrentHashMap<>();+public ProjectCache(Map<Long, ProjectFacade> delegate) {super(delegate);}@@ -75,20 +82,39 @@ public class ProjectCache extends MapProxy<Long, ProjectFacade> {return subtreeIds;}- @Nullable- public ProjectFacade findByPath(String path) {- for (ProjectFacade project: values()) {- if (project.getPath().equalsIgnoreCase(path))- return project;- }- return null;- }+ @Nullable+ public ProjectFacade findByPath(String path) {+ var lookupPath = path.toLowerCase(Locale.ROOT);+ var id = idsByPath.get(lookupPath);+ if (id != null) {+ var project = get(id);+ if (project != null && project.getPath().equalsIgnoreCase(path))+ return project;+ idsByPath.remove(lookupPath, id);+ }+ for (ProjectFacade project: values()) {+ if (project.getPath().equalsIgnoreCase(path)) {+ idsByPath.put(lookupPath, project.getId());+ return project;+ }+ }+ return null;+ }@Nullablepublic ProjectFacade findByKey(String key) {+ var id = idsByKey.get(key);+ if (id != null) {+ var project = get(id);+ if (project != null && key.equals(project.getKey()))+ return project;+ idsByKey.remove(key, id);+ }for (ProjectFacade project: values()) {- if (key.equals(project.getKey()))+ if (key.equals(project.getKey())) {+ idsByKey.put(key, project.getId());return project;+ }}return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.javaindex 9beef6442d..f32cbc6d55 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java@@ -7,6 +7,7 @@ import java.util.Comparator;import java.util.HashMap;import java.util.Map;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;import java.util.function.Function;import org.jspecify.annotations.Nullable;@@ -20,6 +21,9 @@ import io.onedev.server.util.Similarities;public class UserCache extends MapProxy<Long, UserFacade> {private static final long serialVersionUID = 1L;++ // Keep only lookup hints: the replicated map can change on another cluster node.+ private final Map<String, Long> idsByName = new ConcurrentHashMap<>();public UserCache(Map<Long, UserFacade> delegate) {super(delegate);@@ -28,9 +32,18 @@ public class UserCache extends MapProxy<Long, UserFacade> {@Nullablepublic UserFacade findByName(String name) {name = name.toLowerCase();+ var id = idsByName.get(name);+ if (id != null) {+ var facade = get(id);+ if (facade != null && name.equals(facade.getName()))+ return facade;+ idsByName.remove(name, id);+ }for (UserFacade facade: values()) {- if (name.equals(facade.getName()))+ if (name.equals(facade.getName())) {+ idsByName.put(name, facade.getId());return facade;+ }}return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.javaindex b6d8cdb70a..8cbf354220 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java@@ -9,9 +9,9 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.inject.Singleton;import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;import com.fasterxml.jackson.annotation.JsonTypeInfo;diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/git/GitObjectMapperConfigurator.java b/server-core/src/main/java/io/onedev/server/util/jackson/git/GitObjectMapperConfigurator.javaindex a05ad10210..679dfc4da7 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/git/GitObjectMapperConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/git/GitObjectMapperConfigurator.java@@ -1,6 +1,6 @@package io.onedev.server.util.jackson.git;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.javaindex 12d544fc84..66028c167f 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java@@ -2,11 +2,11 @@ package io.onedev.server.util.jackson.hibernate;import java.lang.reflect.Field;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Transient;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.OneToOne;+import jakarta.persistence.Transient;import com.fasterxml.jackson.core.Version;import com.fasterxml.jackson.databind.AnnotationIntrospector;diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.javaindex 193fd6a875..d33ecc707c 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java@@ -1,7 +1,7 @@package io.onedev.server.util.jackson.hibernate;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.fasterxml.jackson.databind.ObjectMapper;diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.javaindex 48c7db4847..f8b58860d7 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java@@ -16,8 +16,8 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.dao.Dao;import org.hibernate.proxy.HibernateProxy;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class HibernateObjectMapperModule extends Module {diff --git a/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenService.java b/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenService.javaindex 3a12be1f24..9aa4cf84d7 100644--- a/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenService.java+++ b/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenService.java@@ -17,8 +17,8 @@ import org.joda.time.DateTime;import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.io.IOException;import java.net.URI;import java.net.URISyntaxException;diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.javaindex 2e73f20f6c..53f5f5592a 100644--- a/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java+++ b/server-core/src/main/java/io/onedev/server/util/xstream/CollectionConverter.java@@ -2,7 +2,7 @@ package io.onedev.server.util.xstream;import java.util.ArrayList;-import org.hibernate.collection.internal.PersistentBag;+import org.hibernate.collection.spi.PersistentBag;import com.thoughtworks.xstream.converters.MarshallingContext;import com.thoughtworks.xstream.converters.UnmarshallingContext;diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyMapper.java b/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyMapper.javanew file mode 100644index 0000000000..cfe27b4f02--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/xstream/HibernateProxyMapper.java@@ -0,0 +1,23 @@+package io.onedev.server.util.xstream;++import org.hibernate.proxy.HibernateProxy;++import com.thoughtworks.xstream.mapper.Mapper;+import com.thoughtworks.xstream.mapper.MapperWrapper;++/** Keeps generated proxy class names out of persistent XML documents. */+public class HibernateProxyMapper extends MapperWrapper {++ public HibernateProxyMapper(Mapper wrapped) {+ super(wrapped);+ }++ @Override+ @SuppressWarnings("rawtypes")+ public String serializedClass(Class type) {+ if (type != null && HibernateProxy.class.isAssignableFrom(type))+ return super.serializedClass(type.getSuperclass());+ return super.serializedClass(type);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.javaindex 69121ed8ad..8929b80ac7 100644--- a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java+++ b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java@@ -1,47 +1,47 @@-package io.onedev.server.util.xstream;--import java.lang.reflect.Field;--import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;--import com.thoughtworks.xstream.converters.MarshallingContext;-import com.thoughtworks.xstream.converters.UnmarshallingContext;-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;-import com.thoughtworks.xstream.mapper.Mapper;--import io.onedev.commons.loader.AppLoader;-import io.onedev.server.model.AbstractEntity;-import io.onedev.server.persistence.dao.Dao;--public class ReflectionConverter extends com.thoughtworks.xstream.converters.reflection.ReflectionConverter {-- public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider) {- super(mapper, reflectionProvider);- }-- @SuppressWarnings("rawtypes")- public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider, Class type) {- super(mapper, reflectionProvider, type);- }-- @Override- protected void marshallField(MarshallingContext context, Object newObj, Field field) {- if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null)- super.marshallField(context, ((AbstractEntity) newObj).getId(), field);- else- super.marshallField(context, newObj, field);- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- @Override- protected Object unmarshallField(UnmarshallingContext context, Object result, Class type, Field field) {- if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {- Long entityId = (Long) context.convertAnother(context.currentObject(), Long.class);- return AppLoader.getInstance(Dao.class).load((Class<? extends AbstractEntity>) field.getType(), entityId);- } else {- return super.unmarshallField(context, result, type, field);- }- }--}+package io.onedev.server.util.xstream;++import java.lang.reflect.Field;++import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;++import com.thoughtworks.xstream.converters.MarshallingContext;+import com.thoughtworks.xstream.converters.UnmarshallingContext;+import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;+import com.thoughtworks.xstream.mapper.Mapper;++import io.onedev.commons.loader.AppLoader;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.persistence.dao.Dao;++public class ReflectionConverter extends com.thoughtworks.xstream.converters.reflection.ReflectionConverter {++ public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider) {+ super(mapper, reflectionProvider);+ }++ @SuppressWarnings("rawtypes")+ public ReflectionConverter(Mapper mapper, ReflectionProvider reflectionProvider, Class type) {+ super(mapper, reflectionProvider, type);+ }++ @Override+ protected void marshallField(MarshallingContext context, Object newObj, Field field) {+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null)+ super.marshallField(context, ((AbstractEntity) newObj).getId(), field);+ else+ super.marshallField(context, newObj, field);+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected Object unmarshallField(UnmarshallingContext context, Object result, Class type, Field field) {+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {+ Long entityId = (Long) context.convertAnother(context.currentObject(), Long.class);+ return AppLoader.getInstance(Dao.class).load((Class<? extends AbstractEntity>) field.getType(), entityId);+ } else {+ return super.unmarshallField(context, result, type, field);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/validation/ShallowValidatorProvider.java b/server-core/src/main/java/io/onedev/server/validation/ShallowValidatorProvider.javaindex 01aed9372c..8d9ae9b095 100644--- a/server-core/src/main/java/io/onedev/server/validation/ShallowValidatorProvider.java+++ b/server-core/src/main/java/io/onedev/server/validation/ShallowValidatorProvider.java@@ -1,9 +1,9 @@package io.onedev.server.validation;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.validation.Validator;-import javax.validation.ValidatorFactory;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.validation.Validator;+import jakarta.validation.ValidatorFactory;import io.onedev.server.annotation.Shallow;diff --git a/server-core/src/main/java/io/onedev/server/validation/Validatable.java b/server-core/src/main/java/io/onedev/server/validation/Validatable.javaindex 5259666dc5..97cd08856e 100644--- a/server-core/src/main/java/io/onedev/server/validation/Validatable.java+++ b/server-core/src/main/java/io/onedev/server/validation/Validatable.java@@ -1,6 +1,6 @@package io.onedev.server.validation;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;public interface Validatable {diff --git a/server-core/src/main/java/io/onedev/server/validation/ValidatorProvider.java b/server-core/src/main/java/io/onedev/server/validation/ValidatorProvider.javaindex 79f7ac56ef..aa4fc66b5c 100644--- a/server-core/src/main/java/io/onedev/server/validation/ValidatorProvider.java+++ b/server-core/src/main/java/io/onedev/server/validation/ValidatorProvider.java@@ -1,9 +1,9 @@package io.onedev.server.validation;-import javax.inject.Inject;-import javax.inject.Provider;-import javax.validation.Validator;-import javax.validation.ValidatorFactory;+import jakarta.inject.Inject;+import jakarta.inject.Provider;+import jakarta.validation.Validator;+import jakarta.validation.ValidatorFactory;public class ValidatorProvider implements Provider<Validator> {diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.javaindex 22f1c27fd7..e7e381d41d 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.AgentQuery;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/AttributeNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/AttributeNameValidator.javaindex 9968423c83..2a62ec3658 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/AttributeNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/AttributeNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.model.Agent;import io.onedev.server.annotation.AttributeName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.javaindex 96c60678b0..b8aebf98c3 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/BranchNameValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.Repository;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.javaindex fe57f17b8d..4b09479eb0 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ClassValidatingValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ClassValidatingValidator.javaindex 875f04634c..7724d9caa9 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ClassValidatingValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ClassValidatingValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.javaindex 5ab090d77d..6783d4d077 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CommitHashValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CommitHashValidator.javaindex b140d7c16b..87ef2dc38f 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CommitHashValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CommitHashValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.javaindex 7b6d4bd292..490bf1cee0 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CronExpressionValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CronExpressionValidator.javaindex c00493f72f..3d765ff78e 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CronExpressionValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CronExpressionValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.text.ParseException;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.CronExpression;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CurrentPasswordValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CurrentPasswordValidator.javaindex 90eeb158e6..dabe9e347c 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CurrentPasswordValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CurrentPasswordValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.authc.UsernamePasswordToken;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/DataDirectoryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/DataDirectoryValidator.javaindex e1a284c05d..f311989b49 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/DataDirectoryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/DataDirectoryValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.io.File;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.annotation.DataDirectory;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/DnsNameValidator.javaindex ebd13d68dd..64777a9b11 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/DnsNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/DnsNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.DnsName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.javaindex 0af8595a85..3bfe2cab6e 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.java@@ -1,8 +1,8 @@package io.onedev.server.validation.validator;import javax.lang.model.SourceVersion;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.EnvVarName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/FieldNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/FieldNameValidator.javaindex 5040addfc4..0af0290903 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/FieldNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/FieldNameValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.model.Issue;import io.onedev.server.annotation.FieldName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/GroupNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/GroupNameValidator.javaindex 49cfbfd045..499861b4f4 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/GroupNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/GroupNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.GroupName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/InterpolativeValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/InterpolativeValidator.javaindex 8a38d1b8a0..fb5bf4ca06 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/InterpolativeValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/InterpolativeValidator.java@@ -4,8 +4,8 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.javaindex 317e42917e..48170880db 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/JobMatchValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/JobMatchValidator.javaindex c22b580387..1681a2e349 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/JobMatchValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/JobMatchValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.JobMatch;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/NoSpaceValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/NoSpaceValidator.javaindex d89a08acc9..4fdcb9bbfc 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/NoSpaceValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/NoSpaceValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.NoSpace;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/NotificationReceiverValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/NotificationReceiverValidator.javaindex 8508befe1a..a592f3e705 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/NotificationReceiverValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/NotificationReceiverValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/NumericValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/NumericValidator.javaindex 19eae68371..30bd0f02f2 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/NumericValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/NumericValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.Numeric;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PackQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PackQueryValidator.javaindex cb1598107e..2e5961680a 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PackQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PackQueryValidator.java@@ -4,8 +4,8 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.PackQuery;import io.onedev.server.model.Project;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;public class PackQueryValidator implements ConstraintValidator<PackQuery, String> {diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ParamNameValidator.javaindex 8e9ee937a7..8de6824d88 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ParamNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ParamNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.model.Build;import io.onedev.server.annotation.ParamName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PasswordValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PasswordValidator.javaindex 20cbf68b1a..13ef51971e 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PasswordValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PasswordValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.OneDev;import io.onedev.server.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PathSegmentValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PathSegmentValidator.javaindex 36e7b29412..c9f32fa365 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PathSegmentValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PathSegmentValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.nio.file.Paths;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.PathSegment;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PathValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PathValidator.javaindex 77dd1eaae6..85ea55d80e 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PathValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PathValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.List;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.apache.commons.io.FilenameUtils;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PatternsValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PatternsValidator.javaindex 759e0c1867..4c02d6902f 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PatternsValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PatternsValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectKeyValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectKeyValidator.javaindex d8d92a5274..c1ee14e35b 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectKeyValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectKeyValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import io.onedev.server.annotation.ProjectKey;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import java.util.regex.Pattern;public class ProjectKeyValidator implements ConstraintValidator<ProjectKey, String> {diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectNameValidator.javaindex f4eda3954b..234bf8b090 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.OneDev;import io.onedev.server.service.ProjectService;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectPathValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectPathValidator.javaindex ef51b7c406..ac72287ee7 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectPathValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectPathValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.ProjectPath;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.javaindex dafe539133..861af3bea1 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.ProjectQuery;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.javaindex a9adf8b967..34d97a4d54 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/RegExpValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/RegExpValidator.javaindex 5f31f74056..dd5bdbb26f 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/RegExpValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/RegExpValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.RegExp;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ReservedOptionsValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ReservedOptionsValidator.javaindex 2f1e5ae62a..92d70d6a90 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ReservedOptionsValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ReservedOptionsValidator.java@@ -3,8 +3,8 @@ package io.onedev.server.validation.validator;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.ReservedOptions;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import java.util.ArrayList;import java.util.Collection;import java.util.regex.Pattern;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ReviewRequirementValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ReviewRequirementValidator.javaindex 3e55e672ef..a941909307 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ReviewRequirementValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ReviewRequirementValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/RoleNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/RoleNameValidator.javaindex 703018e4c6..fe39c319c9 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/RoleNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/RoleNameValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.RoleName;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/TagNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/TagNameValidator.javaindex af85d1a3d1..9c5f3b2f12 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/TagNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/TagNameValidator.java@@ -4,8 +4,8 @@ import io.onedev.server.annotation.TagName;import io.onedev.server.git.GitUtils;import org.eclipse.jgit.lib.Repository;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;public class TagNameValidator implements ConstraintValidator<TagName, String> {diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/UrlPathValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/UrlPathValidator.javaindex 70df965072..fc8a5c4c2d 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/UrlPathValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/UrlPathValidator.java@@ -3,8 +3,8 @@ package io.onedev.server.validation.validator;import java.net.URISyntaxException;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import org.apache.http.client.utils.URIBuilder;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/UrlSegmentValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/UrlSegmentValidator.javaindex 2481c04e3d..c619b4dde5 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/UrlSegmentValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/UrlSegmentValidator.java@@ -2,8 +2,8 @@ package io.onedev.server.validation.validator;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.annotation.UrlSegment;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/UserMatchValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/UserMatchValidator.javaindex a00d6b5170..3f69e9c40a 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/UserMatchValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/UserMatchValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.UserMatch;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/UserNameValidator.javaindex 367183f70f..ca90da7b2a 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/UserNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/UserNameValidator.java@@ -3,8 +3,8 @@ package io.onedev.server.validation.validator;import java.util.concurrent.Callable;import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/WorkspaceQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/WorkspaceQueryValidator.javaindex 4d2a1a58bf..8c17bad0f6 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/WorkspaceQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/WorkspaceQueryValidator.java@@ -1,7 +1,7 @@package io.onedev.server.validation.validator;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.WorkspaceQuery;diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultWicketFilter.java b/server-core/src/main/java/io/onedev/server/web/DefaultWicketFilter.javaindex 53fb7e42c5..42283d5a89 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultWicketFilter.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultWicketFilter.java@@ -3,7 +3,6 @@ package io.onedev.server.web;import org.apache.wicket.protocol.http.IWebApplicationFactory;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.protocol.http.WicketFilter;-import org.eclipse.jetty.websocket.api.WebSocketPolicy;import com.google.inject.Inject;import com.google.inject.Singleton;@@ -17,7 +16,7 @@ public class DefaultWicketFilter extends WebSocketFilter {@Injectpublic DefaultWicketFilter(WebApplication application) {- super(WebSocketPolicy.newServerPolicy());+ super();this.application = application;setFilterPath("");diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.javaindex 31180e7ea0..eeffba4a79 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java@@ -2,12 +2,12 @@ package io.onedev.server.web;import java.io.IOException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.protocol.http.WicketFilter;import org.apache.wicket.protocol.http.WicketServlet;diff --git a/server-core/src/main/java/io/onedev/server/web/KeepSessionAliveServlet.java b/server-core/src/main/java/io/onedev/server/web/KeepSessionAliveServlet.javaindex ca6dcae1ab..465b289895 100644--- a/server-core/src/main/java/io/onedev/server/web/KeepSessionAliveServlet.java+++ b/server-core/src/main/java/io/onedev/server/web/KeepSessionAliveServlet.java@@ -2,10 +2,10 @@ package io.onedev.server.web;import java.io.IOException;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;public class KeepSessionAliveServlet extends HttpServlet {diff --git a/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.java b/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.javaindex 81ac354b78..58fc99171b 100644--- a/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.java+++ b/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.java@@ -6,9 +6,9 @@ import org.apache.wicket.request.IRequestHandler;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;public final class ResourceErrorRequestHandler implements IRequestHandler {diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex 2e7aa6c819..b74cc502f2 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -1,15 +1,12 @@package io.onedev.server.web;import java.io.IOException;+import java.time.Duration;import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.Set;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import java.util.function.Supplier;import org.apache.wicket.Application;import org.apache.wicket.Component;@@ -20,7 +17,6 @@ import org.apache.wicket.RuntimeConfigurationType;import org.apache.wicket.Session;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.AjaxRequestTarget.IJavaScriptResponse;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.application.IComponentInstantiationListener;import org.apache.wicket.behavior.AttributeAppender;@@ -58,12 +54,10 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandleimport org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.request.mapper.info.PageComponentInfo;-import org.apache.wicket.request.resource.JavaScriptResourceReference;import org.apache.wicket.resource.JQueryResourceReference;-import org.apache.wicket.util.IProvider;import org.apache.wicket.util.file.IResourceFinder;+import org.apache.wicket.util.lang.Bytes;import org.apache.wicket.util.resource.IResourceStream;-import org.apache.wicket.util.time.Duration;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AppLoader;@@ -78,6 +72,7 @@ import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.error.GeneralErrorPage;import io.onedev.server.web.page.error.InUseErrorPage;+import io.onedev.server.web.page.store.PageManagerProvider;import io.onedev.server.web.resource.SpriteResourceReference;import io.onedev.server.web.resource.SpriteResourceStream;import io.onedev.server.web.resourcebundle.ResourceBundleReferences;@@ -87,6 +82,10 @@ import io.onedev.server.web.translation.TranslationTagHandler;import io.onedev.server.web.util.AbsoluteUrlRenderer;import io.onedev.server.web.websocket.WebSocketMessages;import io.onedev.server.web.websocket.WebSocketService;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;@Singletonpublic class WebApplication extends org.apache.wicket.protocol.http.WebApplication {@@ -110,6 +109,10 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicatiprotected void init() {super.init();+ // OneDev's components and Markdown integrations require unrestricted inline scripts and styles.+ getCspSettings().blocking().disabled();+ getCspSettings().reporting().disabled();+getDebugSettings().setAjaxDebugModeEnabled(false);getMarkupSettings().setDefaultMarkupEncoding("UTF-8");@@ -146,21 +149,15 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati});- getJavaScriptLibrarySettings().setJQueryReference(new JavaScriptResourceReference(- JQueryResourceReference.class, "jquery/jquery-3.5.1.min.js"));+ getJavaScriptLibrarySettings().setJQueryReference(JQueryResourceReference.getV3());getStoreSettings().setFileStoreFolder(Bootstrap.getTempDir());+ getStoreSettings().setMaxSizePerSession(Bytes.megabytes(50));- /*- * We disabled session store of pages to reduce memory usage at peak time. However, when- * a user visits the page, the page instance may not get written to disk timely due to- * page synchronous writing. So adding an in-memory cache is important to compensate the- * page written latency; otherwise, user may experience odd exceptions such as- * ComponentNotFound when visit a page instance again after it is being created- */- getStoreSettings().setInmemoryCacheSize(1000);+ // Store pages synchronously on disk and load them on demand to reduce heap usage.+ setPageManagerProvider(new PageManagerProvider(this));- getRequestCycleSettings().setTimeout(Duration.minutes(30));+ getRequestCycleSettings().setTimeout(Duration.ofMinutes(30));getComponentInstantiationListeners().add(new GuiceComponentInjector(this, AppLoader.injector));getComponentInstantiationListeners().add(new IComponentInstantiationListener() {@@ -204,9 +201,9 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati}@Override- public void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {+ public void onAfterRespond(Map<String, Component> map, AjaxRequestTarget response) {if (!map.isEmpty()) {- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null)OneDev.getInstance(WebSocketService.class).observe((BasePage) target.getPage());}@@ -278,8 +275,8 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati}@Override- public final IProvider<IExceptionMapper> getExceptionMapperProvider() {- return new IProvider<>() {+ public final Supplier<IExceptionMapper> getExceptionMapperProvider() {+ return new Supplier<>() {@Overridepublic IExceptionMapper get() {diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.javaindex bef268cf28..50960653db 100644--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java@@ -4,7 +4,7 @@ import java.time.ZoneId;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;-import javax.servlet.http.HttpSession;+import jakarta.servlet.http.HttpSession;import org.apache.shiro.SecurityUtils;import org.apache.wicket.protocol.http.WicketServlet;diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.javaindex b4fc2e1e5b..c78e9726d2 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarService.java@@ -15,8 +15,8 @@ import java.io.Serializable;import java.security.NoSuchAlgorithmException;import java.util.UUID;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.codec.binary.Hex;import org.eclipse.jgit.lib.PersonIdent;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.javaindex 786c2c9b4b..a330d1536b 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java@@ -1,5 +1,7 @@package io.onedev.server.web.behavior.blamemessage;+import java.util.Date;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -30,9 +32,9 @@ public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {if (commit.getAuthorIdent() != null) {authoring = commit.getAuthorIdent().getName();if (commit.getCommitterIdent() != null) {- authoring += " " + DateUtils.formatAge(commit.getCommitterIdent().getWhen());+ authoring += " " + DateUtils.formatAge(Date.from(commit.getCommitterIdent().getWhenAsInstant()));authoringTitle = "'" + JavaScriptEscape.escapeJavaScript(- DateUtils.formatDateTime(commit.getCommitterIdent().getWhen())) + "'";+ DateUtils.formatDateTime(Date.from(commit.getCommitterIdent().getWhenAsInstant()))) + "'";} else {authoringTitle = "undefined";}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.javaindex 139f86f1d4..4d97ae3871 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverBehavior.java@@ -73,7 +73,7 @@ public abstract class DropdownHoverBehavior extends AbstractPostAjaxBehavior {protected void onClosed() {super.onClosed();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null) {String script = String.format("onedev.server.dropdownHover.closed('%s', '%s');",getComponent().getMarkupId(true), getMarkupId(true));diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.javaindex 6f05ffff6d..aebab87b48 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.visit.IVisitor;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.javaindex c5baee951d..1be9cb18f2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.unbescape.html.HtmlEscape;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.java b/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.javaindex fe24e21509..1cc2b75c23 100644--- a/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/AjaxLazyLoadPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import io.onedev.server.web.page.base.BasePage;-public abstract class AjaxLazyLoadPanel extends org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel {+public abstract class AjaxLazyLoadPanel extends org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel<Component> {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/component/RepeatingView.java b/server-core/src/main/java/io/onedev/server/web/component/RepeatingView.javanew file mode 100644index 0000000000..450fc0c63f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/RepeatingView.java@@ -0,0 +1,68 @@+package io.onedev.server.web.component;++import java.util.ArrayList;+import java.util.Collections;+import java.util.Comparator;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.Component;++/** A repeating view whose children can be reordered without detaching their feedback panels. */+public class RepeatingView extends org.apache.wicket.markup.repeater.RepeatingView {++ private static final long serialVersionUID = 1L;++ private List<String> childOrder = List.of();++ public RepeatingView(String id) {+ super(id);+ }++ private List<Component> orderedChildren() {+ List<Component> children = new ArrayList<>();+ super.iterator().forEachRemaining(children::add);+ if (!childOrder.isEmpty()) {+ children.sort(Comparator.comparingInt(component -> {+ int index = childOrder.indexOf(component.getId());+ return index >= 0 ? index : Integer.MAX_VALUE;+ }));+ }+ return children;+ }++ public Component get(int index) {+ return orderedChildren().get(index);+ }++ public void swap(int first, int second) {+ List<Component> children = orderedChildren();+ Collections.swap(children, first, second);+ childOrder = children.stream().map(Component::getId).toList();+ }++ @Override+ public Iterator<Component> iterator() {+ Iterator<Component> iterator = orderedChildren().iterator();+ return new Iterator<>() {+ private Component current;++ @Override+ public boolean hasNext() {+ return iterator.hasNext();+ }++ @Override+ public Component next() {+ current = iterator.next();+ return current;+ }++ @Override+ public void remove() {+ iterator.remove();+ RepeatingView.this.remove(current);+ }+ };+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.javaindex dd932a2420..a8ca3557b1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java@@ -12,8 +12,8 @@ import java.util.Date;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.Component;@@ -31,8 +31,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -310,7 +309,7 @@ public class ChatPanel extends Panel {}};- respondingContainer.add(new MarkdownViewer("content", new AbstractReadOnlyModel<String>() {+ respondingContainer.add(new MarkdownViewer("content", new IModel<String>() {@Overridepublic String getObject() {@@ -370,7 +369,7 @@ public class ChatPanel extends Panel {form.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {// Submit button is only enabled when input is not empty, so we can safely// assume that WebSession.get().getChatInput() is not null at this pointvar input = WebSession.get().getChatInput().trim();@@ -495,7 +494,6 @@ public class ChatPanel extends Panel {return Collections.emptyList();}- @SuppressWarnings("deprecation")private void showNewMessages(IPartialPageRequestHandler handler) {long prevLastMessageId;if (messagesView.size() != 0)diff --git a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.javaindex e06bd4822b..77048f5aff 100644--- a/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java+++ b/server-core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java@@ -6,7 +6,7 @@ import java.io.File;import java.io.IOException;import javax.imageio.ImageIO;-import javax.xml.bind.DatatypeConverter;+import java.util.Base64;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.event.Broadcast;@@ -70,7 +70,7 @@ public class AvatarUploadField extends FormComponentPanel<String> {}public static void writeToFile(File file, String avatarData) {- byte[] imageBytes = DatatypeConverter.parseBase64Binary(StringUtils.substringAfter(avatarData, ","));+ byte[] imageBytes = Base64.getDecoder().decode(StringUtils.substringAfter(avatarData, ","));try {BufferedImage image = ImageIO.read(new ByteArrayInputStream(imageBytes));ImageIO.write(image, "png", file);diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex 3969067bba..915dac0675 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -39,7 +39,7 @@ abstract class BeanEditContentPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -74,8 +74,9 @@ abstract class BeanEditContentPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);var errorMessage = onSave(target);if (errorMessage != null) {form.error(errorMessage);diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.javaindex 59553fd8a7..deda570b5e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java@@ -18,7 +18,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.FileMode;@@ -72,7 +71,7 @@ public abstract class BlobFolderSelector extends Panel {return Model.of(object);}- }, new AbstractReadOnlyModel<Set<BlobIdent>>() {+ }, new IModel<Set<BlobIdent>>() {@Overridepublic Set<BlobIdent> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.javaindex f2923892e2..ae8e9eff5d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java@@ -11,7 +11,6 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;@@ -40,7 +39,7 @@ public abstract class BlobPicker extends DropdownLink {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {if (commitModel.getObject() != null) {- IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {+ IModel<Project> projectModel = new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.javaindex dd2de65692..f0baf0ff04 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java@@ -17,7 +17,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -82,7 +81,7 @@ public abstract class BlobSelector extends Panel {return Model.of(object);}- }, new AbstractReadOnlyModel<Set<BlobIdent>>() {+ }, new IModel<Set<BlobIdent>>() {@Overridepublic Set<BlobIdent> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchBean.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchBean.javaindex e2d8d8b3d8..71f1e217d7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchBean.java@@ -2,11 +2,11 @@ package io.onedev.server.web.component.branch.create;import java.io.Serializable;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.validation.Validatable;import io.onedev.server.annotation.ClassValidating;diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.javaindex 8ea0861405..ac8a15dc91 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java@@ -51,8 +51,9 @@ public abstract class CreateBranchPanel extends Panel {form.add(new AjaxButton("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);Project project = projectModel.getObject();User user = SecurityUtils.getAuthUser();@@ -79,8 +80,9 @@ public abstract class CreateBranchPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex ff2bf57834..1120fc7034 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -41,8 +41,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -787,8 +786,8 @@ public abstract class BuildListPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);if (getProject() != null) {var oldAuditContent = VersionedXmlDoc.fromBean(getProject().getBuildSetting().getListParams(true)).toXML();getProject().getBuildSetting().setListParams(listParams);@@ -861,7 +860,7 @@ public abstract class BuildListPanel extends Panel {public void setObject(EntityQuery<Build> object) {BuildListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -906,7 +905,7 @@ public abstract class BuildListPanel extends Panel {query = new BuildQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -922,7 +921,7 @@ public abstract class BuildListPanel extends Panel {extraActionsView.add(renderer.render(extraActionsView.newChildId()));queryInput = new TextField<String>("input", queryStringModel);- queryInput.add(new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {+ queryInput.add(new BuildQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {@@ -960,8 +959,8 @@ public abstract class BuildListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);BuildListPanel.this.getFeedbackMessages().clear();doQuery(target);}@@ -1113,7 +1112,7 @@ public abstract class BuildListPanel extends Panel {}}));- link.add(new Label("caption", new AbstractReadOnlyModel<String>() {+ link.add(new Label("caption", new IModel<String>() {@Overridepublic String getObject() {@@ -1258,7 +1257,7 @@ public abstract class BuildListPanel extends Panel {Long buildId = build.getId();Fragment fragment = new Fragment(componentId, "dateFrag", BuildListPanel.this);- fragment.add(new Label("name", new AbstractReadOnlyModel<String>() {+ fragment.add(new Label("name", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 03dcbdc9c1..db52607776 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -22,7 +22,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -395,7 +394,7 @@ public abstract class BuildSidePanel extends Panel {} else {labelsContainer.add(new WebMarkupContainer("head"));}- labelsContainer.add(new EntityLabelsPanel<BuildLabel>("body", new AbstractReadOnlyModel<Build>() {+ labelsContainer.add(new EntityLabelsPanel<BuildLabel>("body", new IModel<Build>() {@Overridepublic Build getObject() {@@ -475,7 +474,7 @@ public abstract class BuildSidePanel extends Panel {String title = Emojis.getInstance().apply(request.getTitle());link.add(new Label("label", "#" + request.getNumber() + " " + title));add(link);- add(new RequestStatusBadge("status", new AbstractReadOnlyModel<PullRequest>() {+ add(new RequestStatusBadge("status", new IModel<PullRequest>() {@Overridepublic PullRequest getObject() {@@ -491,6 +490,7 @@ public abstract class BuildSidePanel extends Panel {@Overrideprotected void onConfigure() {+ super.onConfigure();setVisible(getBuild().getRequest() != null && SecurityUtils.canReadCode(getProject()));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.javaindex 623e3ddc1b..5a95986e66 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java@@ -5,7 +5,6 @@ import java.util.Collection;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.jspecify.annotations.Nullable;@@ -37,7 +36,7 @@ public class BuildStatusIcon extends SpriteImage {protected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex f6eac2ed90..f10eaec60e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -41,7 +41,6 @@ import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -637,7 +636,7 @@ public abstract class CodeCommentListPanel extends Panel {CodeCommentListPanel.this.getFeedbackMessages().clear();queryModel.setObject((CodeCommentQuery) object);queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -674,7 +673,7 @@ public abstract class CodeCommentListPanel extends Panel {query.setSorts(object);queryModel.setObject(query);queryStringModel.setObject(query.toString());- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -685,7 +684,7 @@ public abstract class CodeCommentListPanel extends Panel {});queryInput = new TextField<>("input", queryStringModel);- queryInput.add(new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {+ queryInput.add(new CodeCommentQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {@@ -717,8 +716,8 @@ public abstract class CodeCommentListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);CodeCommentListPanel.this.getFeedbackMessages().clear();doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 69eabc94e5..0e28faad81 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -30,11 +30,11 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;@@ -242,14 +242,14 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content.length() > CodeComment.MAX_CONTENT_LEN) {@@ -439,7 +439,6 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {add(new ChangeObserver() {@Override- @SuppressWarnings("deprecation")public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {Component prevActivityContainer;if (activitiesView.size() > 0)@@ -486,7 +485,7 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {});- RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {@Overridepublic void onEndRequest(RequestCycle cycle) {@@ -605,14 +604,14 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content != null && content.length() > CodeCommentReply.MAX_CONTENT_LEN) {@@ -808,7 +807,7 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {public void setObject(String object) {CodeCommentReply reply = getReply();reply.setContent(object);- onSaveCommentReply(RequestCycle.get().find(AjaxRequestTarget.class), reply);+ onSaveCommentReply(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), reply);}}, null) {@@ -886,14 +885,14 @@ public abstract class CodeCommentPanel extends Panel implements ChatToolAware {form.add(new AjaxButton("save") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content.length() > CodeCommentReply.MAX_CONTENT_LEN) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.javaindex 664e75733e..da0f262594 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java@@ -37,7 +37,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -309,14 +309,12 @@ public abstract class CommandPalettePanel extends Panel {super.onComponentTag(tag);if (url != null) {if (url.startsWith("/")) {- tag.put("onclick", String.format("javascript:window.location='%s';", url));+ tag.put("onclick", String.format("window.location='%s';", JavaScriptEscape.escapeJavaScript(url)));} else {String projectPath = ((ProjectPage)getPage()).getProject().getPath();- tag.put("onclick", String.format("javascript:window.location='/%s/%s';", projectPath, url));+ tag.put("onclick", String.format("window.location='%s';", JavaScriptEscape.escapeJavaScript(String.format("/%s/%s", projectPath, url))));}}- else- tag.put("onclick", "javascript:void(0);");if (searchBase != null)tag.put("data-completion", searchBase);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentHistoryLink.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentHistoryLink.javaindex f31a692d51..5afbcf58d6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentHistoryLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentHistoryLink.java@@ -12,7 +12,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.hibernate.proxy.HibernateProxyHelper;+import io.onedev.server.util.HibernateProxyHelper;import io.onedev.server.OneDev;import io.onedev.server.model.support.CommentRevision;diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.javaindex 64fc2ff4b0..0362916dbf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java@@ -21,7 +21,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;@@ -73,7 +72,7 @@ public abstract class CommentPanel extends Panel {@Overridepublic void setObject(String object) {- onSaveComment(RequestCycle.get().find(AjaxRequestTarget.class), object);+ onSaveComment(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), object);}}, getContentVersionSupport()) {@@ -86,7 +85,7 @@ public abstract class CommentPanel extends Panel {});- viewer.add(new Label("noContent", new AbstractReadOnlyModel<String>() {+ viewer.add(new Label("noContent", new IModel<String>() {@Overridepublic String getObject() {@@ -147,7 +146,7 @@ public abstract class CommentPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {try {if (lastVersion != getVersion())throw new StaleStateException("");@@ -165,8 +164,8 @@ public abstract class CommentPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@@ -216,7 +215,7 @@ public abstract class CommentPanel extends Panel {});- viewer.add(new CopyToClipboardLink("copy", new AbstractReadOnlyModel<String>() {+ viewer.add(new CopyToClipboardLink("copy", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/CommitLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/CommitLink.javaindex 9a47aed71b..0afc7932cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/CommitLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/CommitLink.java@@ -1,6 +1,6 @@package io.onedev.server.web.component.commit;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.model.IModel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 63991b7381..1b60dc3eda 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.commit.list;+import java.util.Date;+import static io.onedev.server.web.translation.Translation._T;import java.time.LocalDate;@@ -12,7 +14,7 @@ import java.util.Map;import java.util.Stack;import java.util.regex.Pattern;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -34,8 +36,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -125,7 +126,7 @@ public abstract class CommitListPanel extends Panel {List<RevCommit> separated = new ArrayList<>();LocalDate groupDate = null;for (RevCommit commit: commits) {- var commitDate = DateUtils.toLocalDate(commit.getCommitterIdent().getWhen());+ var commitDate = DateUtils.toLocalDate(Date.from(commit.getCommitterIdent().getWhenAsInstant()));if (groupDate == null || commitDate.toEpochDay() != groupDate.toEpochDay()) {groupDate = commitDate;separated.add(null);@@ -375,7 +376,7 @@ public abstract class CommitListPanel extends Panel {public void setObject(CommitQuery object) {CommitListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -391,7 +392,7 @@ public abstract class CommitListPanel extends Panel {});queryInput = new TextField<String>("input", queryStringModel);- queryInput.add(new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {+ queryInput.add(new CommitQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {@@ -424,8 +425,8 @@ public abstract class CommitListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);CommitListPanel.this.getFeedbackMessages().clear();doQuery(target);}@@ -571,7 +572,6 @@ public abstract class CommitListPanel extends Panel {return commitsView;}- @SuppressWarnings("deprecation")private Component replaceItem(AjaxRequestTarget target, int index) {Component item = commitsView.get(index);Component newItem = newCommitItem(item.getId(), index);@@ -753,7 +753,7 @@ public abstract class CommitListPanel extends Panel {item.add(AttributeAppender.append("class", "commit"));} else {item = new Fragment(itemId, "dateFrag", this);- item.add(new Label("date", DateUtils.formatDate(current.get(index+1).getCommitterIdent().getWhen())));+ item.add(new Label("date", DateUtils.formatDate(Date.from(current.get(index+1).getCommitterIdent().getWhenAsInstant()))));item.add(AttributeAppender.append("class", "date"));}item.setOutputMarkupId(true);diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.htmlindex 6f64d45ea9..8996d4a0d9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="commit-message d-flex align-items-center flex-wrap"><span wicket:id="summary" class="summary text-break"></span>- <a class="btn btn-xs h-75 btn-secondary btn-icon ml-2" href="javascript:void(0);" t:data-tippy-content="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle">+ <a class="btn btn-xs h-75 btn-secondary btn-icon ml-2" href="#" t:data-tippy-content="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize(); return false;" wicket:id="toggle"><wicket:svg href="ellipsis" class="icon"/></a><pre wicket:id="detail" class="detail text-break w-100"></pre>diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.javaindex 458b41b0c0..016bba81f4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java@@ -11,7 +11,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -95,7 +94,7 @@ public abstract class CommitMessagePanel extends Panel {}).setEscapeModelStrings(false));- add(new Label("detail", new AbstractReadOnlyModel<String>() {+ add(new Label("detail", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.javaindex 6b295c38de..78b4c0ff3e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java@@ -12,7 +12,6 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.ObjectId;@@ -98,7 +97,7 @@ public abstract class CommitStatusLink extends DropdownLink {});- add(AttributeAppender.replace("title", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.replace("title", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.javaindex d729ccd0d6..175adf91c6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.contributorpanel;+import java.util.Date;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;@@ -35,8 +37,8 @@ public class ContributorPanel extends Panel {fragment.add(new PersonIdentPanel("committer", committer, "Committer", Mode.NAME));}fragment.add(new PersonIdentPanel("author", author, "Author", Mode.NAME));- fragment.add(new Label("date", DateUtils.formatAge(committer.getWhen()))- .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(committer.getWhen()))));+ fragment.add(new Label("date", DateUtils.formatAge(Date.from(committer.getWhenAsInstant())))+ .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(Date.from(committer.getWhenAsInstant())))));add(fragment);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagBean.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagBean.javaindex 15e127aabe..4a36d406f1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagBean.java@@ -2,11 +2,11 @@ package io.onedev.server.web.component.createtag;import java.io.Serializable;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.validation.Validatable;import io.onedev.server.annotation.ClassValidating;diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.javaindex 1b03b084f3..4f7ddb9509 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java@@ -56,8 +56,9 @@ public abstract class CreateTagPanel extends Panel {form.add(new AjaxButton("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);Project project = projectModel.getObject();String tagName = helperBean.getName();@@ -87,8 +88,9 @@ public abstract class CreateTagPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.javaindex 4cd7cb5f7e..7a8a25ed03 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java@@ -5,7 +5,7 @@ import java.util.Iterator;import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.hibernate.criterion.Order;+import io.onedev.server.persistence.dao.Order;import io.onedev.commons.loader.AppLoader;import io.onedev.server.model.AbstractEntity;diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.javaindex 05dbcbff11..4fb7372488 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.java@@ -9,7 +9,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractToolimport org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.jspecify.annotations.Nullable;import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;@@ -21,7 +21,7 @@ public class ListNavigationToolbar extends AbstractToolbar {super(table);var span = new WebMarkupContainer("span");- span.add(AttributeModifier.replace("colspan", new AbstractReadOnlyModel<String>() {+ span.add(AttributeModifier.replace("colspan", new IModel<String>() {@Overridepublic String getObject() {@@ -29,7 +29,7 @@ public class ListNavigationToolbar extends AbstractToolbar {}}));- span.add(new Label("count", new AbstractReadOnlyModel<String>() {+ span.add(new Label("count", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.javaindex a9034322ad..e93f5aa123 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java@@ -6,7 +6,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.tika.mime.MediaType;import org.apache.wicket.Component;@@ -20,7 +20,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.diff.DiffEntry.ChangeType;@@ -182,19 +181,19 @@ public class BlobDiffPanel extends Panel {}};- toggleReviewedLink.add(new SpriteImage("icon", new AbstractReadOnlyModel<>() {+ toggleReviewedLink.add(new SpriteImage("icon", new IModel<>() {@Overridepublic String getObject() {return reviewed ? "tick-box" : "square";}}));- toggleReviewedLink.add(AttributeAppender.append("data-tippy-content", new AbstractReadOnlyModel<String>() {+ toggleReviewedLink.add(AttributeAppender.append("data-tippy-content", new IModel<String>() {@Overridepublic String getObject() {return reviewed ? _T("Set unreviewed") : _T("Set reviewed");}}));- toggleReviewedLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ toggleReviewedLink.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return reviewed ? "link-primary" : "";@@ -224,7 +223,7 @@ public class BlobDiffPanel extends Panel {target.add(this);}- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ }.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -356,7 +355,7 @@ public class BlobDiffPanel extends Panel {}}}- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return collapsed ? "blob-diff collapsed" : "blob-diff";diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.javaindex bdac22576f..14fac7dd21 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.diff.blob.text;+import java.util.Date;+import static io.onedev.server.codequality.BlobTarget.groupByLine;import static io.onedev.server.util.diff.DiffRenderer.toHtml;import static io.onedev.server.web.translation.Translation._T;@@ -14,7 +16,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.Strings;import org.apache.wicket.Component;@@ -28,7 +30,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.IRequestParameters;@@ -481,7 +482,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {};add(symbolTooltip);- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -575,7 +576,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {script = String.format("onedev.server.blobTextDiff.onLoad('%s', %s);",getMarkupId(),- RequestCycle.get().find(AjaxRequestTarget.class) == null? jsonOfMarkRange: "null");+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null) == null? jsonOfMarkRange: "null");response.render(OnLoadHeaderItem.forScript(script));}@@ -749,7 +750,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {if (diffMode == DiffViewMode.UNIFIED) {builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' onclick='onedev.server.viewState.getFromViewAndSetToHistory();' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),- DateUtils.formatDate(commit.getCommitter().getWhen()),+ DateUtils.formatDate(Date.from(commit.getCommitter().getWhenAsInstant())),HtmlEscape.escapeHtml5(commit.getAuthor().getName())));} else {builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' onclick='onedev.server.viewState.getFromViewAndSetToHistory();' data-hash='%s'>%s</a></td>",@@ -1011,10 +1012,10 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {private String expanderLink(String cssClass, String tooltip, String svg, int blockIndex,String direction) {- String script = String.format("javascript:$('#%s').data('callback')('expand', %d, '%s');",- getMarkupId(), blockIndex, direction);+ String script = String.format("$('#%s').data('callback')('expand', %d, '%s'); return false;",+ getMarkupId(), blockIndex, direction);return "<a class='" + cssClass + "' aria-label='" + tooltip- + "' data-tippy-content='" + tooltip + "' href=\"" + script + "\">" + svg + "</a>";+ + "' data-tippy-content='" + tooltip + "' href='#' onclick=\"" + script + "\">" + svg + "</a>";}private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines,diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex cae987e1ed..5c8d6b7552 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -18,8 +18,8 @@ import java.util.Set;import java.util.TreeMap;import java.util.UUID;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.commons.codec.binary.Hex;import org.apache.wicket.Component;@@ -49,7 +49,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -356,7 +355,7 @@ public abstract class RevisionDiffPanel extends Panel {@Overridepublic void setObject(String object) {- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);String prevBlameFile = blameModel.getObject();blameModel.setObject(object);if (prevBlameFile != null && object != null && !prevBlameFile.equals(object)) {@@ -451,7 +450,7 @@ public abstract class RevisionDiffPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("count", new AbstractReadOnlyModel<String>() {+ add(new Label("count", new IModel<String>() {@Overridepublic String getObject() {@@ -707,8 +706,8 @@ public abstract class RevisionDiffPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);doFilter(target);}@@ -749,7 +748,7 @@ public abstract class RevisionDiffPanel extends Panel {target.add(this);}- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ }.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {navigationContainer.configure();@@ -771,7 +770,7 @@ public abstract class RevisionDiffPanel extends Panel {body.add(commentContainer = newCommentContainer());body.add(navigationContainer = newNavigationContainer());- body.add(new Label("tooManyFiles", new AbstractReadOnlyModel<String>() {+ body.add(new Label("tooManyFiles", new IModel<String>() {@Overridepublic String getObject() {@@ -788,7 +787,7 @@ public abstract class RevisionDiffPanel extends Panel {});- body.add(diffsView = new ListView<BlobChange>("diffs", new AbstractReadOnlyModel<>() {+ body.add(diffsView = new ListView<BlobChange>("diffs", new IModel<>() {@Overridepublic List<BlobChange> getObject() {@@ -952,14 +951,14 @@ public abstract class RevisionDiffPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content.length() > CodeComment.MAX_CONTENT_LEN) {@@ -1226,7 +1225,7 @@ public abstract class RevisionDiffPanel extends Panel {}});- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -1466,7 +1465,7 @@ public abstract class RevisionDiffPanel extends Panel {protected Component newContentComponent(String id, IModel<String> model) {var path = model.getObject();var fragment = new Fragment(id, "navTreeNodeFrag", RevisionDiffPanel.this);- fragment.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ fragment.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return path.equals(selectedPath) ? "active" : "";@@ -1633,7 +1632,7 @@ public abstract class RevisionDiffPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(AttributeAppender.replace("data-tippy-content", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.replace("data-tippy-content", new IModel<String>() {@Overridepublic String getObject() {@@ -2179,14 +2178,14 @@ public abstract class RevisionDiffPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content.length() > CodeComment.MAX_CONTENT_LEN) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.javaindex f84abb549d..addc0c8019 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.javaindex bf108d1c20..86085c22a7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;public class DiffStatBar extends Panel {@@ -30,7 +30,7 @@ public class DiffStatBar extends Panel {protected void onInitialize() {super.onInitialize();- add(new Label("additions", new AbstractReadOnlyModel<String>() {+ add(new Label("additions", new IModel<String>() {@Overridepublic String getObject() {@@ -42,7 +42,7 @@ public class DiffStatBar extends Panel {}).setEscapeModelStrings(false));- add(new Label("deletions", new AbstractReadOnlyModel<String>() {+ add(new Label("deletions", new IModel<String>() {@Overridepublic String getObject() {@@ -53,7 +53,7 @@ public class DiffStatBar extends Panel {}}).setEscapeModelStrings(false));- add(new Label("spacer", new AbstractReadOnlyModel<String>() {+ add(new Label("spacer", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.javaindex 367ca52fde..16bcd198f2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java@@ -190,10 +190,10 @@ public class PlainTextDiffPanel extends Panel {private String expanderLink(String cssClass, String tooltip, String svg, int blockIndex,String direction) {- String script = String.format("javascript:$('#%s').data('callback')('expand', %d, '%s');",+ String script = String.format("$('#%s').data('callback')('expand', %d, '%s'); return false;",getMarkupId(), blockIndex, direction);return "<a class='" + cssClass + "' aria-label='" + tooltip- + "' data-tippy-content='" + tooltip + "' href=\"" + script + "\">" + svg + "</a>";+ + "' data-tippy-content='" + tooltip + "' href='#' onclick=\"" + script + "\">" + svg + "</a>";}private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines,diff --git a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.javaindex 5842f342b8..b533c96d2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java+++ b/server-core/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java@@ -6,7 +6,7 @@ import io.onedev.server.OneDev;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.upload.FileUpload;import io.onedev.server.web.upload.UploadService;-import org.apache.commons.fileupload.FileUploadException;+import org.apache.commons.fileupload2.core.FileUploadException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.CallbackParameter;@@ -89,7 +89,8 @@ public class DropzoneField extends FormComponentPanel<String> {upload = new FileUpload(uploadId, new ArrayList<>());getUploadService().cacheUpload(upload);}- upload.getItems().addAll(multiPartRequest.getFiles().get("file"));+ for (var item : multiPartRequest.getFiles().get("file"))+ upload.getItems().add(item);} catch (FileUploadException e) {throw new RuntimeException(e);}@@ -114,7 +115,11 @@ public class DropzoneField extends FormComponentPanel<String> {for (var it = upload.getItems().iterator(); it.hasNext();) {var item = it.next();if (item.getName().equals(fileName)) {- item.delete();+ try {+ item.delete();+ } catch (java.io.IOException e) {+ throw new RuntimeException("Unable to delete uploaded file", e);+ }it.remove();}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.javaindex 6b759514c2..bd90590ad0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.protocol.http.WebSession;import io.onedev.commons.utils.WordUtils;@@ -125,7 +125,7 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {});- add(new Label("current", new AbstractReadOnlyModel<String>() {+ add(new Label("current", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.javaindex 1dab87e632..5aeefbc85d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java@@ -110,7 +110,7 @@ public abstract class FloatingPanel extends Panel {}public final void close() {- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null) {String script = String.format("onedev.server.floating.close('%s');", getMarkupId(true));target.appendJavaScript(script);diff --git a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.javaindex a88b4ebb2a..041e192ae8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java@@ -9,7 +9,6 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.svg.SpriteImage;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.revwalk.RevObject;@@ -34,7 +33,7 @@ public abstract class SignatureStatusPanel extends DropdownLink {super.onInitialize();setEscapeModelStrings(false);- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -75,6 +74,7 @@ public abstract class SignatureStatusPanel extends DropdownLink {@Overrideprotected void onConfigure() {+ super.onConfigure();setVisible(model.getObject() != null);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex dd1f05f70d..ecc6f2da33 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -9,8 +9,8 @@ import java.util.Comparator;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;@@ -28,8 +28,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;@@ -192,7 +192,6 @@ public abstract class IssueActivitiesPanel extends Panel {updateActivities(handler);}- @SuppressWarnings("deprecation")private void updateActivities(IPartialPageRequestHandler handler) {Component prevActivityRow = null;IssueActivity lastActivity = null;@@ -272,8 +271,9 @@ public abstract class IssueActivitiesPanel extends Panel {form.add(new AjaxSubmitLink("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String content = input.getModelObject();if (content.length() > IssueComment.MAX_CONTENT_LEN) {error(_T("Comment too long"));@@ -300,8 +300,9 @@ public abstract class IssueActivitiesPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -375,7 +376,7 @@ public abstract class IssueActivitiesPanel extends Panel {}});- showCommentsLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ showCommentsLink.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return showComments?"active":"";diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.javaindex 3832c4b204..3256cd9085 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java@@ -6,7 +6,7 @@ import java.text.MessageFormat;import java.util.Collection;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex ef50649626..503b70376d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -4,7 +4,7 @@ import static io.onedev.server.util.DateUtils.formatDateTime;import java.util.Collection;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -137,8 +137,8 @@ class IssueWorkPanel extends Panel {form.add(BeanContext.edit("editor", bean));form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var work = getWork();work.setNote(bean.getNote());work.setDate(bean.getStartAt());@@ -150,8 +150,9 @@ class IssueWorkPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.javaindex d1c2c767c3..7e09816567 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java@@ -32,9 +32,9 @@ import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.collect.Sets;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex 5dfbdba61c..1691bd5e64 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -63,8 +63,9 @@ public abstract class BoardEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (boardIndex != -1) {BoardSpec oldBoard = boards.get(boardIndex);if (!board.getName().equals(oldBoard.getName()) && getBoard(board.getName()) != null) {@@ -90,8 +91,8 @@ public abstract class BoardEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(BoardEditPanel.this);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javaindex 36db41b3fa..1811570a7e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -9,7 +9,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import java.util.List;@@ -24,7 +23,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {public void onInitialize() {super.onInitialize();- add(new ListView<>("commits", new AbstractReadOnlyModel<List<ProjectScopedCommit>>() {+ add(new ListView<>("commits", new IModel<List<ProjectScopedCommit>>() {@Overridepublic List<ProjectScopedCommit> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.javaindex 65c2886122..d0a4c9c275 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java@@ -45,15 +45,16 @@ public abstract class CreateIssuePanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);Issue issue = editor.getConvertedInput();onSave(target, issue);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/EstimatedTimeEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/EstimatedTimeEditBean.javaindex 2a1bd448f8..9f75e1fb09 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/EstimatedTimeEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/EstimatedTimeEditBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.component.issue.create;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.WorkingPeriod;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 85e672f00a..8ea73af347 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -23,7 +23,6 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -115,7 +114,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementadd(titleInput);add(new FencedFeedbackPanel("titleFeedback", titleInput));- titleInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ titleInput.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -206,7 +205,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementlastDescriptionTemplate = getDescriptionTemplate(issue);add(descriptionInput = newDescriptionInput(lastDescriptionTemplate));- descriptionInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ descriptionInput.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javaindex ad9173658c..eae72d5b86 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java@@ -68,8 +68,8 @@ public abstract class IssueEditableTitlePanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var user = SecurityUtils.getUser();OneDev.getInstance(IssueChangeService.class).changeTitle(user, getIssue(), titleInput.getModelObject());@@ -81,8 +81,8 @@ public abstract class IssueEditableTitlePanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(titleEditor);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 11e58b02e3..05439f8438 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -7,7 +7,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.javaindex 12b22450d0..76d0f1548e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.java@@ -16,7 +16,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.javaindex 77e489550d..f51b63b877 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 3f90019013..673d97af1e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -21,7 +21,7 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -329,8 +329,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (!selectedFields.isEmpty()) {runTaskBehavior.requestRun(target);@@ -341,8 +342,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex 3b3ec0188c..5e9e44af4d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.javaindex f436a539c0..0d12820e33 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java@@ -19,7 +19,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex a843bcba51..5914a512df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -58,8 +58,7 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -337,7 +336,7 @@ public abstract class IssueListPanel extends Panel {public void setObject(EntityQuery<Issue> object) {IssueListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -384,7 +383,7 @@ public abstract class IssueListPanel extends Panel {query = new IssueQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -451,7 +450,7 @@ public abstract class IssueListPanel extends Panel {if (getProject() != null)option.withCurrentProjectCriteria(true);- queryInput.add(new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {+ queryInput.add(new IssueQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {@@ -489,8 +488,8 @@ public abstract class IssueListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);IssueListPanel.this.getFeedbackMessages().clear();doQuery(target);}@@ -590,8 +589,8 @@ public abstract class IssueListPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);modal.close();if (getProject() != null) {var oldAuditContent = getAuditContent(getProject());@@ -2038,7 +2037,6 @@ public abstract class IssueListPanel extends Panel {} else {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME, true) {- @SuppressWarnings("deprecation")@Overrideprotected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {return new AttachAjaxIndicatorListener(diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.javaindex bff887286c..c0f5ff59e0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java@@ -11,8 +11,8 @@ import java.util.Collection;import java.util.Collections;import java.util.List;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.wicket.Component;import org.apache.wicket.Session;@@ -34,7 +34,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -591,7 +591,7 @@ public abstract class IssuePrimaryPanel extends Panel {form.add(new AjaxButton("save") {@SuppressWarnings("unchecked")@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {var convertedInput = issuePopulator.getConvertedInput();if (convertedInput instanceof Issue) {var linkIssue = (Issue) convertedInput;@@ -636,7 +636,8 @@ public abstract class IssuePrimaryPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();target.add(form);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/EstimatedTimeEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/EstimatedTimeEditBean.javaindex b37c5c8113..0552a78ce3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/EstimatedTimeEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/EstimatedTimeEditBean.java@@ -6,8 +6,8 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.WorkingPeriod;import io.onedev.server.service.SettingService;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotNull;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 50efd06b54..868b4ab2cd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -15,8 +15,8 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.mail.internet.InternetAddress;+import jakarta.inject.Inject;+import jakarta.mail.internet.InternetAddress;import org.apache.commons.collections4.CollectionUtils;import org.apache.commons.collections4.Predicate;@@ -41,7 +41,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;@@ -299,7 +298,7 @@ public abstract class IssueSidePanel extends Panel {};- container.add(new ListView<Iteration>("iterations", new AbstractReadOnlyModel<List<Iteration>>() {+ container.add(new ListView<Iteration>("iterations", new IModel<List<Iteration>>() {@Overridepublic List<Iteration> getObject() {@@ -319,7 +318,7 @@ public abstract class IssueSidePanel extends Panel {link.add(new Label("label", iteration.getName()));item.add(link);- item.add(new StateStatsBar("progress", new AbstractReadOnlyModel<Map<String, Integer>>() {+ item.add(new StateStatsBar("progress", new IModel<Map<String, Integer>>() {@Overridepublic Map<String, Integer> getObject() {@@ -337,7 +336,7 @@ public abstract class IssueSidePanel extends Panel {}});- item.add(new IterationStatusLabel("status", new AbstractReadOnlyModel<Iteration>() {+ item.add(new IterationStatusLabel("status", new IModel<Iteration>() {@Overridepublic Iteration getObject() {@@ -501,7 +500,7 @@ public abstract class IssueSidePanel extends Panel {WebMarkupContainer container = new WebMarkupContainer("votes");container.setOutputMarkupId(true);- container.add(new Label("count", new AbstractReadOnlyModel<String>() {+ container.add(new Label("count", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.javaindex 8430720433..92e3abab59 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex 4f0b6f4f9c..ff000606a7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -59,7 +59,7 @@ public abstract class TransitionOptionPanel extends Panel implements InputContex@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -102,8 +102,8 @@ public abstract class TransitionOptionPanel extends Panel implements InputContexform.add(new AjaxButton("ok") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);Collection<String> editableFields = FieldUtils.getEditableFields(getIssue().getProject(), getTransition().getPromptFields());diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditBean.javaindex 296695e6b4..1e88a1b4c7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditBean.java@@ -4,7 +4,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditPanel.javaindex 16a60e93b7..eb08e2f0e9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionspec/TransitionEditPanel.java@@ -47,7 +47,7 @@ public abstract class TransitionEditPanel extends Panel implements InputContext@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -72,8 +72,8 @@ public abstract class TransitionEditPanel extends Panel implements InputContextform.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onSave(target, transitionIndex, bean.getTransitionSpec());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.javaindex 7bbee85209..01665f5897 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java@@ -4,8 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.javaindex b017545dd7..12c6d45682 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java@@ -4,8 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.javaindex c16ab69b22..712aa8547a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java@@ -4,8 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.javaindex 1d4cf2a741..6a9f05d998 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;@@ -70,13 +70,21 @@ public abstract class WorkflowReconcilePanel extends Panel {}private Component checkStates(String markupId) {- return new AjaxLazyLoadPanel(markupId) {+ return new AjaxLazyLoadPanel<Component>(markupId) {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());- }+ protected void initTimer() {+ if (getPage().getBehaviors(AjaxLazyLoadTimer.class).isEmpty()) {+ getPage().add(new AjaxLazyLoadTimer() {+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());+ }+ });+ }+ super.initTimer();+ }@Overridepublic Component getLazyLoadComponent(String markupId) {@@ -88,7 +96,7 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -134,8 +142,8 @@ public abstract class WorkflowReconcilePanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);getIssueService().fixUndefinedStates(resolutions);Component content = checkFields(CONTENT_ID);WorkflowReconcilePanel.this.replace(content);@@ -161,13 +169,21 @@ public abstract class WorkflowReconcilePanel extends Panel {}private Component checkFields(String markupId) {- return new AjaxLazyLoadPanel(markupId) {+ return new AjaxLazyLoadPanel<Component>(markupId) {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());- }+ protected void initTimer() {+ if (getPage().getBehaviors(AjaxLazyLoadTimer.class).isEmpty()) {+ getPage().add(new AjaxLazyLoadTimer() {+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());+ }+ });+ }+ super.initTimer();+ }@Overridepublic Component getLazyLoadComponent(String markupId) {@@ -179,7 +195,7 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -223,8 +239,8 @@ public abstract class WorkflowReconcilePanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);getIssueService().fixUndefinedFields(resolutions);Component content = checkFieldValues(CONTENT_ID);@@ -250,13 +266,21 @@ public abstract class WorkflowReconcilePanel extends Panel {}private Component checkFieldValues(String markupId) {- return new AjaxLazyLoadPanel(markupId) {+ return new AjaxLazyLoadPanel<Component>(markupId) {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());- }+ protected void initTimer() {+ if (getPage().getBehaviors(AjaxLazyLoadTimer.class).isEmpty()) {+ getPage().add(new AjaxLazyLoadTimer() {+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());+ }+ });+ }+ super.initTimer();+ }@Overridepublic Component getLazyLoadComponent(String markupId) {@@ -268,7 +292,7 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -312,8 +336,8 @@ public abstract class WorkflowReconcilePanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);Map<String, UndefinedFieldValuesResolution> edits = new HashMap<>();Collection<String> fieldNames = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.javaindex 74ce30a034..09fe35c43b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workspaces/IssueWorkspacesLink.java@@ -1,6 +1,6 @@package io.onedev.server.web.component.issue.workspaces;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.javaindex 403b5e6224..662516cb03 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java@@ -4,7 +4,6 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -35,7 +34,7 @@ public class IterationStatusLabel extends Label {@Overrideprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.javaindex 066a897d47..cb896e3d92 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java@@ -21,7 +21,6 @@ import org.jspecify.annotations.Nullable;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -167,7 +166,7 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {var aggregationLink = OneDev.getInstance(SettingService.class).getIssueSetting().getTimeTrackingSetting().getAggregationLink();- fragment.add(new Label("message", new AbstractReadOnlyModel<String>() {+ fragment.add(new Label("message", new IModel<String>() {@Overridepublic String getObject() {if (aggregationLink != null && (getIndicator().equals(ESTIMATED_TIME) || getIndicator().equals(REMAINING_TIME)))diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.javaindex 26bc9d6f26..00f5ad3dd0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java@@ -29,13 +29,12 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;@@ -129,7 +128,7 @@ public class IterationListPanel extends GenericPanel<Project> {}};- openLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ openLink.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -150,7 +149,7 @@ public class IterationListPanel extends GenericPanel<Project> {}};- closedLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ closedLink.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.javaindex 2ff3d3aae1..72567b9091 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java@@ -50,7 +50,7 @@ abstract class BuildOptionContentPanel extends Panel implements ProjectScopedCom@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -117,8 +117,9 @@ abstract class BuildOptionContentPanel extends Panel implements ProjectScopedComform.add(new AjaxButton("ok") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (selectedRefNames.isEmpty()) {refNamesView.error(_T("At least one branch or tag should be selected"));target.add(form);diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex d39ab6496d..43868d16df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -11,7 +11,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex 5128bc244f..ff68ce4ed5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -7,7 +7,7 @@ import java.util.HashMap;import java.util.List;import java.util.Optional;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;@@ -19,7 +19,7 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.javaindex 5fc372c317..dba0671a1d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.javaindex 5e66064ad8..846731ebe2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java@@ -96,7 +96,7 @@ public abstract class DropdownLink extends AjaxLink<Void> {protected void onClosed() {super.onClosed();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null) {var markupId = DropdownLink.this.getMarkupId(true);String script = String.format("""diff --git a/server-core/src/main/java/io/onedev/server/web/component/logging/LogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/logging/LogPanel.javaindex d2469c6318..1091dde581 100644--- a/server-core/src/main/java/io/onedev/server/web/component/logging/LogPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/logging/LogPanel.java@@ -5,7 +5,7 @@ import static java.util.stream.Collectors.toList;import java.util.Collection;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/BlobMarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/BlobMarkdownEditor.javaindex e1192f9943..1dbce32d3f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/BlobMarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/BlobMarkdownEditor.java@@ -5,7 +5,7 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import io.onedev.server.util.FilenameUtils;import org.apache.commons.lang3.Strings;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex c71e449513..8995f7664b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -13,10 +13,10 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.activation.MimetypesFileTypeMap;+import jakarta.activation.MimetypesFileTypeMap;import org.jspecify.annotations.Nullable;-import org.apache.commons.fileupload.FileUploadException;+import org.apache.commons.fileupload2.core.FileUploadException;import org.apache.wicket.Component;import org.apache.wicket.MetaDataKey;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -37,7 +37,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -134,8 +133,8 @@ abstract class InsertUrlPanel extends Panel {form.add(new AjaxButton("insert", form) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);if (StringUtils.isBlank(linkUrl)) {if (isImage)error(_T("Image URL should be specified"));@@ -235,7 +234,7 @@ abstract class InsertUrlPanel extends Panel {Set<BlobIdent> filePickerState = getPickerState(commitId, currentBlob,WebSession.get().getMetaData(FILE_PICKER_STATE));- IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {+ IModel<Project> projectModel = new IModel<Project>() {@Overridepublic Project getObject() {@@ -396,7 +395,7 @@ abstract class InsertUrlPanel extends Panel {protected void onSubmit() {super.onSubmit();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);String attachmentName;var upload = getUploadService().getUpload(uploadId);try {@@ -522,8 +521,9 @@ abstract class InsertUrlPanel extends Panel {form.add(new AjaxButton("insert") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String commitMessage = InsertUrlPanel.this.commitMessage;if (StringUtils.isBlank(commitMessage))@@ -551,8 +551,8 @@ abstract class InsertUrlPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@@ -586,8 +586,8 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newInputUrlPanel();- target.add(content);fragment.replace(content);+ target.add(content);WebSession.get().setMetaData(ACTIVE_TAB, tabInputUrl);}@@ -599,8 +599,8 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newPickExistingPanel();- target.add(content);fragment.replace(content);+ target.add(content);WebSession.get().setMetaData(ACTIVE_TAB, tabPickExisting);}@@ -612,8 +612,8 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newUploadPanel();- target.add(content);fragment.replace(content);+ target.add(content);WebSession.get().setMetaData(ACTIVE_TAB, tabUpload);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex a191d93def..2468ef4a97 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -15,9 +15,9 @@ import java.util.List;import java.util.Locale;import java.util.Map;-import javax.servlet.http.Cookie;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.Cookie;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.commons.lang3.StringUtils;import org.apache.commons.lang3.Strings;@@ -527,7 +527,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {protected void onClosed() {super.onClosed();AjaxRequestTarget target =- Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));+ Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));target.appendJavaScript(String.format("$('#%s textarea').focus();", container.getMarkupId()));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 96fdc01a77..8f837a5e2c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -1,10 +1,12 @@package io.onedev.server.web.component.markdown;+import java.util.Date;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;@@ -158,7 +160,7 @@ public class MarkdownViewer extends GenericPanel<String> {feedback.setOutputMarkupPlaceholderTag(true);add(feedback);- if (RequestCycle.get().find(AjaxRequestTarget.class) != null) {+ if (RequestCycle.get().find(AjaxRequestTarget.class).orElse(null) != null) {/** Render it as html will cause issue when markdown contains some html* entities such as "" and when the component is rendered via ajax.@@ -304,8 +306,8 @@ public class MarkdownViewer extends GenericPanel<String> {if (commit != null && SecurityUtils.canReadCode(commitProject)) {String script = String.format("onedev.server.markdown.renderCommitTooltip('%s', '%s', '%s', '%s');",JavaScriptEscape.escapeJavaScript(commit.getAuthorIdent().getName()),- JavaScriptEscape.escapeJavaScript(DateUtils.formatAge(commit.getCommitterIdent().getWhen())),- JavaScriptEscape.escapeJavaScript(DateUtils.formatDateTime(commit.getCommitterIdent().getWhen())),+ JavaScriptEscape.escapeJavaScript(DateUtils.formatAge(Date.from(commit.getCommitterIdent().getWhenAsInstant()))),+ JavaScriptEscape.escapeJavaScript(DateUtils.formatDateTime(Date.from(commit.getCommitterIdent().getWhenAsInstant()))),JavaScriptEscape.escapeJavaScript(commit.getFullMessage()));target.appendJavaScript(script);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.javaindex d5b503ca33..8ed1b5bc27 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java@@ -1,105 +1,105 @@-package io.onedev.server.web.component.modal;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.page.base.BasePage;--public abstract class ModalPanel extends Panel {-- private static final String CONTENT_ID = "content";-- private boolean inited;-- public ModalPanel(IPartialPageRequestHandler handler) {- this(handler, null);- }-- public ModalPanel(IPartialPageRequestHandler handler, IModel<?> model) {- super(((BasePage)handler.getPage()).getRootComponents().newChildId(), model);-- BasePage page = (BasePage) handler.getPage();- page.getRootComponents().add(this);- handler.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));- handler.add(this);- }-- @Override- protected void onBeforeRender() {- if (!inited) {- WebMarkupContainer dialog = new WebMarkupContainer("dialog");- add(dialog);-- dialog.add(newContent(CONTENT_ID));-- dialog.add(AttributeAppender.append("class", getCssClass()));-- inited = true;- }- super.onBeforeRender();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- ModalPanel.this.remove();- onClosed();- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference()));-- String script = String.format("onedev.server.modal.onDomReady('%s', %s);",- getMarkupId(true), getCallbackFunction());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- });-- add(AttributeAppender.append("class", "modal"));- setOutputMarkupId(true);- }-- protected abstract Component newContent(String id);-- protected String getCssClass() {- return "modal-lg";- }-- public Component getContent() {- return get(CONTENT_ID);- }-- public final void close() {- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);-- if (target != null) {- String script = String.format("onedev.server.modal.close($('#%s'), false);", getMarkupId(true));- target.appendJavaScript(script);- }- remove();- onClosed();- }-- protected void onClosed() {- }-+package io.onedev.server.web.component.modal;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.page.base.BasePage;++public abstract class ModalPanel extends Panel {++ private static final String CONTENT_ID = "content";++ private boolean inited;++ public ModalPanel(IPartialPageRequestHandler handler) {+ this(handler, null);+ }++ public ModalPanel(IPartialPageRequestHandler handler, IModel<?> model) {+ super(((BasePage)handler.getPage()).getRootComponents().newChildId(), model);++ BasePage page = (BasePage) handler.getPage();+ page.getRootComponents().add(this);+ handler.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));+ handler.add(this);+ }++ @Override+ protected void onBeforeRender() {+ if (!inited) {+ WebMarkupContainer dialog = new WebMarkupContainer("dialog");+ add(dialog);++ dialog.add(newContent(CONTENT_ID));++ dialog.add(AttributeAppender.append("class", getCssClass()));++ inited = true;+ }+ super.onBeforeRender();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ ModalPanel.this.remove();+ onClosed();+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);++ response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference()));++ String script = String.format("onedev.server.modal.onDomReady('%s', %s);",+ getMarkupId(true), getCallbackFunction());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ });++ add(AttributeAppender.append("class", "modal"));+ setOutputMarkupId(true);+ }++ protected abstract Component newContent(String id);++ protected String getCssClass() {+ return "modal-lg";+ }++ public Component getContent() {+ return get(CONTENT_ID);+ }++ public final void close() {+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);++ if (target != null) {+ String script = String.format("onedev.server.modal.close($('#%s'), false);", getMarkupId(true));+ target.appendJavaScript(script);+ }+ remove();+ onClosed();+ }++ protected void onClosed() {+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.javaindex d4f37bec5a..eeb4910111 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.unbescape.javascript.JavaScriptEscape;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@@ -34,7 +34,7 @@ abstract class ContentPanel extends Panel {}});- add(new Label("message", new AbstractReadOnlyModel<String>() {+ add(new Label("message", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.javaindex c4fcb285b0..7102262db6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java@@ -38,7 +38,6 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -423,7 +422,7 @@ public abstract class PackListPanel extends Panel {public void setObject(EntityQuery<Pack> object) {PackListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -461,7 +460,7 @@ public abstract class PackListPanel extends Panel {query = new PackQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -495,7 +494,7 @@ public abstract class PackListPanel extends Panel {helpLink.setOutputMarkupPlaceholderTag(true);queryInput = new TextField<>("input", queryStringModel);- queryInput.add(new PackQueryBehavior(new AbstractReadOnlyModel<>() {+ queryInput.add(new PackQueryBehavior(new IModel<>() {@Overridepublic Project getObject() {@@ -533,8 +532,8 @@ public abstract class PackListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);PackListPanel.this.getFeedbackMessages().clear();doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.javaindex 2905a0ba73..dd94966c4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java@@ -19,7 +19,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -221,7 +220,7 @@ public abstract class PackSidePanel extends Panel {} else {labelsContainer.add(new WebMarkupContainer("head"));}- labelsContainer.add(new EntityLabelsPanel<>("body", new AbstractReadOnlyModel<Pack>() {+ labelsContainer.add(new EntityLabelsPanel<>("body", new IModel<Pack>() {@Overridepublic Pack getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.javaindex c4ee8b761b..c7960bb215 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.list.LoopItem;import org.apache.wicket.markup.html.navigation.paging.IPageable;import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.jspecify.annotations.Nullable;@@ -47,7 +47,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {var first = (AbstractLink) get("first");first.add(new Label("pageNumber", "1"));first.add(AttributeModifier.replace("data-page-index", "0"));- first.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ first.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -57,7 +57,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {}));var last = (AbstractLink) get("last");- last.add(new Label("pageNumber", new AbstractReadOnlyModel<String>() {+ last.add(new Label("pageNumber", new IModel<String>() {@Overridepublic String getObject() {@@ -65,7 +65,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {}}));- last.add(AttributeModifier.replace("data-page-index", new AbstractReadOnlyModel<String>() {+ last.add(AttributeModifier.replace("data-page-index", new IModel<String>() {@Overridepublic String getObject() {@@ -73,7 +73,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {}}));- last.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ last.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -172,7 +172,7 @@ public class OnePagingNavigator extends AjaxPagingNavigator {}private <T extends AbstractLink> T disableListenerHref(T link) {- link.add(new AttributeModifier("href", "javascript:;") {+ link.add(new AttributeModifier("href", "#") {@Overridepublic boolean isEnabled(Component component) {return component.isEnabledInHierarchy();diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.javaindex ac25441ef3..8e6925a671 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java@@ -19,7 +19,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.javaindex 763a068812..a6a583b586 100644--- a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java@@ -17,7 +17,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.ChoiceRenderer;import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.convert.ConversionException;@@ -165,7 +164,7 @@ public class PolymorphicEditor extends ValueEditor<Serializable> {});typeSelectorContainer.add(typeSelector);- typeSelectorContainer.add(new Label("typeDescription", new AbstractReadOnlyModel<String>() {+ typeSelectorContainer.add(new Label("typeDescription", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex 1a53089bd4..43694e24cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -11,7 +11,7 @@ import static java.util.stream.Collectors.toList;import java.util.Collection;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Session;@@ -126,8 +126,9 @@ public abstract class ForkOptionPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);try {if (editProject.getKey() != null && projectService.findByKey(editProject.getKey()) != null) {@@ -193,8 +194,9 @@ public abstract class ForkOptionPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.javaindex 85a6b897cc..df0aeabc0b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.project.gitprotocol;import static io.onedev.server.web.translation.Translation._T;-import javax.servlet.http.Cookie;+import jakarta.servlet.http.Cookie;import io.onedev.server.ServerConfig;import org.apache.wicket.Component;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex c2fbfa874f..7f97f5844d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -15,7 +15,7 @@ import java.util.List;import java.util.Map;import java.util.Objects;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -360,7 +360,7 @@ public class ProjectListPanel extends Panel {public void setObject(EntityQuery<Project> object) {ProjectListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -395,7 +395,7 @@ public class ProjectListPanel extends Panel {query = new ProjectQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -1102,8 +1102,8 @@ public class ProjectListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex e06189a4d6..8b99f501da 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -25,8 +25,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -73,7 +72,7 @@ public abstract class ProjectSelector extends Panel {protected void onInitialize() {super.onInitialize();- add(new Label("title", new AbstractReadOnlyModel<>() {+ add(new Label("title", new IModel<>() {@Overridepublic Object getObject() {return getTitle();diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/LanguageStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/LanguageStatsPanel.javaindex 28bfe5dfbc..bc03d365ad 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/LanguageStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/LanguageStatsPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.javaindex bb0d1e39d8..30b11efa00 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java@@ -17,7 +17,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -72,7 +71,7 @@ public class IssueStatsPanel extends Panel {}};- issuesLink.add(new Label("label", new AbstractReadOnlyModel<String>() {+ issuesLink.add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.javaindex 3fe44673cf..0e23903975 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java@@ -4,7 +4,6 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -30,7 +29,7 @@ public class RequestStatusBadge extends Label {protected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 3d3553e499..917922c99d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -15,7 +15,7 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -46,8 +46,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -760,7 +759,7 @@ public abstract class PullRequestListPanel extends Panel {public void setObject(EntityQuery<PullRequest> object) {PullRequestListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -798,7 +797,7 @@ public abstract class PullRequestListPanel extends Panel {query = new PullRequestQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -814,7 +813,7 @@ public abstract class PullRequestListPanel extends Panel {extraActionsView.add(renderer.render(extraActionsView.newChildId()));queryInput = new TextField<String>("input", queryStringModel);- queryInput.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<>() {+ queryInput.add(new PullRequestQueryBehavior(new IModel<>() {@Overridepublic Project getObject() {@@ -851,8 +850,8 @@ public abstract class PullRequestListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);PullRequestListPanel.this.getFeedbackMessages().clear();doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.javaindex 138d6754b6..2c33854284 100644--- a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.javaindex 9a12acaf57..2831772be6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.*;import org.eclipse.jgit.errors.AmbiguousObjectException;import org.eclipse.jgit.errors.IncorrectObjectTypeException;@@ -143,7 +143,7 @@ public abstract class RevisionSelector extends Panel {protected void onInitialize() {super.onInitialize();- add(new Label("title", new AbstractReadOnlyModel<>() {+ add(new Label("title", new IModel<>() {@Overridepublic Object getObject() {return getTitle();diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.javaindex 4a4001a9a2..40c42b3b7a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.savedquery;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.javaindex b84fafb2af..15f49533e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java@@ -33,7 +33,7 @@ public abstract class SaveQueryPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -45,8 +45,8 @@ public abstract class SaveQueryPanel extends Panel {form.add(new AjaxButton("saveForMine") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);myQuerySupport.onSave(target, bean.getName());}@@ -58,8 +58,8 @@ public abstract class SaveQueryPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onSave(target, bean.getName());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex ee04477a95..8be9a8933d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -7,7 +7,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.servlet.http.Cookie;+import jakarta.servlet.http.Cookie;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;@@ -470,7 +470,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -506,8 +506,9 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);Set<String> names = new HashSet<>();for (NamedQuery namedQuery: bean.getQueries()) {@@ -523,8 +524,9 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.javaindex 67e572dd10..3880ed7b0d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java@@ -16,7 +16,7 @@ import java.io.IOException;import java.io.OutputStreamWriter;import java.util.Collection;-import org.apache.wicket.IResourceListener;+import org.apache.wicket.IRequestListener;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.MarkupStream;import org.apache.wicket.markup.head.IHeaderResponse;@@ -46,7 +46,7 @@ import io.onedev.server.web.editable.InplacePropertyEditPanel;* @param <M>* type of model object*/-abstract class AbstractSelect2Choice<T, M> extends FormComponent<M> implements IResourceListener {+abstract class AbstractSelect2Choice<T, M> extends FormComponent<M> implements IRequestListener {private static final long serialVersionUID = 1L;@@ -227,11 +227,11 @@ abstract class AbstractSelect2Choice<T, M> extends FormComponent<M> implements Iprotected void onConfigure() {super.onConfigure();- getSettings().getAjax().setUrl(urlFor(IResourceListener.INTERFACE, null));+ getSettings().getAjax().setUrl(urlForListener(null));}@Override- public void onResourceRequested() {+ public void onRequest() {// this is the callback that retrieves matching choices used to populate// the dropdowndiff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-integration.js b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-integration.jsindex eba3e94b4d..a31c200dcc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-integration.js+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2-integration.js@@ -30,6 +30,13 @@ onedev.server.select2 = {}$select.select2(settings);var instance = $select.data("select2");+ var positionDropdown = instance.dropdown._positionDropdown;+ instance.dropdown._positionDropdown = function() {+ // Measure at the final width: the loading message can wrap in the+ // unsized dropdown and leave a gap when it opens above the input.+ this._resizeDropdown();+ positionDropdown.call(this);+ };instance.$container.find("textarea").addClass("no-autosize");// Preserve layout/validation classes previously copied by Select2 3.x.instance.$container.addClass(($select.attr("class") || "")diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.jsindex d331cf63e3..b96c057fda 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js@@ -2021,7 +2021,7 @@ S2.define('select2/selection/allowClear',[this.$element.trigger('input').trigger('change');- this.trigger('toggle', {});+ this.trigger(this.options.get('multiple') ? 'toggle' : 'close', {});};AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.javaindex e78fba5407..01f9c5b981 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java@@ -1,7 +1,7 @@package io.onedev.server.web.component.sourceformat;import org.jspecify.annotations.Nullable;-import javax.servlet.http.Cookie;+import jakarta.servlet.http.Cookie;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.javaindex 9c19ef657f..62fe208a44 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringRadioChoice.java@@ -37,17 +37,15 @@ public class StringRadioChoice extends FormComponentPanel<String> {protected void onInitialize() {super.onInitialize();- radioGroup = new RadioGroup<>("radioGroup", Model.of(getModelObject())) {- @Override- protected boolean wantOnSelectionChangedNotifications() {- return StringRadioChoice.this.wantOnSelectionChangedNotifications();- }-- @Override- protected void onSelectionChanged(String newSelection) {- StringRadioChoice.this.onSelectionChanged(newSelection);- }- };+ radioGroup = new RadioGroup<>("radioGroup", Model.of(getModelObject()));+ if (wantOnSelectionChangedNotifications()) {+ radioGroup.add(new org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior() {+ @Override+ protected void onUpdate(org.apache.wicket.ajax.AjaxRequestTarget target) {+ StringRadioChoice.this.onSelectionChanged(radioGroup.getModelObject());+ }+ });+ }radioGroup.setRenderBodyOnly(false);radioGroup.setLabel(getLabel());for (var behavior: behaviors)diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.javaindex b111d83221..a0b18101ee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.java@@ -1,6 +1,6 @@package io.onedev.server.web.component.suggestionapply;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.javaindex 7f001d5ef0..d7ef84967f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.BranchChoice;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex b8f7e7542d..8f4dec7b2e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -7,7 +7,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang.StringUtils;import org.apache.wicket.Component;@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -117,7 +117,7 @@ public abstract class SymbolTooltipPanel extends Panel {content.setOutputMarkupId(true);add(content);- content.add(new ListView<QueryHit>("definitions", new AbstractReadOnlyModel<>() {+ content.add(new ListView<QueryHit>("definitions", new IModel<>() {@Overridepublic List<QueryHit> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.javaindex 453780ba1b..22071e7448 100644--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/AjaxActionTab.java@@ -52,7 +52,7 @@ public abstract class AjaxActionTab extends ActionTab {@Overrideprotected final void onSelect(Component tabLink) {- AjaxRequestTarget target = Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class));+ AjaxRequestTarget target = Preconditions.checkNotNull(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));target.add(tabLink.findParent(Tabbable.class));onSelect(target, tabLink);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.javaindex dd8a748dce..7debeb1d5d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java@@ -4,8 +4,8 @@ import java.util.Iterator;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.javaindex 6aab09fd52..65cf381438 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java@@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.UnauthorizedException;@@ -48,7 +48,8 @@ public abstract class TaskButton extends AjaxButton {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();target.add(form);}@@ -128,7 +129,7 @@ public abstract class TaskButton extends AjaxButton {List<JobLogEntryEx> messages = new ArrayList<>();messages.add(new JobLogEntryEx(new JobLogEntry(new Date(), _T("Please wait..."))));var application = Application.get();- var requestCycle = RequestCycle.get();+ var session = getSession();TaskFuture prevFuture = taskFutureService.getTaskFutures().put(taskId, new TaskFuture(executorService.submit(new Callable<TaskResult>() {@Override@@ -155,10 +156,10 @@ public abstract class TaskButton extends AjaxButton {}};- var oldApplication = ThreadContext.getApplication();- var oldRequestCycle = ThreadContext.getRequestCycle();+ var oldContext = ThreadContext.detach();ThreadContext.setApplication(application);- ThreadContext.setRequestCycle(requestCycle);+ // Keep localization available without accessing a request recycled by Jetty.+ ThreadContext.setSession(session);try {return runTask(logger);} catch (Exception e) {@@ -174,8 +175,7 @@ public abstract class TaskButton extends AjaxButton {}return new TaskResult(false, new PlainMessage(_T("Error executing task")));} finally {- ThreadContext.setApplication(oldApplication);- ThreadContext.setRequestCycle(oldRequestCycle);+ ThreadContext.restore(oldContext);}}@@ -191,7 +191,7 @@ public abstract class TaskButton extends AjaxButton {super.onClosed();TaskFuture future = taskFutureService.getTaskFutures().remove(taskId);- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);boolean successful = false;if (future != null) {if (future.isDone() && !future.isCancelled()) {@@ -246,8 +246,9 @@ public abstract class TaskButton extends AjaxButton {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);target.focusComponent(null);target.add(form);submitTask(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TestButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TestButton.javaindex 9cfdd58128..78e09af2bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TestButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TestButton.java@@ -90,7 +90,8 @@ public abstract class TestButton extends TaskButton {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();if (editor.isValid()) {if (testData != null && !(testData instanceof Testable.None)) {String title = EditableUtils.getDisplayName(testData.getClass());diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.javaindex 47045383a1..f6594c85d2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java@@ -6,8 +6,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ProjectChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.javaindex 4488fd31dd..7ae316c644 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java@@ -8,8 +8,8 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.javaindex 0fbd7bc847..a2f23f9055 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java@@ -55,8 +55,8 @@ abstract class AccessTokenEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var token = getToken();var nameConflict = false;@@ -112,8 +112,9 @@ abstract class AccessTokenEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.javaindex 19c11ef938..84db7cfa03 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -37,7 +37,7 @@ public abstract class AccessTokenListPanel extends Panel {container = new WebMarkupContainer("tokens");container.setOutputMarkupId(true);add(container);- container.add(new ListView<>("tokens", new AbstractReadOnlyModel<List<AccessToken>>() {+ container.add(new ListView<>("tokens", new IModel<List<AccessToken>>() {@Overridepublic List<AccessToken> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorEditBean.javaindex 9ecd6c297f..741d6a9389 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorEditBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.component.user.aisetting;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorPanel.javaindex d9ad0e72c5..55709024ec 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/BehaviorPanel.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.user.aisetting;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/EntitlementSettingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/EntitlementSettingPanel.javaindex 5b57b4fd99..5641c2dfe6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/EntitlementSettingPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/EntitlementSettingPanel.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/ModelSettingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/ModelSettingPanel.javaindex 29c91a0bba..c3cd28a74d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/ModelSettingPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/aisetting/ModelSettingPanel.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.user.aisetting;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.javaindex 12b47b574b..62ba566f7e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/basicsetting/BasicSettingPanel.java@@ -6,7 +6,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Session;import org.apache.wicket.feedback.FencedFeedbackPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.javaindex 37a8ca7900..1fe548c377 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java@@ -7,7 +7,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.CssHeaderItem;@@ -31,13 +31,12 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.validation.IErrorMessageSource;import org.apache.wicket.validation.IValidationError;-import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;+import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;import org.jspecify.annotations.Nullable;import io.onedev.server.model.EmailAddress;@@ -174,8 +173,8 @@ public class EmailAddressesPanel extends GenericPanel<User> {var primarySubmit = new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var emailAddress = newEmailAddress(primaryForm, primaryInput.getModelObject());if (emailAddress != null) {emailAddressService.create(emailAddress);@@ -188,8 +187,8 @@ public class EmailAddressesPanel extends GenericPanel<User> {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(primaryForm);}@@ -232,7 +231,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {primaryForm.setOutputMarkupId(true);ordinaryContainer.add(primaryForm);- backupEmailAddressesSection.add(new ListView<EmailAddress>("list", new AbstractReadOnlyModel<>() {+ backupEmailAddressesSection.add(new ListView<EmailAddress>("list", new IModel<>() {@Overridepublic List<EmailAddress> getObject() {@@ -302,8 +301,8 @@ public class EmailAddressesPanel extends GenericPanel<User> {var backupSubmit = new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var emailAddress = newEmailAddress(backupForm, backupInput.getModelObject());if (emailAddress != null) {emailAddressService.create(emailAddress);@@ -315,8 +314,8 @@ public class EmailAddressesPanel extends GenericPanel<User> {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(backupForm);}};@@ -349,6 +348,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overrideprotected void onConfigure() {+ super.onConfigure();setVisible(getUser().isKeepEmailAddressesPrivate());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.javaindex e41729685e..299c78d7a6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.javaindex 40a3313889..640c83563e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java@@ -54,8 +54,9 @@ public abstract class InsertGpgKeyPanel extends Panel {form.add(new AjaxButton("add") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);GpgKeyService gpgKeyService = OneDev.getInstance(GpgKeyService.class);GpgKey gpgKey = (GpgKey) editor.getModelObject();@@ -87,8 +88,9 @@ public abstract class InsertGpgKeyPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.javaindex f3e94c3b8a..1b827b0e39 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import io.onedev.server.model.User;import io.onedev.server.web.component.user.UserAvatar;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.javaindex a1fa3225f0..69c9805819 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.user.passwordedit;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.CurrentPassword;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex 37644adcf3..52f5e47095 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -11,7 +11,6 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.Button;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.commons.loader.AppLoader;@@ -74,7 +73,7 @@ public class PasswordEditPanel extends GenericPanel<User> {add(form);form.add(BeanContext.edit("editor", bean, excludedProperties, true));- form.add(new Button("submit").add(AttributeAppender.append("value", new AbstractReadOnlyModel<>() {+ form.add(new Button("submit").add(AttributeAppender.append("value", new IModel<>() {@Overridepublic String getObject() {return getUser().getPassword()!=null?_T("Change"):_T("Set");diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.javaindex ac4f8558cf..fa519f00cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java@@ -32,7 +32,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import com.fasterxml.jackson.core.JsonProcessingException;@@ -443,7 +443,6 @@ public abstract class UserProfilePanel extends GenericPanel<User> {moreContainer.add(new AjaxLink<Void>("link") {- @SuppressWarnings("deprecation")@Overridepublic void onClick(AjaxRequestTarget target) {target.add(moreContainer);diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.javaindex 6c5947f872..f4379584b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java@@ -48,8 +48,8 @@ public abstract class InsertSshKeyPanel extends Panel {form.add(new AjaxButton("add") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {- super.onSubmit(target, myform);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);SshKeyService sshKeyService = OneDev.getInstance(SshKeyService.class);SshKey sshKey = (SshKey) editor.getModelObject();@@ -69,8 +69,9 @@ public abstract class InsertSshKeyPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.javaindex ee10ce488d..cc92a99f4c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.image.Image;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.Model;import org.apache.wicket.request.resource.AbstractResource;import org.apache.wicket.request.resource.ContentDisposition;@@ -105,8 +105,9 @@ public abstract class TwoFactorAuthenticationSetupPanel extends GenericPanel<Useform.add(new AjaxButton("verify") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String passcode = input.getModelObject();if (StringUtils.isBlank(passcode)) {form.error("Please input passcode");diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.javaindex b7fc8da9e4..618fc2aefe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/workspacedata/WorkspaceDataPanel.java@@ -12,7 +12,7 @@ import java.util.Iterator;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.javaindex b28a780f04..901393e4e4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/WizardPanel.java@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.form.Button;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import com.google.common.base.Preconditions;@@ -50,7 +50,7 @@ public abstract class WizardPanel extends Panel {super.onInitialize();Form<?> form = new Form<Void>("form");- form.add(new Label("title", new AbstractReadOnlyModel<String>() {+ form.add(new Label("title", new IModel<String>() {@Overridepublic String getObject() {@@ -58,7 +58,7 @@ public abstract class WizardPanel extends Panel {}}));- form.add(new Label("description", new AbstractReadOnlyModel<String>() {+ form.add(new Label("description", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.javaindex eb71b66569..dbd1cbbb73 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/CreateWorkspaceLink.java@@ -1,6 +1,6 @@package io.onedev.server.web.component.workspace;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.javaindex 6de5fd1291..601ef38baf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java@@ -15,7 +15,7 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.javaindex 0cf2f26476..60f651ab03 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java@@ -33,7 +33,6 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -396,7 +395,7 @@ public abstract class WorkspaceListPanel extends Panel {public void setObject(EntityQuery<Workspace> object) {WorkspaceListPanel.this.getFeedbackMessages().clear();queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -443,7 +442,7 @@ public abstract class WorkspaceListPanel extends Panel {query = new WorkspaceQuery();query.setSorts(object);queryStringModel.setObject(query.toString());- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -455,7 +454,7 @@ public abstract class WorkspaceListPanel extends Panel {queryInput = new TextField<>("input", queryStringModel);queryInput.add(new WorkspaceQueryBehavior(- new AbstractReadOnlyModel<>() {+ new IModel<>() {@Overridepublic Project getObject() {return getProject();@@ -488,8 +487,8 @@ public abstract class WorkspaceListPanel extends Panel {queryForm.add(queryInput);queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);WorkspaceListPanel.this.getFeedbackMessages().clear();doQuery(target);}@@ -626,7 +625,7 @@ public abstract class WorkspaceListPanel extends Panel {}};- link.add(new WorkspaceStatusIcon("icon", new AbstractReadOnlyModel<>() {+ link.add(new WorkspaceStatusIcon("icon", new IModel<>() {@Overridepublic Workspace.Status getObject() {return rowModel.getObject().getStatus();diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.javaindex b694e24f5a..eb331d47f5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/speclist/WorkspaceSpecListPanel.java@@ -9,7 +9,7 @@ import java.util.Comparator;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.eclipse.jgit.lib.ObjectId;diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/specrunselector/WorkspaceSpecRunSelector.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/specrunselector/WorkspaceSpecRunSelector.javaindex a3eb71fde8..79f64f03e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/specrunselector/WorkspaceSpecRunSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/specrunselector/WorkspaceSpecRunSelector.java@@ -5,7 +5,7 @@ import static io.onedev.server.model.User.Type.AI;import java.util.ArrayList;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -19,7 +19,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.javaindex 86b7fac556..77f5e53f32 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java@@ -5,7 +5,6 @@ import java.util.Collection;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.jspecify.annotations.Nullable;@@ -38,7 +37,7 @@ public class WorkspaceStatusIcon extends SpriteImage {protected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanContext.javaindex 8740ca0505..c0845ccc9d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanContext.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanContext.java@@ -8,7 +8,7 @@ import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import org.hibernate.proxy.HibernateProxyHelper;+import io.onedev.server.util.HibernateProxyHelper;import com.google.common.collect.Sets;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 3e11de403f..545fea7681 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -12,7 +12,7 @@ import java.util.Optional;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.Validator;+import jakarta.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;@@ -24,7 +24,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex e6561a8cb4..8679657026 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -18,7 +18,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.javaindex 3cc150dc1f..e4d07a7876 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -55,7 +54,7 @@ public class CodeCommentQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- InputAssistBehavior inputAssist = new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {+ InputAssistBehavior inputAssist = new CodeCommentQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.javaindex 4026e69c7f..64ed61a63d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -55,7 +54,7 @@ public class CommitQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- InputAssistBehavior inputAssist = new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {+ InputAssistBehavior inputAssist = new CommitQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.javaindex 8b1a9c8efc..1367eadff5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java@@ -6,8 +6,8 @@ import java.util.Comparator;import java.util.List;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import edu.emory.mathcs.backport.java.util.Collections;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.javaindex 9ce4177a05..791226eb01 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java@@ -63,14 +63,15 @@ public abstract class InplacePropertyEditPanel extends Panel implements EditContconfirm.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onUpdated(target, bean, propertyName);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 0ddf6f5177..8072d8efa0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.javaindex ff6843eb63..4bcd5ebd4d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable;import java.lang.reflect.Method;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -32,7 +31,7 @@ public class NotificationReceiverEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {InputAssistBehavior inputAssist = new NotificationReceiverBehavior(- new AbstractReadOnlyModel<Project>() {+ new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PackQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/PackQueryEditSupport.javaindex 74332f4eed..fbd8d9f1e3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PackQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PackQueryEditSupport.java@@ -7,7 +7,6 @@ import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.string.StringPropertyEditor;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import java.lang.reflect.AnnotatedElement;@@ -52,7 +51,7 @@ public class PackQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- InputAssistBehavior inputAssist = new PackQueryBehavior(new AbstractReadOnlyModel<>() {+ InputAssistBehavior inputAssist = new PackQueryBehavior(new IModel<>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.javaindex 065b752197..f1f4e5b2fe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java@@ -9,7 +9,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.hibernate.proxy.HibernateProxyHelper;+import io.onedev.server.util.HibernateProxyHelper;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex d5809afd3d..758e3227ba 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -8,9 +8,9 @@ import java.util.HashSet;import java.util.Map;import java.util.Set;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex dffa3bdbc2..4673220290 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -5,8 +5,8 @@ import static io.onedev.server.web.translation.Translation._T;import java.lang.reflect.Method;import java.util.Set;-import javax.validation.ConstraintViolation;-import javax.validation.Validator;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Validator;import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.javaindex 48abe30789..829a9329b0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable;import java.lang.reflect.Method;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -30,7 +29,7 @@ public class ReviewRequirementEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {+ IModel<Project> projectModel = new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex aa82c371b6..65d42a8701 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -21,10 +21,9 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -150,10 +149,9 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {add(new AjaxButton("addElement") {- @SuppressWarnings("deprecation")@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);Component lastRow;@@ -201,7 +199,6 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {add(new SortBehavior() {- @SuppressWarnings("deprecation")@Overrideprotected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {markFormDirty(target);@@ -270,8 +267,8 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {row.add(new AjaxButton("deleteElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));rows.remove(row);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.javaindex db48f1aeb9..d0236fcaf0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -59,7 +58,7 @@ public class BuildQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- InputAssistBehavior inputAssist = new BuildQueryBehavior(new AbstractReadOnlyModel<>() {+ InputAssistBehavior inputAssist = new BuildQueryBehavior(new IModel<>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.javaindex 42aba8323f..b0b4428405 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java@@ -7,7 +7,7 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javaindex 72a84952cb..693cadbfab 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.build.choice;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.javaindex bddb3dc2d7..8f43087afc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java@@ -1,155 +1,153 @@-package io.onedev.server.web.editable.buildspec.imports;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.util.convert.ConversionException;--import io.onedev.server.buildspec.Import;-import io.onedev.server.util.Path;-import io.onedev.server.util.PathNode;-import io.onedev.server.util.PathNode.Indexed;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyUpdating;--class ImportListEditPanel extends PropertyEditor<List<Serializable>> {-- private final List<Import> imports;-- private RepeatingView importsView;-- public ImportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- imports = new ArrayList<>();- for (Serializable each: model.getObject())- imports.add((Import) each);- }-- @Override- protected String getInvalidClass() {- return null;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- importsView = new RepeatingView("imports");- for (Import aImport: imports)- importsView.add(newImportEditor(importsView.newChildId(), aImport));- add(importsView);-- add(new AjaxLink<Void>("add") {-- @Override- public void onClick(AjaxRequestTarget target) {- Component importEditor = newImportEditor(importsView.newChildId(), new Import());- importsView.add(importEditor);- target.add(importEditor);-- String script = String.format(""- + "$('#%s').before('<div id=\"%s\"/>');",- getMarkupId(), importEditor.getMarkupId());- target.prependJavaScript(script);- }-- });-- add(new SortBehavior() {-- @SuppressWarnings("deprecation")- @Override- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- int fromIndex = from.getItemIndex();- int toIndex = to.getItemIndex();- if (fromIndex < toIndex) {- for (int i=0; i<toIndex-fromIndex; i++)- importsView.swap(fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- importsView.swap(fromIndex-i, fromIndex-i-1);- }- }-- }.sortable(">.imports").items(".import").handle(".drag-indicator"));-- }-- protected Component newImportEditor(String componentId, Import aImport) {- Fragment fragment = new Fragment(componentId, "importEditFrag", this);- fragment.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- importsView.remove(fragment);-- String script = String.format("$('#%s').remove();", fragment.getMarkupId());- target.appendJavaScript(script);- }-- });-- fragment.add(new FencedFeedbackPanel("feedback", fragment));- fragment.add(BeanContext.edit("editor", aImport));- fragment.setOutputMarkupId(true);-- return fragment;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());- }- }-- @Override- protected List<Serializable> convertInputToValue() throws ConversionException {- List<Serializable> value = new ArrayList<>();- for (Component each: importsView) {- BeanEditor editor = (BeanEditor) each.get("editor");- value.add(editor.getConvertedInput());- }- return value;- }-- @SuppressWarnings("deprecation")- @Override- public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {- int index = ((Indexed) propertyNode).getIndex();- BeanEditor editor = (BeanEditor) importsView.get(index).get("editor");- editor.error(pathInProperty, errorMessage);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new ImportCssResourceReference()));- }-- @Override- public boolean needExplicitSubmit() {- return true;- }--}+package io.onedev.server.web.editable.buildspec.imports;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.panel.Fragment;+import io.onedev.server.web.component.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.buildspec.Import;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.util.PathNode.Indexed;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;++class ImportListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<Import> imports;++ private RepeatingView importsView;++ public ImportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ imports = new ArrayList<>();+ for (Serializable each: model.getObject())+ imports.add((Import) each);+ }++ @Override+ protected String getInvalidClass() {+ return null;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ importsView = new RepeatingView("imports");+ for (Import aImport: imports)+ importsView.add(newImportEditor(importsView.newChildId(), aImport));+ add(importsView);++ add(new AjaxLink<Void>("add") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component importEditor = newImportEditor(importsView.newChildId(), new Import());+ importsView.add(importEditor);+ target.add(importEditor);++ String script = String.format(""+ + "$('#%s').before('<div id=\"%s\"/>');",+ getMarkupId(), importEditor.getMarkupId());+ target.prependJavaScript(script);+ }++ });++ add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ importsView.swap(fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ importsView.swap(fromIndex-i, fromIndex-i-1);+ }+ }++ }.sortable(">.imports").items(".import").handle(".drag-indicator"));++ }++ protected Component newImportEditor(String componentId, Import aImport) {+ Fragment fragment = new Fragment(componentId, "importEditFrag", this);+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ importsView.remove(fragment);++ String script = String.format("$('#%s').remove();", fragment.getMarkupId());+ target.appendJavaScript(script);+ }++ });++ fragment.add(new FencedFeedbackPanel("feedback", fragment));+ fragment.add(BeanContext.edit("editor", aImport));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (Component each: importsView) {+ BeanEditor editor = (BeanEditor) each.get("editor");+ value.add(editor.getConvertedInput());+ }+ return value;+ }++ @Override+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ int index = ((Indexed) propertyNode).getIndex();+ BeanEditor editor = (BeanEditor) importsView.get(index).get("editor");+ editor.error(pathInProperty, errorMessage);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ImportCssResourceReference()));+ }++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.javaindex ccadac799e..c52504f870 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.java@@ -7,7 +7,7 @@ import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import io.onedev.server.buildspec.Import;import io.onedev.server.web.editable.BeanContext;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.javaindex 9357e9508d..a55670ec66 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.buildspec.job.postbuildaction;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.javaindex 1f367270c4..a478e0637b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.buildspec.job.trigger;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.javaindex 238be0d911..b280e5ac7e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java@@ -19,7 +19,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapViewPanel.javaindex 217cc59057..ef03abec93 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapViewPanel.java@@ -5,7 +5,7 @@ import io.onedev.server.web.editable.PropertyContext;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.javaindex 8794bf3d35..a51a5582e6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java@@ -10,7 +10,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -239,7 +239,6 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {super.onBeforeRender();}- @SuppressWarnings("deprecation")@Overrideprotected void onInitialize() {super.onInitialize();@@ -255,7 +254,7 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {try {ParamUtils.validateParamValues(specifiedValues.getValues());} catch (ValidationException e) {- if (!getFlag(FLAG_RENDERING)) {+ if (!isRendering()) {RepeatingView paramsView = (RepeatingView) get("params");paramsView.get(index).get("values").error(e.getMessage());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixViewPanel.javaindex 8a60ef21f3..8b43b4174e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixViewPanel.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import io.onedev.server.buildspec.param.instance.IgnoreValues;import io.onedev.server.buildspec.param.instance.ParamInstances;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.javaindex 6bc8d94f92..ea9b7bd183 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.javaindex abbe8234e8..146c1b4f51 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java@@ -42,7 +42,7 @@ abstract class StepEditContentPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -94,8 +94,8 @@ abstract class StepEditContentPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onSave(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/drawcardbeanlist/DrawCardBeanItemEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/drawcardbeanlist/DrawCardBeanItemEditPanel.javaindex bea9a48f11..1c262f279f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/drawcardbeanlist/DrawCardBeanItemEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/drawcardbeanlist/DrawCardBeanItemEditPanel.java@@ -77,7 +77,7 @@ public abstract class DrawCardBeanItemEditPanel<T extends Serializable> extends@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -110,8 +110,9 @@ public abstract class DrawCardBeanItemEditPanel<T extends Serializable> extendsform.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);T item = extractItem(editingBean);validateItem(editor, item);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.javaindex 942e6101b9..3aec1c2308 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.java@@ -23,9 +23,8 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -61,7 +60,6 @@ public class InterpolativeStringListPropertyEditor extends PropertyEditor<List<S}}- @SuppressWarnings("deprecation")@Overrideprotected void onInitialize() {super.onInitialize();@@ -91,8 +89,8 @@ public class InterpolativeStringListPropertyEditor extends PropertyEditor<List<Sadd(new AjaxButton("addElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);Component lastRow;@@ -246,8 +244,8 @@ public class InterpolativeStringListPropertyEditor extends PropertyEditor<List<Srow.add(new AjaxButton("deleteElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));rows.remove(row);@@ -266,7 +264,6 @@ public class InterpolativeStringListPropertyEditor extends PropertyEditor<List<Sreturn row;}- @SuppressWarnings("deprecation")@Overridepublic void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {int index = ((PathNode.Indexed) propertyNode).getIndex();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.javaindex 139d7ff243..12ad3ab9a5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import com.google.common.base.Preconditions;@@ -76,7 +75,7 @@ public class IssueQueryEditSupport implements EditSupport {.withOrder(issueQuery.withOrder()).forBoard(issueQuery.forBoard());return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(- new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {+ new IssueQueryBehavior(new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javaindex 748b075dc1..9bef013a24 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.issue.choice;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingEditPanel.javaindex 8131cff805..5ce12995dd 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingEditPanel.java@@ -44,7 +44,7 @@ abstract class IssueCreationSettingEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -71,8 +71,8 @@ abstract class IssueCreationSettingEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);if (settingIndex != -1)settings.set(settingIndex, setting);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.javaindex 908204d701..3593d40374 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java@@ -18,7 +18,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListViewPanel.javaindex d3f1a25897..43f6229900 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListViewPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.javaindex cf93618ab0..f30f9796b1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java@@ -1,113 +1,114 @@-package io.onedev.server.web.editable.jobprivilege;--import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.server.model.support.role.JobPrivilege;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;--abstract class JobPrivilegeEditPanel extends Panel {-- private final List<JobPrivilege> privileges;-- private final int privilegeIndex;-- public JobPrivilegeEditPanel(String id, List<JobPrivilege> privileges, int privilegeIndex) {- super(id);-- this.privileges = privileges;- this.privilegeIndex = privilegeIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- JobPrivilege privilege;- if (privilegeIndex != -1)- privilege = privileges.get(privilegeIndex);- else- privilege = new JobPrivilege();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", privilege);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (editor.isValid()) {- if (privilegeIndex != -1)- privileges.set(privilegeIndex, privilege);- else- privileges.add(privilege);- onSave(target);- } else {- target.add(form);- }- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}+package io.onedev.server.web.editable.jobprivilege;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++abstract class JobPrivilegeEditPanel extends Panel {++ private final List<JobPrivilege> privileges;++ private final int privilegeIndex;++ public JobPrivilegeEditPanel(String id, List<JobPrivilege> privileges, int privilegeIndex) {+ super(id);++ this.privileges = privileges;+ this.privilegeIndex = privilegeIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ JobPrivilege privilege;+ if (privilegeIndex != -1)+ privilege = privileges.get(privilegeIndex);+ else+ privilege = new JobPrivilege();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);+ }++ };++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.edit("editor", privilege);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);++ if (editor.isValid()) {+ if (privilegeIndex != -1)+ privileges.set(privilegeIndex, privilege);+ else+ privileges.add(privilege);+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.javaindex 30420b84d2..4dc357a287 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java@@ -6,7 +6,7 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyDescriptor;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import static io.onedev.server.web.translation.Translation._T;@@ -37,7 +37,7 @@ public class PolymorphicPropertyViewer extends Panel {super.onInitialize();add(new Label("type", _T(EditableUtils.getDisplayName(propertyValue.getClass()))));- add(new Label("typeDescription", new AbstractReadOnlyModel<String>() {+ add(new Label("typeDescription", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex 30e228f753..b37a42637b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -19,8 +19,7 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -69,7 +68,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa}}- @SuppressWarnings("deprecation")@Overrideprotected void onInitialize() {super.onInitialize();@@ -99,8 +97,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializaadd(new AjaxButton("addElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);Component lastRow;@@ -225,8 +223,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializarow.add(new AjaxButton("deleteElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));rows.remove(row);@@ -255,7 +253,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializareturn (PolymorphicEditor) row.get("elementEditor");}- @SuppressWarnings("deprecation")@Overridepublic void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {int index = ((PathNode.Indexed) propertyNode).getIndex();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.javaindex 3df9dced4e..610b9fade1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import io.onedev.server.annotation.ExcludedProperties;import io.onedev.server.web.behavior.NoRecordsBehavior;@@ -60,7 +60,7 @@ public class PolymorphicListPropertyViewer extends Panel {var value = item.getModelObject();item.add(new Label("type", EditableUtils.getDisplayName(value.getClass())));- item.add(new Label("typeDescription", new AbstractReadOnlyModel<String>() {+ item.add(new Label("typeDescription", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.javaindex c07837456e..3252e4dd40 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;@@ -58,7 +57,7 @@ public class PullRequestQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {+ IModel<Project> projectModel = new IModel<Project>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javaindex 052089ba9e..e9785fb85f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable.pullrequest.choice;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.javaindex 7f30255485..a5c172ab8a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java@@ -16,7 +16,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -36,7 +35,7 @@ public class SecretPropertyEditor extends PropertyEditor<String> {super.onInitialize();var input1 = new WebMarkupContainer("input1");- input1.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ input1.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return masked? "form-control text-monospace masked": "form-control text-monospace";@@ -65,13 +64,13 @@ public class SecretPropertyEditor extends PropertyEditor<String> {target.add(SecretPropertyEditor.this);}};- toggleLink.add(new SpriteImage("icon", new AbstractReadOnlyModel<>() {+ toggleLink.add(new SpriteImage("icon", new IModel<>() {@Overridepublic String getObject() {return masked ? "eye" : "eye-close";}}));- toggleLink.add(AttributeAppender.append("title", new AbstractReadOnlyModel<String>() {+ toggleLink.add(AttributeAppender.append("title", new IModel<String>() {@Overridepublic String getObject() {return masked? "Show": "Hide";diff --git a/server-core/src/main/java/io/onedev/server/web/editable/verticalbeanlist/VerticalBeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/verticalbeanlist/VerticalBeanListPropertyEditor.javaindex 2187dfd398..742106617b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/verticalbeanlist/VerticalBeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/verticalbeanlist/VerticalBeanListPropertyEditor.java@@ -16,8 +16,7 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;@@ -62,7 +61,6 @@ public class VerticalBeanListPropertyEditor extends PropertyEditor<List<Serializ}}- @SuppressWarnings("deprecation")@Overrideprotected void onInitialize() {super.onInitialize();@@ -92,8 +90,8 @@ public class VerticalBeanListPropertyEditor extends PropertyEditor<List<Serializadd(new AjaxButton("addElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);Component lastRow;@@ -201,8 +199,8 @@ public class VerticalBeanListPropertyEditor extends PropertyEditor<List<Serializrow.add(new AjaxButton("deleteElement") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);markFormDirty(target);target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));rows.remove(row);@@ -231,7 +229,6 @@ public class VerticalBeanListPropertyEditor extends PropertyEditor<List<Serializreturn (BeanEditor) row.get("elementEditor");}- @SuppressWarnings("deprecation")@Overridepublic void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {int index = ((PathNode.Indexed) propertyNode).getIndex();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex 8116dc9c3b..c1921264ff 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -15,7 +15,7 @@ import org.apache.wicket.util.convert.ConversionException;import static io.onedev.server.web.translation.Translation._T;-import javax.validation.ValidationException;+import jakarta.validation.ValidationException;public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workspace/WorkspaceQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/workspace/WorkspaceQueryEditSupport.javaindex 47d0662b97..906457f3dd 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workspace/WorkspaceQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workspace/WorkspaceQueryEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.annotation.WorkspaceQuery;@@ -59,7 +58,7 @@ public class WorkspaceQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- InputAssistBehavior inputAssist = new WorkspaceQueryBehavior(new AbstractReadOnlyModel<>() {+ InputAssistBehavior inputAssist = new WorkspaceQueryBehavior(new IModel<>() {@Overridepublic Project getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/PageExpiredExceptionHandler.java b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/PageExpiredExceptionHandler.javaindex 25c5a2df0b..30dd1ea26e 100644--- a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/PageExpiredExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/PageExpiredExceptionHandler.java@@ -4,7 +4,7 @@ import io.onedev.server.exception.HttpResponse;import io.onedev.server.exception.handler.AbstractExceptionHandler;import org.apache.wicket.protocol.http.PageExpiredException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class PageExpiredExceptionHandler extends AbstractExceptionHandler<PageExpiredException> {diff --git a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.javaindex 540b47980a..ebb2c046e1 100644--- a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java@@ -4,7 +4,7 @@ import io.onedev.server.exception.HttpResponse;import io.onedev.server.exception.handler.AbstractExceptionHandler;import org.apache.wicket.core.request.mapper.StalePageException;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;public class StalePageExceptionHandler extends AbstractExceptionHandler<StalePageException> {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPreserveDaysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPreserveDaysPage.javaindex fc023985ba..783ef2ccdf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPreserveDaysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPreserveDaysPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptEditPanel.javaindex 0fdb33e51e..2a460575c7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptEditPanel.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -75,7 +75,7 @@ public class ChatPromptEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -84,8 +84,9 @@ public class ChatPromptEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);savePrompt("changed");getSession().success(_T("Chat prompt has been saved"));target.add(form);@@ -106,7 +107,8 @@ public class ChatPromptEditPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();setPrompt(defaultValue);savePrompt("reverted");getSession().success(_T("Chat prompt has been reverted to default"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptsPage.javaindex d26cec3a6c..4f77384d53 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/ChatPromptsPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.support.administration.AiSetting;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/LiteModelPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/LiteModelPage.javaindex d9829832d4..d9ac5bbbdf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/LiteModelPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/aisetting/LiteModelPage.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.aisetting;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.javaindex d2b931fcf4..2bd999fad4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.authenticator;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex bdf1c4d7cf..873b3f18e8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -88,7 +88,8 @@ public class AuthenticatorPage extends AdministrationPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();if (editor.isValid()) {new ModalPanel(target) {@@ -102,13 +103,13 @@ public class AuthenticatorPage extends AdministrationPage {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(tokenEditor);}@Overrideprotected void onSubmit() {super.onSubmit();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(tokenEditor);target.focusComponent(null);close();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.javaindex ffd92d27d6..29e3cb59fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.brandingsetting;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Image;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.javaindex b91003e6a8..9170205b8f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.java@@ -41,8 +41,8 @@ class AddAgentPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newDockerInstructions();- target.add(content);AddAgentPanel.this.replace(content);+ target.add(content);}});@@ -51,8 +51,8 @@ class AddAgentPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newBareMetalInstructions();- target.add(content);AddAgentPanel.this.replace(content);+ target.add(content);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.javaindex 743d82f96e..1775206dc7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java@@ -55,7 +55,7 @@ public class AgentBuildsPage extends AgentDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(AgentBuildsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.javaindex 6b4df833cc..96b1ce6cc8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java@@ -6,7 +6,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.model.AgentAttribute;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.javaindex bafca8c116..d0a145c5b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java@@ -107,7 +107,7 @@ public class AgentListPage extends AdministrationPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(AgentListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex 0b9d300ce9..19f1fa340e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -9,7 +9,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -226,7 +226,7 @@ class AgentListPanel extends Panel {AgentListPanel.this.getFeedbackMessages().clear();queryModel.setObject((AgentQuery) object);queryStringModel.setObject(object.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -262,7 +262,7 @@ class AgentListPanel extends Panel {query.setSorts(object);queryModel.setObject(query);queryStringModel.setObject(query.toString());- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);target.add(queryInput);doQuery(target);}@@ -813,8 +813,8 @@ class AgentListPanel extends Panel {queryForm.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.javaindex 1e45a27dc0..2a076bc730 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java@@ -10,7 +10,7 @@ import java.util.List;import java.util.Map;import java.util.UUID;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -111,7 +111,7 @@ public class AgentOverviewPage extends AgentDetailPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -143,13 +143,13 @@ public class AgentOverviewPage extends AgentDetailPage {add(new Label("osArch", getAgent().getOsArch()));add(new AgentStatusBadge("status", agentModel));- add(new Label("accessToken", new AbstractReadOnlyModel<>() {+ add(new Label("accessToken", new IModel<>() {@Overridepublic Object getObject() {return getAgent().getToken().getValue();}}));- add(new CopyToClipboardLink("copyAccessToken", new AbstractReadOnlyModel<>() {+ add(new CopyToClipboardLink("copyAccessToken", new IModel<>() {@Overridepublic String getObject() {return getAgent().getToken().getValue();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentWorkspacesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentWorkspacesPage.javaindex d364d3c4db..cad7695735 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentWorkspacesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentWorkspacesPage.java@@ -55,7 +55,7 @@ public class AgentWorkspacesPage extends AgentDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(AgentWorkspacesPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.javaindex 237d00427d..02123735e1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.buildsetting.jobexecutor;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 395e78d211..558225da03 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -69,8 +69,9 @@ abstract class JobExecutorEditPanel extends Panel {AjaxButton saveButton = new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);JobExecutor executor = bean.getExecutor();if (executorIndex != -1) {@@ -97,8 +98,9 @@ abstract class JobExecutorEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.javaindex c0145babbf..ad2e710ea4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.jspecify.annotations.Nullable;@@ -47,7 +47,7 @@ public class JobExecutorsPage extends AdministrationPage {container = new WebMarkupContainer("jobExecutorSetting");container.setOutputMarkupId(true);add(container);- container.add(new ListView<>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {+ container.add(new ListView<>("executors", new IModel<List<JobExecutor>>() {@Overridepublic List<JobExecutor> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.javaindex 89fd34725e..3b3bcc8597 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java@@ -82,8 +82,8 @@ public class GpgTrustedKeysPage extends AdministrationPage {form.add(new AjaxButton("add") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {- super.onSubmit(target, myform);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);BaseGpgKey bean = (BaseGpgKey) editor.getModelObject();@@ -104,8 +104,9 @@ public class GpgTrustedKeysPage extends AdministrationPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.javaindex 9f14c0db38..389e79295b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java@@ -51,7 +51,7 @@ abstract class GroovyScriptEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -76,8 +76,9 @@ abstract class GroovyScriptEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (scriptIndex != -1) {GroovyScript oldScript = getScripts().get(scriptIndex);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupListPage.javaindex aaad1868dd..67ec529deb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupListPage.java@@ -122,7 +122,7 @@ public class GroupListPage extends AdministrationPage {String url = RequestCycle.get().urlFor(GroupListPage.class, params).toString();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, query);elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.javaindex a58430a4f5..0732b20361 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/membership/GroupMembershipsPage.java@@ -30,9 +30,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import com.google.common.collect.Sets;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.javaindex 1ab455ac63..f632fc6dfe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.issuesetting.fieldspec;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.javaindex 4fec59b443..193f92b474 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java@@ -53,7 +53,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -78,8 +78,9 @@ abstract class FieldEditPanel extends Panel implements InputContext {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);FieldSpec field = bean.getField();if (fieldIndex != -1) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.javaindex 748bdacb5f..2cd852b9be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateEditPanel.java@@ -44,7 +44,7 @@ abstract class IssueTemplateEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -69,8 +69,9 @@ abstract class IssueTemplateEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (editor.isValid()) {String oldAuditContent = null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.javaindex f15076a30b..004a904a01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java@@ -47,7 +47,7 @@ abstract class LinkSpecEditPanel extends GenericPanel<LinkSpec> {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -94,8 +94,9 @@ abstract class LinkSpecEditPanel extends GenericPanel<LinkSpec> {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (getSpec().getOpposite() != null && getSpec().getName().equals(getSpec().getOpposite().getName())) {String errorMessage = _T("Name and name on the other side should be different");diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.javaindex 541da3657d..b5dc25311d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/StateEditPanel.java@@ -50,7 +50,7 @@ abstract class StateEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -75,8 +75,9 @@ abstract class StateEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.javaindex 8c35419809..b18b0daecf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementBean.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.HashSet;import java.util.List;-import javax.validation.ConstraintValidatorContext;+import jakarta.validation.ConstraintValidatorContext;import io.onedev.server.model.LabelSpec;import io.onedev.server.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailConnectorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailConnectorPage.javaindex 28c66ea1ea..a02db767ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailConnectorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailConnectorPage.java@@ -10,7 +10,7 @@ import java.util.concurrent.ExecutionException;import java.util.concurrent.Future;import java.util.concurrent.atomic.AtomicReference;-import javax.mail.MessagingException;+import jakarta.mail.MessagingException;import org.apache.wicket.Component;import org.apache.wicket.event.IEvent;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.javaindex 2875b7134e..5e02dd3b92 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java@@ -7,7 +7,7 @@ import java.lang.reflect.InvocationTargetException;import java.text.MessageFormat;import org.jspecify.annotations.Nullable;-import javax.validation.Validator;+import jakarta.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.javaindex 6659e36ff9..75f190d62d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java@@ -120,7 +120,7 @@ public class RoleListPage extends AdministrationPage {String url = RequestCycle.get().urlFor(RoleListPage.class, params).toString();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, query);elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.javaindex 656a066da4..8f114242c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -54,7 +53,7 @@ public class ServerInformationPage extends ServerDetailPage {}});- add(new Label("memoryUsage", new AbstractReadOnlyModel<String>() {+ add(new Label("memoryUsage", new IModel<String>() {@Overridepublic String getObject() {return serverInformationModel.getObject().memoryUsage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProviderBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProviderBean.javaindex 712e443df7..cb7e3b166f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProviderBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProviderBean.java@@ -2,8 +2,8 @@ package io.onedev.server.web.page.admin.ssosetting;import java.io.Serializable;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.javaindex 62c605dba7..f6a390f758 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java@@ -101,7 +101,7 @@ public class InvitationListPage extends AdministrationPage {String url = RequestCycle.get().urlFor(InvitationListPage.class, params).toString();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, query);elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.javaindex 5e12d8f799..78f46767e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java@@ -6,10 +6,10 @@ import java.io.Serializable;import java.text.MessageFormat;import java.util.List;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;-import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;+import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;import com.google.common.base.Splitter;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.javaindex 7414902fbc..138f7fd2ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.model.User.Type.AI;import static io.onedev.server.model.User.Type.ORDINARY;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Component;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex e112c4cc76..0a6cd5aa98 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -33,7 +33,6 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -188,7 +187,7 @@ public class UserListPage extends AdministrationPage {state.query = object;var params = paramsOf(state, 0);var url = RequestCycle.get().urlFor(UserListPage.class, params).toString();- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, state);else@@ -829,7 +828,7 @@ public class UserListPage extends AdministrationPage {}});- includeDisabledLink.add(new SpriteImage("icon", new AbstractReadOnlyModel<String>() {+ includeDisabledLink.add(new SpriteImage("icon", new IModel<String>() {@Overridepublic String getObject() {@@ -843,7 +842,7 @@ public class UserListPage extends AdministrationPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerBean.javaindex c2f7d7b05d..8f332887b3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.workspaceprovisioner;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerEditPanel.javaindex 7b0ee3dd0e..1486723f7a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionerEditPanel.java@@ -86,8 +86,9 @@ abstract class WorkspaceProvisionerEditPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);WorkspaceProvisioner provisioner = bean.getProvisioner();if (provisonerIndex != -1) {@@ -113,8 +114,9 @@ abstract class WorkspaceProvisionerEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionersPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionersPage.javaindex 2c0064d976..01d49dce0e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionersPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/workspaceprovisioner/WorkspaceProvisionersPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.jspecify.annotations.Nullable;@@ -48,7 +48,7 @@ public class WorkspaceProvisionersPage extends AdministrationPage {container.setOutputMarkupId(true);add(container);- container.add(new ListView<>("provisioners", new AbstractReadOnlyModel<List<WorkspaceProvisioner>>() {+ container.add(new ListView<>("provisioners", new IModel<List<WorkspaceProvisioner>>() {@Overridepublic List<WorkspaceProvisioner> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 7df7a04f86..5549e6faf1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -16,8 +16,8 @@ import java.util.Locale;import java.util.Set;import java.util.concurrent.CompletableFuture;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.commons.codec.binary.Base64;import org.apache.commons.lang3.SerializationUtils;@@ -42,7 +42,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.WebPage;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.FeedbackPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.protocol.ws.api.WebSocketBehavior;import org.apache.wicket.protocol.ws.api.event.WebSocketPushPayload;@@ -275,12 +275,11 @@ public abstract class BasePage extends WebPage {try {response.render(OnDomReadyHeaderItem.forScript(- String.format("onedev.server.onDomReady('%s', '%s', %s, %s, %d, %d, %s);",+ String.format("onedev.server.onDomReady('%s', '%s', %s, %s, %d, %s);",String.valueOf(OneDev.getInstance().getBootDate().getTime()),SpriteImage.getVersionedHref(IconScope.class, null),popStateBehavior.getCallbackFunction(explicit("data")).toString(),objectMapper.writeValueAsString(getRemoveAutosaveKeys()),- WebSocketService.KEEP_ALIVE_INTERVAL*2000,sessionKeepAliveInterval,objectMapper.writeValueAsString(translations))));} catch (JsonProcessingException e) {@@ -558,7 +557,7 @@ public abstract class BasePage extends WebPage {}public void removeAutosaveKey(String autosaveKey) {- var target = RequestCycle.get().find(AjaxRequestTarget.class);+ var target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null) {target.prependJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 5a9e44a74f..6a04f002de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -348,7 +348,7 @@ onedev.server = {}},- setupWebSocket: function(webSocketTimeout, sessionKeepAliveInterval) {+ setupWebSocket: function(sessionKeepAliveInterval) {var pageUnloading = false;$(window).on("beforeunload", function() {@@ -929,7 +929,7 @@ onedev.server = {elsereturn translations["{0}s"].replace("{0}", "0");},- onDomReady: function(bootTimestamp, icons, popStateCallback, removeAutosaveKeys, webSocketTimeout, sessionKeepAliveInterval, translations) {+ onDomReady: function(bootTimestamp, icons, popStateCallback, removeAutosaveKeys, sessionKeepAliveInterval, translations) {onedev.server.translations = translations;onedev.server.bootTimestamp = bootTimestamp;@@ -994,7 +994,7 @@ onedev.server = {onedev.server.setupAjaxLoadingIndicator();onedev.server.form.setupDirtyCheck();- onedev.server.setupWebSocket(webSocketTimeout, sessionKeepAliveInterval);+ onedev.server.setupWebSocket(sessionKeepAliveInterval);onedev.server.mouseState.track();onedev.server.ajaxRequests.track();onedev.server.setupInputClear();diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex c7bd3dc589..7eeebc87cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -116,7 +116,7 @@ public class BuildListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(BuildListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.javaindex f1b01646b1..b3abad8200 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.java@@ -1,7 +1,7 @@package io.onedev.server.web.page.error;import static io.onedev.server.web.translation.Translation._T;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.htmlindex a24c0df8a2..7e7484439a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.html@@ -1,4 +1,4 @@<wicket:extend><pre wicket:id="inUseDetail" class="mb-5 text-left alert alert-light font-size-sm"></pre>- <a class="btn btn-primary" href="javascript:window.history.back();"><wicket:t>Go Back</wicket:t></a>+ <a class="btn btn-primary" href="#" onclick="window.history.back(); return false;"><wicket:t>Go Back</wicket:t></a></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.javaindex 758a08ae0b..9113e10f19 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/error/InUseErrorPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.WebComponent;diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/PageNotFoundErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/error/PageNotFoundErrorPage.javaindex 5c4f99fb11..2c50618c4d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/PageNotFoundErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/error/PageNotFoundErrorPage.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.error;import static io.onedev.server.web.translation.Translation._T;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.markup.html.WebComponent;import org.apache.wicket.markup.html.link.BookmarkablePageLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.javaindex 9d76bc4463..f1c3734899 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpPage.java@@ -5,9 +5,9 @@ import static io.onedev.server.web.translation.Translation._T;import java.lang.reflect.Method;import org.jspecify.annotations.Nullable;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.PUT;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.PUT;import org.apache.commons.lang.StringUtils;import org.apache.wicket.Component;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.javaindex 210b9b3f9e..2fd20e4925 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java@@ -21,11 +21,11 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Transient;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;+import jakarta.persistence.OneToOne;+import jakarta.persistence.Transient;import org.objenesis.ObjenesisStd;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.javaindex 76513ea00d..ca1a6b737d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -34,11 +33,11 @@ import org.apache.wicket.util.visit.IVisitor;import org.glassfish.jersey.server.ResourceConfig;import org.jspecify.annotations.Nullable;-import javax.persistence.Id;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.ws.rs.GET;-import javax.ws.rs.Path;+import jakarta.persistence.Id;+import jakarta.persistence.JoinColumn;+import jakarta.persistence.ManyToOne;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;import java.io.Serializable;import java.lang.reflect.Method;import java.lang.reflect.Modifier;@@ -311,7 +310,7 @@ public class ExampleValuePanel extends Panel {private Fragment newArrayFragment() {Fragment fragment = new Fragment("content", "arrayFrag", this);- fragment.add(new ListView<>("elements", new AbstractReadOnlyModel<List<Serializable>>() {+ fragment.add(new ListView<>("elements", new IModel<List<Serializable>>() {@SuppressWarnings("unchecked")@Override@@ -371,7 +370,7 @@ public class ExampleValuePanel extends Panel {fragment.add(new WebMarkupContainer("typeInfo").setVisible(false));IModel<List<Map.Entry<Serializable, Serializable>>> entriesModel =- new AbstractReadOnlyModel<>() {+ new IModel<>() {@SuppressWarnings("unchecked")@Override@@ -471,7 +470,7 @@ public class ExampleValuePanel extends Panel {};typeInfoFragment.add(new ExampleValuePanel("name", Model.of(JsonTypeInfo.Id.NAME.getDefaultPropertyName()),valueInfoModel, requestBodyClass));- typeInfoFragment.add(new ExampleValuePanel("value", new AbstractReadOnlyModel<>() {+ typeInfoFragment.add(new ExampleValuePanel("value", new IModel<>() {@Overridepublic Serializable getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.javaindex a0fa8ac4c2..7d2efb0b09 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java@@ -14,13 +14,13 @@ import java.util.List;import java.util.Map;import java.util.regex.Matcher;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.QueryParam;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.apache.wicket.Component;import org.apache.wicket.event.IEvent;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.javaindex ef08fd2572..452c57f686 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java@@ -4,11 +4,11 @@ import java.lang.reflect.Method;import java.util.ArrayList;import java.util.List;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.PUT;-import javax.ws.rs.Path;+import jakarta.ws.rs.DELETE;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.PUT;+import jakarta.ws.rs.Path;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.javaindex 4106ea28eb..8d3d60ce0a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java@@ -6,7 +6,7 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import javax.ws.rs.Path;+import jakarta.ws.rs.Path;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javaindex 9099930001..eb9c5496e0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java@@ -126,7 +126,7 @@ public class IssueListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(IssueListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 88e6e053e5..5181a91e99 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -5,8 +5,8 @@<span wicket:id="brandLogo"></span><span wicket:id="brandName"></span></a>- <a href="javascript:void(0);" class="sidebar-mini-toggle d-none d-lg-inline"><wicket:svg href="expand3" class="icon"></wicket:svg></a>- <a href="javascript:void(0);" class="sidebar-close d-lg-none"><wicket:svg href="times" class="icon"></wicket:svg></a>+ <a href="#" class="sidebar-mini-toggle d-none d-lg-inline"><wicket:svg href="expand3" class="icon"></wicket:svg></a>+ <a href="#" class="sidebar-close d-lg-none"><wicket:svg href="times" class="icon"></wicket:svg></a></div><div class="sidebar-body ps ps-scroll"><div wicket:id="menus" class="sidebar-menu">diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 086f4c37bd..bc5844a7bd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -18,8 +18,8 @@ import java.util.List;import java.util.Locale;import java.util.Properties;-import javax.servlet.http.Cookie;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.Cookie;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.Component;import org.apache.wicket.Page;@@ -50,7 +50,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -58,7 +57,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Order;+import io.onedev.server.persistence.dao.Order;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@ -659,7 +658,7 @@ public abstract class LayoutPage extends BasePage {var fragment = new Fragment(componentId, "alertMessageFrag", LayoutPage.this);fragment.add(new Label("subject", alert.getSubject()).setEscapeModelStrings(false));- var detail = new Label("detail", new AbstractReadOnlyModel<String>() {+ var detail = new Label("detail", new IModel<String>() {@Overridepublic String getObject() {return rowModel.getObject().getDetail();diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.jsindex 54de4cfdf3..1ca504bc34 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js@@ -189,4 +189,4 @@ onedev.server.layout = {if (newVersionStatusCallback)newVersionStatusCallback(newVersionStatus);}-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyBehaviorPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyBehaviorPage.javaindex 59409b44f8..e54be1f2c4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyBehaviorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyBehaviorPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.my.aisetting;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -16,7 +16,7 @@ public class MyBehaviorPage extends MyAiSettingPage {protected void onInitialize() {super.onInitialize();- add(new BehaviorPanel("behavior", new AbstractReadOnlyModel<User>() {+ add(new BehaviorPanel("behavior", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyEntitlementSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyEntitlementSettingPage.javaindex b06ad2a9f9..5d9b772ce7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyEntitlementSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyEntitlementSettingPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.my.aisetting;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -16,7 +16,7 @@ public class MyEntitlementSettingPage extends MyAiSettingPage {protected void onInitialize() {super.onInitialize();- add(new EntitlementSettingPanel("content", new AbstractReadOnlyModel<User>() {+ add(new EntitlementSettingPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyModelSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyModelSettingPage.javaindex 568dcd9988..2e427f9c15 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyModelSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/aisetting/MyModelSettingPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.my.aisetting;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -16,7 +16,7 @@ public class MyModelSettingPage extends MyAiSettingPage {protected void onInitialize() {super.onInitialize();- add(new ModelSettingPanel("content", new AbstractReadOnlyModel<User>() {+ add(new ModelSettingPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.javaindex 5bb463ebea..80b870489d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -20,7 +20,7 @@ public class MyAvatarPage extends MyPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new AvatarEditPanel("content", new AbstractReadOnlyModel<User>() {+ add(new AvatarEditPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.javaindex 7443ca5638..5e017d486c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/basicsetting/MyBasicSettingPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -20,7 +20,7 @@ public class MyBasicSettingPage extends MyPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new BasicSettingPanel("content", new AbstractReadOnlyModel<>() {+ add(new BasicSettingPanel("content", new IModel<>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.javaindex 32ef9bb580..6f4f97df4c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -21,7 +21,7 @@ public class MyEmailAddressesPage extends MyPage {protected void onInitialize() {super.onInitialize();- add(new EmailAddressesPanel("content", new AbstractReadOnlyModel<User>() {+ add(new EmailAddressesPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.javaindex b9ee238b3a..ad827ed47f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java@@ -10,7 +10,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;public class MyPasswordPage extends MyPage {@@ -27,7 +27,7 @@ public class MyPasswordPage extends MyPage {protected void onInitialize() {super.onInitialize();- add(new PasswordEditPanel("content", new AbstractReadOnlyModel<User>() {+ add(new PasswordEditPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javaindex ed6c6e5a0b..4aff086ccc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java@@ -7,7 +7,7 @@ import java.io.Serializable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -43,7 +43,7 @@ public class MyProfilePage extends MyPage {}private Component newUserProfile() {- return new UserProfilePanel("profile", new AbstractReadOnlyModel<User>() {+ return new UserProfilePanel("profile", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.javaindex d14d9097c8..d2356217b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java@@ -6,7 +6,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -30,7 +30,7 @@ public class MyQueryWatchesPage extends MyPage {protected void onInitialize() {super.onInitialize();- add(new QueryWatchesPanel("content", new AbstractReadOnlyModel<>() {+ add(new QueryWatchesPanel("content", new IModel<>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.javaindex 79cc587224..241a515747 100644--- a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java@@ -116,7 +116,7 @@ public class PackListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(PackListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex fa88cd60a7..1a09da90e1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -120,7 +120,7 @@ public class ProjectListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, expectedCount) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 1833c327ab..a30692b65c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -9,8 +9,8 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -28,7 +28,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.javaindex f989edb58f..eabf962915 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java@@ -72,8 +72,8 @@ public abstract class BlobUploadPanel extends Panel {form.add(new AjaxButton("upload") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String commitMessage = BlobUploadPanel.this.commitMessage;if (StringUtils.isBlank(commitMessage))@@ -88,8 +88,8 @@ public abstract class BlobUploadPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 05af00db11..196e16c669 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -16,7 +16,7 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;@@ -39,7 +39,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;@@ -709,7 +708,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,}private QuickSearchPanel newQuickSearchPanel(String id, ModalPanel modal) {- return new QuickSearchPanel(id, projectModel, new AbstractReadOnlyModel<String>() {+ return new QuickSearchPanel(id, projectModel, new IModel<String>() {@Overridepublic String getObject() {@@ -751,7 +750,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,*/advancedSearchPanelModal = modal;if (advancedSearchPanel == null) {- advancedSearchPanel = new AdvancedSearchPanel(id, projectModel, new AbstractReadOnlyModel<String>() {+ advancedSearchPanel = new AdvancedSearchPanel(id, projectModel, new IModel<String>() {@Overridepublic String getObject() {@@ -1643,7 +1642,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,else if (getProject().isCommitSignatureRequiredButNoSigningKey(user, blobIdent.revision))signRequired = true;- BlobContent blobContent = new BlobContent(item.get(), FileMode.REGULAR_FILE.getBits());+ BlobContent blobContent = new BlobContent(FileUpload.readBytes(item), FileMode.REGULAR_FILE.getBits());newBlobs.put(blobPath, blobContent);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex d176d4dd96..739cd5619f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -195,8 +195,9 @@ public class CommitOptionPanel extends Panel {AjaxButton saveButton = new AjaxButton("save") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -217,8 +218,8 @@ public class CommitOptionPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);if (save(target)) {String script = String.format(""diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex e3f885d1ef..4851093182 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -108,14 +108,15 @@ public abstract class BlobEditPanel extends Panel {return new AjaxSubmitLink(componentId) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (tab == Tab.FLUSH) {if (currentTab == Tab.EDIT&& editor instanceof EditCompleteAware&& !((EditCompleteAware)editor).onEditComplete(target)) {- onError(target, form);+ onError(target);} else {onFlushed(target, editor.getModelObject());}@@ -123,7 +124,7 @@ public abstract class BlobEditPanel extends Panel {if (currentTab == Tab.EDIT&& editor instanceof EditCompleteAware&& !((EditCompleteAware)editor).onEditComplete(target)) {- onError(target, form);+ onError(target);} else {var editingContent = editor.getModelObject();if (tab == Tab.EDIT) {@@ -153,8 +154,8 @@ public abstract class BlobEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);updateForm(target);if (tab == Tab.FLUSH)onFlushError(target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.javaindex 032d664fb6..83ac0062cc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java@@ -19,7 +19,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -225,7 +224,7 @@ public class FolderViewPanel extends Panel {}};- readmeContainer.add(new Label("title", new AbstractReadOnlyModel<String>() {+ readmeContainer.add(new Label("title", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.javaindex f8bc7fc6b9..b45233de62 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.blob.render.folder;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;+import io.onedev.server.git.LastCommitsOfChildren;import io.onedev.server.service.EmailAddressService;import io.onedev.server.entityreference.LinkTransformer;import io.onedev.server.model.EmailAddress;@@ -19,7 +20,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;import org.jspecify.annotations.Nullable;import java.io.IOException;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.javaindex b5d753b699..37e4eba29f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java@@ -11,8 +11,8 @@ import java.util.Map;import java.util.concurrent.CompletableFuture;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.validation.Validator;+import jakarta.inject.Inject;+import jakarta.validation.Validator;import org.apache.shiro.subject.Subject;import org.apache.wicket.Component;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex b37845761f..ad6dd5baeb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -13,8 +13,8 @@ import java.util.List;import java.util.Map;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintViolation;-import javax.validation.Validator;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 45ce75606e..c836b8143b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -11,8 +11,8 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.validation.ConstraintViolation;-import javax.validation.Validator;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Validator;import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;@@ -35,7 +35,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;@@ -239,8 +239,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);Job job = getJobs().get(jobIndex);pushState(target, "jobs/" + job.getName());setupJobDetail(target, buildSpec.getJobs().indexOf(job));@@ -250,8 +250,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(jobsEditor);resizeWindow(target);}@@ -275,15 +275,15 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bureturn new AjaxSubmitLink(id, form) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);dropdown.close();addJob(target, SerializationUtils.clone(getJobs().get(jobIndex)));}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(jobsEditor);resizeWindow(target);}@@ -346,14 +346,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements BuAjaxSubmitLink createLink = new AjaxSubmitLink("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);addJob(target, new Job());}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(jobsEditor);resizeWindow(target);}@@ -393,15 +393,15 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bureturn new AjaxSubmitLink(id, createLink.findParent(Form.class)) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);addJob(target, job);dropdown.close();}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(jobsEditor.get("pipeline"));resizeWindow(target);}@@ -616,16 +616,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buadd(new AjaxSubmitLink("jobs") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, "jobs");setupJobsEditor(target);resizeWindow(target);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(getParent());resizeWindow(target);}@@ -635,16 +635,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buadd(new AjaxSubmitLink("services") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, "services");setupServicesEditor(target);resizeWindow(target);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(getParent());resizeWindow(target);}@@ -654,16 +654,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buadd(new AjaxSubmitLink("stepTemplates") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, "step-templates");setupStepTemplatesEditor(target);resizeWindow(target);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(getParent());resizeWindow(target);}@@ -673,16 +673,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buadd(new AjaxSubmitLink("properties") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, "properties");setupPropertiesEditor(target);resizeWindow(target);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(getParent());resizeWindow(target);}@@ -692,16 +692,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buadd(new AjaxSubmitLink("imports") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, "imports");setupImportsEditor(target);resizeWindow(target);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(getParent());resizeWindow(target);}@@ -852,7 +852,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@Overridepublic void convertInput() {if (parseResult instanceof BuildSpec) {- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);send(this, Broadcast.BREADTH, new FormSubmitted(target));setConvertedInput(VersionedYamlDoc.fromBean(parseResult).toYaml().getBytes(StandardCharsets.UTF_8));} else {@@ -1016,7 +1016,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu};- navs.add(new ListView<T>("navs", new AbstractReadOnlyModel<List<T>>() {+ navs.add(new ListView<T>("navs", new IModel<List<T>>() {@Overridepublic List<T> getObject() {@@ -1032,7 +1032,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -1047,8 +1047,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target, getUrlSegment(elementClass) + "s/" + item.getModelObject().getName());setupElementDetail(target, item.getIndex());target.appendJavaScript(String.format(@@ -1057,8 +1057,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(ElementsEditor.this);resizeWindow(target);}@@ -1083,15 +1083,15 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bureturn new AjaxSubmitLink(id, form) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);dropdown.close();addElement(target, SerializationUtils.clone(getElements().get(item.getIndex())));}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(ElementsEditor.this);resizeWindow(target);}@@ -1186,8 +1186,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements BuAjaxSubmitLink createLink = new AjaxSubmitLink("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);T newElement;try {newElement = elementClass.getDeclaredConstructor().newInstance();@@ -1199,8 +1199,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(ElementsEditor.this);resizeWindow(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 612b26d6fb..14f154a509 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.blob.render.source;+import java.util.Date;+import static io.onedev.server.web.translation.Translation._T;import static java.util.concurrent.CompletableFuture.completedFuture;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -15,8 +17,8 @@ import java.util.Set;import java.util.UUID;import java.util.concurrent.CompletableFuture;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.shiro.subject.Subject;import org.apache.wicket.Component;@@ -44,7 +46,6 @@ import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -407,7 +408,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.replace("data-tippy-content", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.replace("data-tippy-content", new IModel<String>() {@Overridepublic String getObject() {@@ -612,14 +613,14 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searform.add(new AjaxButton("save") {@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);String content = contentInput.getModelObject();if (content.length() > CodeComment.MAX_CONTENT_LEN) {@@ -1011,7 +1012,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searfor (BlameBlock blame: gitService.blame(context.getProject(), context.getCommit().copy(), context.getBlobIdent().path, null)) {BlameInfo blameInfo = new BlameInfo();- blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());+ blameInfo.commitDate = DateUtils.formatDate(Date.from(blame.getCommit().getCommitter().getWhenAsInstant()));blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());blameInfo.hash = blame.getCommit().getHash();blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.jsindex bd59bd4739..84e4d494de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js@@ -634,7 +634,7 @@ onedev.server.sourceView = {$("<a class='hash'>" + blameInfo.abbreviatedHash + "</a>").appendTo($gutter).attr("href", blameInfo.url)- .attr("onclick", "onedev.server.viewState.getFromViewAndSetToHistory();");+ .attr("onclick", "onedev.server.viewState.getFromViewAndSetToHistory();");var $hashLink = $gutter.children("a.hash");$hashLink.data("hash", blameInfo.hash);$hashLink.data("line", range.from);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex f75f279b3e..fb46ee21b4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.resource.ContentDisposition;@@ -186,7 +186,7 @@ public abstract class BlobViewPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new Label("lines", new AbstractReadOnlyModel<String>() {+ add(new Label("lines", new IModel<String>() {@Overridepublic String getObject() {@@ -205,7 +205,7 @@ public abstract class BlobViewPanel extends Panel {});- add(new Label("charset", new AbstractReadOnlyModel<String>() {+ add(new Label("charset", new IModel<String>() {@Overridepublic String getObject() {@@ -301,7 +301,7 @@ public abstract class BlobViewPanel extends Panel {add(newExtraOptions("extraOptions"));newChangeActions(null);- add(new Label("fileTooLarge", new AbstractReadOnlyModel<String>() {+ add(new Label("fileTooLarge", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 4f61a2b4e7..54686dca2c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -240,14 +240,15 @@ public abstract class AdvancedSearchPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);option = optionEditor.getModelObject();runTaskBehavior.requestRun(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 6392bef290..c51555622a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.image.Image;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;@@ -212,7 +211,7 @@ public abstract class QuickSearchPanel extends Panel {};result.setOutputMarkupPlaceholderTag(true);- result.add(new ListView<QueryHit>("symbolHits", new AbstractReadOnlyModel<List<QueryHit>>() {+ result.add(new ListView<QueryHit>("symbolHits", new IModel<List<QueryHit>>() {@Overridepublic List<QueryHit> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex a27142bf01..8c87aea8f5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.link.DisabledAttributeLinkBehavior;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;@@ -122,13 +122,12 @@ public abstract class SearchResultPanel extends Panel {return OneDev.getInstance(SettingService.class).getPerformanceSetting().getMaxCodeSearchEntries();}- @SuppressWarnings("deprecation")private void onActiveIndexChange(AjaxRequestTarget target) {- Component hitsContainer = blobsView.get(activeBlobIndex).get(HITS_ID);+ Component hitsContainer = blobsView.stream().toList().get(activeBlobIndex).get(HITS_ID);if (!hitsContainer.isVisibilityAllowed()) {hitsContainer.setVisibilityAllowed(true);target.add(hitsContainer);- target.add(blobsView.get(activeBlobIndex).get(EXPAND_LINK_ID));+ target.add(blobsView.stream().toList().get(activeBlobIndex).get(EXPAND_LINK_ID));}String activeLinkId = getMarkupId() + "-" + activeBlobIndex;@@ -407,7 +406,7 @@ public abstract class SearchResultPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new SpriteImage("icon", new AbstractReadOnlyModel<String>() {+ add(new SpriteImage("icon", new IModel<String>() {@Overridepublic String getObject() {@@ -417,7 +416,7 @@ public abstract class SearchResultPanel extends Panel {return "arrow";}- }).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ }).add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/CreateBranchBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/CreateBranchBeanWithRevision.javaindex 04e498de3d..8f66e915ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/CreateBranchBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/CreateBranchBeanWithRevision.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.RevisionChoice;import io.onedev.server.web.component.branch.create.CreateBranchBean;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editablepublic class CreateBranchBeanWithRevision extends CreateBranchBean {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex bc271ab511..55705efb1b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -16,7 +16,7 @@ import java.util.Locale;import java.util.Map;import java.util.stream.Collectors;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.validator.routines.PercentValidator;import org.apache.wicket.Component;@@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -342,7 +341,7 @@ public class ProjectBranchesPage extends ProjectPage {String url = RequestCycle.get().urlFor(ProjectBranchesPage.class, params).toString();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, query);else@@ -385,8 +384,9 @@ public class ProjectBranchesPage extends ProjectPage {form.add(new AjaxButton("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String branchName = helperBean.getName();User user = Preconditions.checkNotNull(getLoginUser());@@ -414,8 +414,9 @@ public class ProjectBranchesPage extends ProjectPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -744,7 +745,7 @@ public class ProjectBranchesPage extends ProjectPage {@Overridepublic IModel<RefFacade> model(RefFacade object) {String branch = GitUtils.ref2branch(object.getName());- return new AbstractReadOnlyModel<RefFacade>() {+ return new IModel<RefFacade>() {@Overridepublic RefFacade getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex fe4ec3b6f5..6c2ab57e6f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -137,7 +137,7 @@ public class ProjectBuildsPage extends ProjectPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectBuildsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/ArtifactUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/ArtifactUploadPanel.javaindex 2fa8d2f942..4dd1eb7938 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/ArtifactUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/ArtifactUploadPanel.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.IOException;-import org.apache.commons.fileupload.FileItem;+import org.apache.commons.fileupload2.core.FileItem;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -69,7 +69,7 @@ public abstract class ArtifactUploadPanel extends Panel {form.add(new AjaxButton("upload") {- private String getArtifactPath(FileItem file) {+ private String getArtifactPath(FileItem<?> file) {String artifactPath = FilenameUtils.sanitizeFileName(FileUpload.getFileName(file));if (directory != null)artifactPath = directory + "/" + artifactPath;@@ -77,8 +77,8 @@ public abstract class ArtifactUploadPanel extends Panel {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);if (directory != null && directory.contains("..")) {error(_T("'..' is not allowed in the directory"));@@ -104,8 +104,8 @@ public abstract class ArtifactUploadPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(feedback);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex bf824f26af..547caa84ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -11,8 +11,8 @@ import java.util.Comparator;import java.util.List;import java.util.Set;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -222,7 +221,7 @@ public abstract class BuildDetailPage extends ProjectPageprotected void onInitialize() {super.onInitialize();- add(new Label("caption", new AbstractReadOnlyModel<String>() {+ add(new Label("caption", new IModel<String>() {@Overridepublic String getObject() {@@ -242,7 +241,7 @@ public abstract class BuildDetailPage extends ProjectPageadd(new Label("number", "#" + getBuild().getNumber()));- add(new BuildStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {+ add(new BuildStatusIcon("statusIcon", new IModel<Status>() {@Overridepublic Status getObject() {@@ -257,7 +256,7 @@ public abstract class BuildDetailPage extends ProjectPage}});- add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {+ add(new Label("statusLabel", new IModel<String>() {@Overridepublic String getObject() {@@ -493,7 +492,7 @@ public abstract class BuildDetailPage extends ProjectPage};- jobNotFoundContainer.add(new Label("message", new AbstractReadOnlyModel<String>() {+ jobNotFoundContainer.add(new Label("message", new IModel<String>() {@Overridepublic String getObject() {@@ -516,7 +515,7 @@ public abstract class BuildDetailPage extends ProjectPageadd(jobNotFoundContainer);- add(new MarkdownViewer("description", new AbstractReadOnlyModel<>() {+ add(new MarkdownViewer("description", new IModel<>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.javaindex f9e3392cec..3fffa607e6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import org.apache.wicket.Component;import org.apache.wicket.Session;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.javaindex 7878f370cf..cacdc38142 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java@@ -69,7 +69,7 @@ public class BuildChangesPage extends BuildDetailPage {PageParameters params = getPageParameters();params.set(PARAM_QUERY, query);CharSequence url = RequestCycle.get().urlFor(BuildChangesPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex 1c5fa1ae0e..e3382f7240 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -58,7 +58,7 @@ public class FixedIssuesPage extends BuildDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(FixedIssuesPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.javaindex 64d89f9849..3b3b6b0a33 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.project.builds.detail.log;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.markup.html.link.ResourceLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.javaindex c73f700922..c69d9b2d59 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.codecomments;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.javaindex 46e7049a43..a16f4c802c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java@@ -118,7 +118,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectCodeCommentsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/BranchChoiceBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/BranchChoiceBean.javaindex 1be6148752..426580c171 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/BranchChoiceBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/BranchChoiceBean.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.web.util.WicketUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 0452a48dcf..57ac46af98 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -643,7 +643,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS@Overridepublic void setObject(String object) {state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -661,7 +661,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS@Overridepublic void setObject(String object) {state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -679,7 +679,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS@Overridepublic void setObject(WhitespaceOption object) {state.whitespaceOption = object;- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);newParentsContainer(target);pushState(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.javaindex 2fc48753bd..83a249dd73 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.commits;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex fc800363e3..00a1115013 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -124,7 +124,7 @@ public class ProjectCommitsPage extends ProjectPage {PageParameters params = getPageParameters();params.set(PARAM_QUERY, query);CharSequence url = RequestCycle.get().urlFor(ProjectCommitsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 899fac8e2f..07cde74364 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -15,7 +15,7 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -580,7 +580,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic void setObject(String object) {state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -599,7 +599,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic void setObject(String object) {state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -617,7 +617,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic void setObject(WhitespaceOption object) {state.whitespaceOption = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -655,7 +655,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic void setObject(String object) {state.commitQuery = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.javaindex 5ff310efb1..fa58ed37ad 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java@@ -94,8 +94,9 @@ public class ProjectImportPage extends LayoutPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -114,8 +115,9 @@ public class ProjectImportPage extends LayoutPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.javaindex 2c14b479f9..2ab6852b09 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.util.visit.IVisitor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.javaindex 4928885cee..c9c5d69a2a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.java@@ -7,7 +7,7 @@ import io.onedev.server.annotation.ShowCondition;import io.onedev.server.service.ProjectService;import io.onedev.server.util.EditContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 6b917e0f1c..963990bf50 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -11,7 +11,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.Session;@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -149,7 +149,6 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {return null;}- @SuppressWarnings("deprecation")@Overrideprotected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {return new AttachAjaxIndicatorListener(@@ -175,7 +174,6 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {if (field != null && field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {avatarsView.add(new FieldValuesPanel(avatarsView.newChildId(), Mode.AVATAR, true) {- @SuppressWarnings("deprecation")@Overrideprotected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {return new AttachAjaxIndicatorListener(avatarsView.get(0), AttachMode.PREPEND, false);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 291dab2c6e..d714bd07bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -14,7 +14,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;@@ -282,7 +282,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});- RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {@Overridepublic void onEndRequest(RequestCycle cycle) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 62d7cd44cd..2af0cceb3e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -16,7 +16,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.util.visit.IVisitor;import io.onedev.commons.utils.ExplicitException;@@ -132,7 +132,6 @@ abstract class CardListPanel extends Panel {private BoardCardPanel newCard(Long issueId) {return new BoardCardPanel(String.valueOf(issueId), issueId) {- @SuppressWarnings("deprecation")@Overrideprotected Cursor getCursor() {IssueQuery query = getQuery();@@ -217,7 +216,6 @@ abstract class CardListPanel extends Panel {void onCardDropped(AjaxRequestTarget target, Long issueId, int cardIndex, boolean accepted) {findParent(RepeatingView.class).visitChildren(CardListPanel.class, (IVisitor<CardListPanel, Void>) (cardListPanel, visit) -> {for (int i=0; i<cardListPanel.cardsView.size(); i++) {- @SuppressWarnings("deprecation")var card = (BoardCardPanel) cardListPanel.cardsView.get(i);if (card.getIssueId().equals(issueId)) {if (accepted) {@@ -246,7 +244,6 @@ abstract class CardListPanel extends Panel {});}- @SuppressWarnings("deprecation")private void moveCard(int fromIndex, int toIndex) {if (fromIndex < toIndex) {for (int i=0; i<toIndex-fromIndex; i++)@@ -257,7 +254,6 @@ abstract class CardListPanel extends Panel {}}- @SuppressWarnings("deprecation")private Issue getIssue(int cardIndex) {return getIssueService().load(((BoardCardPanel) cardsView.get(cardIndex)).getIssueId());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex db1e6cd55e..d5f07b7e8e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -764,8 +764,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {form.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);doQuery(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex 6cbfb19bef..95dd921383 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -47,8 +47,8 @@ abstract class NewBoardPanel extends Panel {form.add(new AjaxButton("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);int indexWithSameName = BoardSpec.getBoardIndex(boards, newBoard.getName());if (indexWithSameName != -1) {editor.error(new Path(new PathNode.Named("name")),@@ -69,8 +69,8 @@ abstract class NewBoardPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(NewBoardPanel.this);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 992725fa74..a376f694e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -54,8 +54,8 @@ abstract class StateTransitionPanel extends Panel implements InputContext {form.add(new AjaxButton("ok") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);Collection<String> editableFields = FieldUtils.getEditableFields(getIssue().getProject(), transition.getPromptFields());@@ -66,8 +66,9 @@ abstract class StateTransitionPanel extends Panel implements InputContext {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.javaindex d6f691a352..e733f116d6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java@@ -54,7 +54,7 @@ public class IssueBuildsPage extends IssueDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex b0904c08b1..584f28a7b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -8,8 +8,8 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -368,7 +368,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input});- RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {@Overridepublic void onEndRequest(RequestCycle cycle) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.javaindex 82632ebc49..c4fbdb2aaa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java@@ -96,8 +96,9 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -116,8 +117,9 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.javaindex f3c1cc8a82..1eab5df4f7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java@@ -12,7 +12,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.IChoiceRenderer;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -98,7 +97,7 @@ public class IterationBurndownPage extends IterationDetailPage {}private void newBurndown(@Nullable AjaxRequestTarget target) {- var burndown = new IterationBurndownPanel("burndown", new AbstractReadOnlyModel<>() {+ var burndown = new IterationBurndownPanel("burndown", new IModel<>() {@Overridepublic Iteration getObject() {return getIteration();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.javaindex ab4ec35f64..9e3d065bbe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationIssuesPage.java@@ -80,7 +80,7 @@ public class IterationIssuesPage extends IterationDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(IterationIssuesPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 90b25588bb..f47007ebf2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -184,7 +184,6 @@ public class ProjectIssueListPage extends ProjectIssuesPage {return null;}- @SuppressWarnings("deprecation")@Overrideprotected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {return new AttachAjaxIndicatorListener(@@ -400,7 +399,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectIssueListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.javaindex d33fcffc6d..d33826415d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java@@ -487,7 +487,7 @@ public class ProjectOverviewPage extends ProjectPage {params.set(PARAM_CHILD_QUERY, childrenQuery);params.remove(PARAM_CHILD_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectOverviewPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), childrenQuery);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), childrenQuery);}}, 0) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.javaindex 5cf16dd945..4e2abf2414 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java@@ -143,7 +143,7 @@ public class ProjectPacksPage extends ProjectPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectPacksPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}, true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.javaindex c7268a857a..aff37df7da 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java@@ -6,7 +6,7 @@ import static org.unbescape.html.HtmlEscape.escapeHtml5;import java.text.MessageFormat;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import org.apache.wicket.Component;import org.apache.wicket.Session;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex ed31b2e8ae..65b0e90c1e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -138,7 +138,7 @@ public class ProjectPullRequestsPage extends ProjectPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectPullRequestsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 222ce708ea..42fc848db3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -20,7 +20,7 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.atomic.AtomicReference;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;@@ -45,7 +45,6 @@ import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -609,7 +608,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatioprivate Fragment newEffectiveFrag() {Fragment fragment = new Fragment("status", "effectiveFrag", this);- fragment.add(new Label("description", new AbstractReadOnlyModel<String>() {+ fragment.add(new Label("description", new IModel<String>() {@Overridepublic String getObject() {@@ -626,7 +625,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -814,7 +813,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatioform.add(new FencedFeedbackPanel("titleFeedback", titleInput));- titleInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ titleInput.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -867,7 +866,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio}});- descriptionInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ descriptionInput.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -985,13 +984,21 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatiocontainer.add(new Label("help", _T(getPullRequest().getMergeStrategy().getDescription())));- container.add(new AjaxLazyLoadPanel("status") {+ container.add(new AjaxLazyLoadPanel<Component>("status") {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());- }+ protected void initTimer() {+ if (getPage().getBehaviors(AjaxLazyLoadTimer.class).isEmpty()) {+ getPage().add(new AjaxLazyLoadTimer() {+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());+ }+ });+ }+ super.initTimer();+ }@Overridepublic Component getLazyLoadComponent(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 54bc5393c6..73cf7249b0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -68,7 +68,7 @@<div wicket:id="hasMergeConflict" class="has-merge-conflict text-warning"><wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <wicket:t>There are merge conflicts.</wicket:t><wicket:enclosure child="resolveInstructions">- <wicket:t>Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts</wicket:t>+ <wicket:t>Please follow <a wicket:id="resolveInstructions" class="link-primary" href="#">this instruction</a> to resolve the conflicts</wicket:t></wicket:enclosure></div><div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-warning">@@ -231,7 +231,7 @@<wicket:enclosure child="synchronize"><div class="synchronize d-flex align-items-center mr-3"><a wicket:id="synchronize" class="btn btn-light-primary mr-2"><wicket:t>Synchronize</wicket:t></a>- <a href="javascript:void(0)" class="help text-muted text-hover-primary" t:data-tippy-content="In case the pull request status is out of sync with underlying repository, you may synchronize them manually here">+ <a href="#" class="help text-muted text-hover-primary" t:data-tippy-content="In case the pull request status is out of sync with underlying repository, you may synchronize them manually here"><wicket:svg href="question-circle-o" class="icon"/></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 49fbc1ca8e..00c4c19e31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -22,8 +22,8 @@ import java.util.List;import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -54,12 +54,11 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -369,8 +368,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRform.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);var user = SecurityUtils.getUser();pullRequestChangeService.changeTitle(user, getPullRequest(), title);@@ -382,8 +381,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);target.add(requestHead);}@@ -434,7 +433,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsummaryContainer.setOutputMarkupId(true);add(summaryContainer);- summaryContainer.add(new Label("checkError", new AbstractReadOnlyModel<String>() {+ summaryContainer.add(new Label("checkError", new IModel<String>() {@Overridepublic String getObject() {@@ -778,7 +777,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}}.setEscapeModelStrings(false));- summaryContainer.add(new Label("requiredJobsMessage", new AbstractReadOnlyModel<String>() {+ summaryContainer.add(new Label("requiredJobsMessage", new IModel<String>() {@Overridepublic String getObject() {if (getPullRequest().getBuildRequirement().isStrictMode())@@ -831,6 +830,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {+ super.onConfigure();setVisible(buildSpec != null&& buildSpec.getJobMap().containsKey(jobName)&& (SecurityUtils.canRunJob(getProject(), jobName) || SecurityUtils.canModifyPullRequest(getPullRequest())));@@ -981,7 +981,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRadd(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));add(new SideInfoLink("moreInfoDock"));- RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {@Overridepublic void onEndRequest(RequestCycle cycle) {@@ -1105,7 +1105,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});fragment.add(newWorkspacesLink());- fragment.add(new Label("workspaceCount", new AbstractReadOnlyModel<Integer>() {+ fragment.add(new Label("workspaceCount", new IModel<Integer>() {@Overridepublic Integer getObject() {@@ -1436,7 +1436,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});mergeStrategyContainer.add(editor);- mergeStrategyContainer.add(new Label("viewer", new AbstractReadOnlyModel<String>() {+ mergeStrategyContainer.add(new Label("viewer", new IModel<String>() {@Overridepublic String getObject() {@@ -1454,7 +1454,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- mergeStrategyContainer.add(new Label("help", new AbstractReadOnlyModel<String>() {+ mergeStrategyContainer.add(new Label("help", new IModel<String>() {@Overridepublic String getObject() {@@ -1648,7 +1648,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});autoMergeContainer.add(toggleCheck);- autoMergeContainer.add(new Label("badge", new AbstractReadOnlyModel<String>() {+ autoMergeContainer.add(new Label("badge", new IModel<String>() {@Overridepublic String getObject() {return getPullRequest().getAutoMerge().isEnabled()? "ON": "OFF";@@ -1670,7 +1670,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprivate WebMarkupContainer newStatusBarContainer() {WebMarkupContainer statusBarContainer = new WebMarkupContainer("statusBar");- statusBarContainer.add(new Label("status", new AbstractReadOnlyModel<String>() {+ statusBarContainer.add(new Label("status", new IModel<String>() {@Overridepublic String getObject() {@@ -1692,7 +1692,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {@@ -1717,7 +1717,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected Component newContent(String id, FloatingPanel dropdown) {Fragment fragment = new Fragment(id, "cloneFrag", PullRequestDetailPage.this);fragment.add(new Label("headRef", getPullRequest().getHeadRef()));- fragment.add(new Label("mergeRef", new AbstractReadOnlyModel<String>() {+ fragment.add(new Label("mergeRef", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex d9584f4452..8cb3ec0d36 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -10,8 +10,8 @@ import java.util.HashSet;import java.util.List;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.servlet.http.Cookie;+import jakarta.inject.Inject;+import jakarta.servlet.http.Cookie;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;@@ -30,8 +30,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;+import io.onedev.server.web.component.RepeatingView;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;@@ -275,8 +275,9 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {form.add(new AjaxSubmitLink("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String content = input.getModelObject();if (content.length() > PullRequestComment.MAX_CONTENT_LEN) {@@ -304,8 +305,9 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -331,7 +333,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));}- @SuppressWarnings("deprecation")@Overridepublic void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {Component prevActivityRow = null;@@ -441,7 +442,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {return showComments?"active":"" ;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex aed25ccde9..1979d37247 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -4,7 +4,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -56,7 +56,7 @@ class PullRequestChangePanel extends Panel {}add(mergeCommit);- add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {+ add(new SinceChangesLink("changes", new IModel<PullRequest>() {@Overridepublic PullRequest getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.javaindex d97ff56962..0fa425038d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java@@ -5,7 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.util.Collection;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -13,7 +13,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.jetbrains.annotations.Nullable;@@ -73,7 +73,7 @@ class PullRequestCommentPanel extends Panel {add(new Label("age", DateUtils.formatAge(getComment().getDate())).add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(getComment().getDate()))));- add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {+ add(new SinceChangesLink("changes", new IModel<PullRequest>() {@Overridepublic PullRequest getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.javaindex 99bb77dfd3..02eca1d9f4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;+import java.util.Date;+import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;@@ -89,8 +91,8 @@ class PullRequestUpdatePanel extends Panel {});var committer = commit.getCommitterIdent();- item.add(new Label("date", DateUtils.formatAge(committer.getWhen()))- .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(committer.getWhen()))));+ item.add(new Label("date", DateUtils.formatAge(Date.from(committer.getWhenAsInstant())))+ .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(Date.from(committer.getWhenAsInstant())))));item.add(new SignatureStatusPanel("signature") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 0d2ac2799b..23b4f2c85b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.IRequestParameters;@@ -520,7 +519,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revreturn fragment;}};- selectedCommitsLink.add(new Label("label", new AbstractReadOnlyModel<String>() {+ selectedCommitsLink.add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -684,7 +683,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void setObject(String object) {state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -702,7 +701,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void setObject(String object) {state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};@@ -721,7 +720,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void setObject(WhitespaceOption object) {state.whitespaceOption = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null));}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.javaindex 945854d953..a99d1e919d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java@@ -81,7 +81,7 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(PullRequestCodeCommentsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.javaindex 777d9e4a98..8c862da45d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java@@ -86,8 +86,9 @@ public abstract class ObsoleteUpdateAwarePanel extends Panel {form.add(new AjaxButton("ok") {@Override- public void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ public void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);PullRequestUpdate latestUpdate = getLatestUpdate();PullRequest request = latestUpdate.getRequest();@@ -122,8 +123,9 @@ public abstract class ObsoleteUpdateAwarePanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.javaindex 0081f509a4..c556ebca4f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java@@ -3,8 +3,8 @@ package io.onedev.server.web.page.project.setting.authorization;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.GroupChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.javaindex 7cf18e2364..ae1091c843 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java@@ -3,8 +3,8 @@ package io.onedev.server.web.page.project.setting.authorization;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.RoleChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex 76cad1388a..88f6859a36 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.setting.avatar;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheSettingBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheSettingBean.javaindex e5f9ffa27f..39fd07e976 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheSettingBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheSettingBean.java@@ -4,8 +4,8 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.model.support.build.ProjectBuildSetting;-import javax.validation.constraints.Max;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Max;+import jakarta.validation.constraints.Min;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.javaindex af8f28a10d..c23325fa36 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobPropertiesPage.java@@ -10,7 +10,7 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;@@ -60,7 +60,7 @@ public class JobPropertiesPage extends ProjectBuildSettingPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {return showArchived? _T("Hide Archived"): _T("Show Archived");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.javaindex 72dab8ac7b..f4ad713ca5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java@@ -61,8 +61,8 @@ public abstract class JobSecretEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);List<JobSecret> secrets = getProject().getBuildSetting().getJobSecrets();String action;@@ -83,8 +83,9 @@ public abstract class JobSecretEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.javaindex 39815c134f..d1df08f524 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java@@ -23,7 +23,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -105,7 +104,7 @@ public class JobSecretsPage extends ProjectBuildSettingPage {@Overrideprotected void onInitialize() {super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {+ add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {return showArchived? _T("Hide Archived"): _T("Show Archived");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionEditPanel.javaindex 9552ec62ec..6385feca96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionEditPanel.java@@ -34,14 +34,15 @@ abstract class BranchProtectionEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onSave(target, protection);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.javaindex 8d121c1b05..93661f922c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/branchprotection/BranchProtectionsPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -38,7 +38,7 @@ public class BranchProtectionsPage extends ProjectSettingPage {container = new WebMarkupContainer("branchProtectionSetting");container.setOutputMarkupId(true);add(container);- container.add(new ListView<BranchProtection>("protections", new AbstractReadOnlyModel<List<BranchProtection>>() {+ container.add(new ListView<BranchProtection>("protections", new IModel<List<BranchProtection>>() {@Overridepublic List<BranchProtection> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionEditPanel.javaindex c8311630a2..548f351897 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionEditPanel.java@@ -34,14 +34,15 @@ abstract class TagProtectionEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);onSave(target, protection);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.javaindex 18a7fce8e0..ac57d0a20f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/tagprotection/TagProtectionsPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -38,7 +38,7 @@ public class TagProtectionsPage extends ProjectSettingPage {container = new WebMarkupContainer("tagProtectionSetting");container.setOutputMarkupId(true);add(container);- container.add(new ListView<>("protections", new AbstractReadOnlyModel<List<TagProtection>>() {+ container.add(new ListView<>("protections", new IModel<List<TagProtection>>() {@Overridepublic List<TagProtection> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.javaindex 6b8554757d..629643fe0c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.lang.reflect.InvocationTargetException;import java.text.MessageFormat;-import javax.validation.Validator;+import jakarta.validation.Validator;import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookEditPanel.javaindex b1bdccc5d6..fcbd2872a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookEditPanel.java@@ -40,7 +40,7 @@ abstract class WebHookEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ RequestCycle.get().find(AjaxRequestTarget.class).orElse(null).add(this);}};@@ -66,8 +66,9 @@ abstract class WebHookEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);if (editor.isValid()) {String oldAuditContent = null;String verb;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecEditPanel.javaindex 286811372b..fd52aac722 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecEditPanel.java@@ -36,8 +36,9 @@ abstract class WorkspaceSpecEditPanel extends Panel {form.add(new AjaxButton("save") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);var errorMessage = onSave(target, spec);if (errorMessage != null) {form.error(errorMessage);@@ -46,8 +47,9 @@ abstract class WorkspaceSpecEditPanel extends Panel {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecTemplateBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecTemplateBean.javaindex 84dcf4886d..b077fd88c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecTemplateBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecTemplateBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.setting.workspacespec;import java.io.Serializable;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.javaindex b4ed49649b..c85a990101 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/workspacespec/WorkspaceSpecsPage.java@@ -14,7 +14,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -45,7 +45,7 @@ public class WorkspaceSpecsPage extends ProjectSettingPage {container = new WebMarkupContainer("workspaceSpecSetting");container.setOutputMarkupId(true);add(container);- container.add(new ListView<WorkspaceSpec>("specs", new AbstractReadOnlyModel<List<WorkspaceSpec>>() {+ container.add(new ListView<WorkspaceSpec>("specs", new IModel<List<WorkspaceSpec>>() {@Overridepublic List<WorkspaceSpec> getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.javaindex f8238cb8a9..927d37ba65 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java@@ -132,8 +132,8 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends Pro}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target);parseQuery();target.add(feedback);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/CreateTagBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/CreateTagBeanWithRevision.javaindex 834ca7ee8d..4c4ca5d846 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/CreateTagBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/CreateTagBeanWithRevision.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.RevisionChoice;import io.onedev.server.web.component.createtag.CreateTagBean;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;@Editablepublic class CreateTagBeanWithRevision extends CreateTagBean {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 02a9f8ca74..ab4b7e72bf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -67,7 +67,6 @@ import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -183,7 +182,7 @@ public class ProjectTagsPage extends ProjectPage {String url = RequestCycle.get().urlFor(ProjectTagsPage.class, params).toString();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (typing)replaceState(target, url, query);else@@ -232,8 +231,9 @@ public class ProjectTagsPage extends ProjectPage {form.add(new AjaxButton("create") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);String tagName = helperBean.getName();User user = Preconditions.checkNotNull(getLoginUser());@@ -267,8 +267,9 @@ public class ProjectTagsPage extends ProjectPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);+ protected void onError(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onError(target);target.add(form);}@@ -395,9 +396,8 @@ public class ProjectTagsPage extends ProjectPage {Label message = new Label("message", Emojis.getInstance().apply(revTag.getFullMessage()));message.setOutputMarkupId(true);annotatedFragment.add(message);- String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());WebMarkupContainer messageToggle = new WebMarkupContainer("messageToggle");- messageToggle.add(AttributeAppender.append("onclick", toggleScript));+ messageToggle.add(AttributeAppender.append("onclick", String.format("$('#%s').toggle(); return false;", message.getMarkupId())));messageToggle.setVisible(StringUtils.isNotBlank(revTag.getFullMessage()));annotatedFragment.add(messageToggle);@@ -493,7 +493,7 @@ public class ProjectTagsPage extends ProjectPage {@Overridepublic IModel<RefFacade> model(RefFacade object) {String tag = GitUtils.ref2tag(object.getName());- return new AbstractReadOnlyModel<RefFacade>() {+ return new IModel<RefFacade>() {@Overridepublic RefFacade getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.javaindex 72c37d60c6..013834a4bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java@@ -741,7 +741,7 @@ public class ProjectWikiPage extends ProjectPage {String type = FileExtension.getExtension(path);if (protection.getDisallowedFileTypes().stream().anyMatch(it -> it.equalsIgnoreCase(type)))throw new BlobEditException(MessageFormat.format(_T("Not allowed file type: {0}"), type));- blobs.put(path, new BlobContent(item.get(), FileMode.REGULAR_FILE.getBits()));+ blobs.put(path, new BlobContent(FileUpload.readBytes(item), FileMode.REGULAR_FILE.getBits()));}ObjectId previousCommitId = commitId != null ? commitId : ObjectId.zeroId();try {@@ -767,7 +767,7 @@ public class ProjectWikiPage extends ProjectPage {deleteForm.add(newCommitMessageInput(message, Model.of(name), true, true));deleteForm.add(new AjaxButton("confirm") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> submittedForm) {+ protected void onSubmit(AjaxRequestTarget target) {save(deleteForm::error, name, null, message.getObject(), true, true, destination);if (deleteForm.hasError())target.add(deleteForm);@@ -776,7 +776,7 @@ public class ProjectWikiPage extends ProjectPage {}@Override- protected void onError(AjaxRequestTarget target, Form<?> submittedForm) {+ protected void onError(AjaxRequestTarget target) {target.add(deleteForm);}}.add(new Label("label", destination != null ? _T("Use default") : _T("Delete page"))));@@ -793,7 +793,7 @@ public class ProjectWikiPage extends ProjectPage {@Overrideprotected void onClosed() {actions.setVisible(true);- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);if (target != null)target.add(actions);}@@ -938,7 +938,7 @@ public class ProjectWikiPage extends ProjectPage {if (delete) {commitId = newCommitId;revision = branchName;- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null);selectPage(target, selectedPage);List<String> pages = new ArrayList<>();collectPages(folder, pages);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.javaindex cf2b364557..1e4cf91384 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java@@ -142,7 +142,7 @@ public class ProjectWorkspacesPage extends ProjectPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(ProjectWorkspacesPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.javaindex 35ea514c27..13b5516c9e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java@@ -9,8 +9,8 @@ import java.util.HashMap;import java.util.List;import java.util.Set;-import javax.inject.Inject;-import javax.persistence.EntityNotFoundException;+import jakarta.inject.Inject;+import jakarta.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;@@ -27,7 +27,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -149,7 +148,7 @@ public abstract class WorkspaceDetailPage extends ProjectPage {head.add(new Label("spec", workspace.getSpecName()));head.add(new InvalidWorkspaceSpecIcon("invalidSpec", workspaceModel));- head.add(new WorkspaceStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {+ head.add(new WorkspaceStatusIcon("statusIcon", new IModel<Status>() {@Overridepublic Status getObject() {@@ -157,7 +156,7 @@ public abstract class WorkspaceDetailPage extends ProjectPage {}}));- head.add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {+ head.add(new Label("statusLabel", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.javaindex 251f89575e..8cacf23f16 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java@@ -293,12 +293,12 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {AjaxButton commitButton = new AjaxButton("commitButton", form) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {doCommit(target, repository, false);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {+ protected void onError(AjaxRequestTarget target) {refreshAll(target);}};@@ -308,12 +308,12 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {AjaxButton amendButton = new AjaxButton("amendButton", form) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ protected void onSubmit(AjaxRequestTarget target) {doCommit(target, repository, true);}@Override- protected void onError(AjaxRequestTarget target, Form<?> form) {+ protected void onError(AjaxRequestTarget target) {refreshAll(target);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/TerminalTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/TerminalTabHead.javaindex 67ea17ad8f..111f44f7a3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/TerminalTabHead.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/TerminalTabHead.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.workspaces.detail.terminal;import static io.onedev.server.web.translation.Translation._T;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.javaindex 628d3e48b5..9afccb312a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/terminal/WorkspaceTerminalPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.project.workspaces.detail.terminal;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javaindex 9794f3b073..2ce2ae6687 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java@@ -116,7 +116,7 @@ public class PullRequestListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(PullRequestListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java b/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.javaindex a6314dddcb..22809f482e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java@@ -7,7 +7,7 @@ import java.util.Comparator;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.javaindex 9ac12452b8..f19f5f823d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java@@ -7,7 +7,7 @@ import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;import java.util.Collection;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.AuthenticationToken;@@ -16,6 +16,7 @@ import org.apache.shiro.authc.IncorrectCredentialsException;import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;import org.apache.shiro.mgt.RememberMeManager;+import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;@@ -30,7 +31,7 @@ import org.apache.wicket.markup.html.image.ExternalImage;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.flow.RedirectToUrlException;@@ -97,8 +98,7 @@ public class LoginPage extends SimplePage {protected void onInitialize() {super.onInitialize();- // replace session to avoid session fixation attack- getSession().replaceSession();+ RestartResponseAtInterceptPageException.replaceSessionPreservingOriginalDestination();String serverUrl = settingService.getSystemSetting().getServerUrl();var ssoProviders = ssoProviderService.query();diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetBean.java b/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetBean.javaindex 76b5269770..abd33bc665 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/PasswordResetBean.java@@ -4,7 +4,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.Password;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SignUpBean.java b/server-core/src/main/java/io/onedev/server/web/page/security/SignUpBean.javaindex aa29717127..b8c7e7cda2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/SignUpBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SignUpBean.java@@ -6,8 +6,8 @@ import io.onedev.server.service.SettingService;import io.onedev.server.model.User;import io.onedev.server.util.patternset.PatternSet;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;@Editablepublic class SignUpBean extends User {diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.javaindex d54b13bba9..94567d0a1a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java@@ -8,7 +8,7 @@ import java.util.ArrayList;import java.util.HashSet;import java.util.List;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.UsernamePasswordToken;diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.javaindex c03900e470..4a65dbe303 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/SimplePage.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.brandlogo.BrandLogoPanel;@@ -23,7 +23,7 @@ public abstract class SimplePage extends BasePage {protected void onInitialize() {super.onInitialize();add(newPageLogo("logo"));- add(new Label("title", new AbstractReadOnlyModel<String>() {+ add(new Label("title", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/store/PageManagerProvider.java b/server-core/src/main/java/io/onedev/server/web/page/store/PageManagerProvider.javanew file mode 100644index 0000000000..8d71e4e79c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/store/PageManagerProvider.java@@ -0,0 +1,24 @@+package io.onedev.server.web.page.store;++import org.apache.wicket.Application;+import org.apache.wicket.DefaultPageManagerProvider;+import org.apache.wicket.pageStore.IPageStore;++public class PageManagerProvider extends DefaultPageManagerProvider {++ public PageManagerProvider(Application application) {+ super(application);+ }++ @Override+ protected IPageStore newCachingStore(IPageStore store) {+ // Do not retain live pages in replicated HTTP sessions.+ return store;+ }++ @Override+ protected IPageStore newAsynchronousStore(IPageStore store) {+ // Write pages synchronously to disk without retaining serialized pages in memory.+ return store;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex dc263e7de0..81dddc1fc4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -17,11 +17,11 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();-+add(new Link<Void>("test") {@Override- public void onClick() {+ public void onClick() {}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/test.css b/server-core/src/main/java/io/onedev/server/web/page/test/test.cssindex e69de29bb2..b0f2ed9714 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/test.css+++ b/server-core/src/main/java/io/onedev/server/web/page/test/test.css@@ -0,0 +1,7 @@+.test-page {+ min-height: 100vh;+ display: flex;+ align-items: flex-end;+ gap: 1rem;+ padding: 1rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.javaindex 1d309fb427..fdd23c1356 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.user.emailaddresses;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;@@ -17,7 +17,7 @@ public class UserEmailAddressesPage extends UserPage {protected void onInitialize() {super.onInitialize();- add(new EmailAddressesPanel("content", new AbstractReadOnlyModel<User>() {+ add(new EmailAddressesPanel("content", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.javaindex 47e2e0d175..6ef6880ca4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java@@ -31,9 +31,9 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.OneDev;import io.onedev.server.service.GroupService;diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.javaindex 09a5e1677e..8026504b05 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java@@ -7,7 +7,7 @@ import java.io.Serializable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -52,7 +52,7 @@ public class UserProfilePage extends UserPage {}private Component newUserProfile() {- return new UserProfilePanel("profile", new AbstractReadOnlyModel<User>() {+ return new UserProfilePanel("profile", new IModel<User>() {@Overridepublic User getObject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.javaindex 4ba20600c9..560b43c66c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java@@ -116,7 +116,7 @@ public class WorkspaceListPage extends LayoutPage {params.set(PARAM_QUERY, query);params.remove(PARAM_PAGE);CharSequence url = RequestCycle.get().urlFor(WorkspaceListPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);+ pushState(RequestCycle.get().find(AjaxRequestTarget.class).orElse(null), url.toString(), query);}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.javaindex c3f2b6172e..ca92c75c5e 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java@@ -4,7 +4,7 @@ import java.io.File;import java.io.IOException;import java.util.Collection;-import javax.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletRequest;import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.resource.AbstractResource;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.javaindex a3c55c6ce4..87df5720a8 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java@@ -9,7 +9,7 @@ import java.net.URLEncoder;import java.nio.charset.StandardCharsets;import java.util.List;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.javaindex 5bdc8906ee..1ce0056591 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java@@ -9,12 +9,12 @@ import java.io.UnsupportedEncodingException;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex db618e0bc6..a9aaea84f9 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -7,7 +7,7 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.javaindex f6a48d5a72..913bc86843 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java@@ -11,12 +11,12 @@ import java.io.InputStream;import java.io.OutputStream;import java.net.URLEncoder;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.commons.codec.binary.Base64;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.javaindex e1607c5bc9..a28a0d7502 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java@@ -9,13 +9,13 @@ import java.io.UnsupportedEncodingException;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;-import javax.persistence.EntityNotFoundException;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.persistence.EntityNotFoundException;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/PatchResource.java b/server-core/src/main/java/io/onedev/server/web/resource/PatchResource.javaindex 617c776a63..83e359de87 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/PatchResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/PatchResource.java@@ -7,12 +7,12 @@ import java.io.IOException;import java.io.InputStream;import java.net.URLEncoder;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.javaindex 735e95a1c9..494320b559 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java@@ -15,15 +15,15 @@ import java.util.ArrayList;import java.util.Collections;import java.util.List;-import javax.persistence.EntityNotFoundException;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.persistence.EntityNotFoundException;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.javaindex c38dd09be4..773ade088b 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java@@ -8,8 +8,8 @@ import java.net.URISyntaxException;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;-import javax.persistence.EntityNotFoundException;-import javax.ws.rs.core.HttpHeaders;+import jakarta.persistence.EntityNotFoundException;+import jakarta.ws.rs.core.HttpHeaders;import org.apache.commons.lang3.StringUtils;import org.apache.http.client.utils.URIBuilder;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceStream.java b/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceStream.javaindex 11cec03b4b..4e0bec9f52 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceStream.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceStream.java@@ -22,7 +22,7 @@ import org.apache.wicket.util.file.Files;import org.apache.wicket.util.lang.Bytes;import org.apache.wicket.util.resource.IResourceStream;import org.apache.wicket.util.resource.ResourceStreamNotFoundException;-import org.apache.wicket.util.time.Time;+import java.time.Instant;import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.DocumentHelper;@@ -59,7 +59,7 @@ public class SpriteResourceStream implements IResourceStream {}@Override- public Time lastModifiedTime() {+ public Instant lastModifiedTime() {if (getCodeSource().isFile()) {return Files.getLastModified(getCodeSource());} else {@@ -67,11 +67,11 @@ public class SpriteResourceStream implements IResourceStream {File packageDir = new File(getCodeSource(), packagePath);if (packageDir.exists()) {- Time time = Files.getLastModified(getCodeSource());+ Instant time = Files.getLastModified(getCodeSource());for (File file: packageDir.listFiles()) {if (file.getName().endsWith(".svg")) {- Time childTime = Files.getLastModified(file);- if (childTime.after(time))+ Instant childTime = Files.getLastModified(file);+ if (childTime.isAfter(time))time = childTime;}}diff --git a/server-core/src/main/java/io/onedev/server/web/upload/DefaultUploadService.java b/server-core/src/main/java/io/onedev/server/web/upload/DefaultUploadService.javaindex 889b0ebbc7..b90cae3559 100644--- a/server-core/src/main/java/io/onedev/server/web/upload/DefaultUploadService.java+++ b/server-core/src/main/java/io/onedev/server/web/upload/DefaultUploadService.java@@ -9,8 +9,8 @@ import io.onedev.server.taskschedule.TaskScheduler;import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;@@ -40,8 +40,14 @@ public class DefaultUploadService implements UploadService, SchedulableTask {}private void deleteItems(FileUpload upload) {- for (var item: upload.getItems())- item.delete();+ for (var item: upload.getItems()) {+ try {+ item.delete();+ } catch (java.io.IOException e) {+ org.slf4j.LoggerFactory.getLogger(DefaultUploadService.class)+ .warn("Unable to delete temporary upload {}", item.getName(), e);+ }+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/upload/FileUpload.java b/server-core/src/main/java/io/onedev/server/web/upload/FileUpload.javaindex cef467a5c1..d94fe4a179 100644--- a/server-core/src/main/java/io/onedev/server/web/upload/FileUpload.java+++ b/server-core/src/main/java/io/onedev/server/web/upload/FileUpload.java@@ -1,7 +1,7 @@package io.onedev.server.web.upload;import io.onedev.server.OneDev;-import org.apache.commons.fileupload.FileItem;+import org.apache.commons.fileupload2.core.FileItem;import org.apache.wicket.util.string.Strings;import java.util.Date;@@ -13,9 +13,9 @@ public class FileUpload {private final Date date = new Date();- private final List<FileItem> items;+ private final List<FileItem<?>> items;- public FileUpload(String id, List<FileItem> items) {+ public FileUpload(String id, List<FileItem<?>> items) {this.id = id;this.items = items;}@@ -24,7 +24,7 @@ public class FileUpload {return id;}- public List<FileItem> getItems() {+ public List<FileItem<?>> getItems() {return items;}@@ -36,7 +36,15 @@ public class FileUpload {OneDev.getInstance(UploadService.class).clearUpload(id);}- public static String getFileName(FileItem file) {+ public static byte[] readBytes(FileItem<?> item) {+ try {+ return item.get();+ } catch (java.io.IOException e) {+ throw io.onedev.commons.utils.ExceptionUtils.unchecked(e);+ }+ }++ public static String getFileName(FileItem<?> file) {String name = file.getName();// when uploading from localhost some browsers will specify the entire path, we strip itdiff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.javaindex b476e20db5..818ea06d81 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.NamedAgentQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.javaindex c296ed2657..e7f35645f7 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.javaindex e85662949e..767c1e89e8 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedPackQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedPackQueriesBean.javaindex d12550a17d..fd21088255 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedPackQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedPackQueriesBean.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.model.support.pack.NamedPackQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedProjectQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedProjectQueriesBean.javaindex ab27a5e11d..b050779fcc 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedProjectQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedProjectQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.javaindex 5f73e60ed1..340722f60c 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedWorkspaceQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedWorkspaceQueriesBean.javaindex 48781d94a4..46af9e3a40 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedWorkspaceQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedWorkspaceQueriesBean.java@@ -3,7 +3,7 @@ package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.javaindex c39a2ffafe..5667a27ebb 100644--- a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java+++ b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java@@ -5,7 +5,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;import org.apache.commons.lang3.tuple.Pair;import org.jspecify.annotations.Nullable;-import javax.persistence.criteria.Path;+import jakarta.persistence.criteria.Path;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex bdc25f0cf0..5ab3c9d4d2 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -17,7 +17,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.resource.AbstractResource;import org.jspecify.annotations.Nullable;-import javax.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletRequest;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/CommitMessageBean.javaindex 8618e73697..b01efc3ce1 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/CommitMessageBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/CommitMessageBean.java@@ -5,7 +5,7 @@ import io.onedev.server.annotation.Multiline;import io.onedev.server.annotation.OmitName;import io.onedev.server.annotation.ReferenceAware;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.Serializable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IssueWorkBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IssueWorkBean.javaindex 8b0513350c..be8d020345 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IssueWorkBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IssueWorkBean.java@@ -7,8 +7,8 @@ import io.onedev.server.annotation.WithTime;import io.onedev.server.annotation.WorkingPeriod;import io.onedev.server.service.SettingService;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.javaindex eee24435da..9b9d1a28c8 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java@@ -10,8 +10,8 @@ import java.util.Date;import java.util.regex.Pattern;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.annotation.ClassValidating;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/NewUserBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/NewUserBean.javaindex b4c788a31c..a0605f5137 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/NewUserBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/NewUserBean.java@@ -1,8 +1,8 @@package io.onedev.server.web.util.editbean;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.javaindex ed7e3285e2..e3f426b172 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/ProjectAuthorizationBean.java@@ -3,8 +3,8 @@ package io.onedev.server.web.util.editbean;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ProjectChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.javaindex 0d5d03c10b..de2b8273e3 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.java@@ -6,8 +6,8 @@ import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.model.Alert;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class AlertEventBroadcaster {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.javaindex 9e5b6f265e..e5fd71e1ae 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java@@ -3,8 +3,8 @@ package io.onedev.server.web.websocket;import io.onedev.server.event.Listen;import io.onedev.server.event.project.build.BuildEvent;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class BuildEventBroadcaster {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.javaindex 9002dde06a..ac8c352034 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java@@ -1,7 +1,7 @@package io.onedev.server.web.websocket;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import io.onedev.server.event.Listen;import io.onedev.server.event.project.codecomment.CodeCommentEvent;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.javaindex 5c683d5538..b34a16e90e 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java@@ -1,7 +1,7 @@package io.onedev.server.web.websocket;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import io.onedev.server.event.Listen;import io.onedev.server.event.project.CommitIndexed;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.javaindex 44c00b922c..0b1da8273b 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketService.java@@ -12,8 +12,8 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.ConcurrentHashMap;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.wicket.Application;import org.apache.wicket.protocol.ws.WebSocketSettings;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.javaindex 5fa4182425..f577657f3f 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -3,8 +3,8 @@ package io.onedev.server.web.websocket;import io.onedev.server.event.Listen;import io.onedev.server.event.project.issue.IssueEvent;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class IssueEventBroadcaster {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.javaindex ecf7789d1d..c9b8c4d5da 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java@@ -4,8 +4,8 @@ import io.onedev.server.event.Listen;import io.onedev.server.event.project.pullrequest.PullRequestEvent;import io.onedev.server.model.PullRequest;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;@Singletonpublic class PullRequestEventBroadcaster {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.javaindex f6f420c8c5..fbeda21d49 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java@@ -28,6 +28,7 @@ import org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor;import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;import org.eclipse.jetty.websocket.api.Session;+import org.eclipse.jetty.websocket.api.Callback;import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -40,7 +41,7 @@ import io.onedev.server.persistence.SessionService;** @since 6.2*/-public class WebSocketConnection implements IWebSocketConnection {+public class WebSocketConnection extends org.apache.wicket.protocol.ws.api.AbstractWebSocketConnection {private final Logger logger = LoggerFactory.getLogger(WebSocketConnection.class);@@ -58,6 +59,7 @@ public class WebSocketConnection implements IWebSocketConnection {public WebSocketConnection(Session session, AbstractWebSocketProcessor webSocketProcessor, PageKey pageKey, Subject subject){+ super(webSocketProcessor);this.webSocketProcessor = webSocketProcessor;this.session = session;this.pageKey = pageKey;@@ -76,7 +78,7 @@ public class WebSocketConnection implements IWebSocketConnection {@Overridepublic void close(int code, String reason) {if (isOpen()) {- session.close(code, reason);+ session.close(code, reason, Callback.NOOP);}}@@ -88,7 +90,7 @@ public class WebSocketConnection implements IWebSocketConnection {public IWebSocketConnection sendMessage(String message) throws IOException {checkClosed();- session.getRemote().sendStringByFuture(message);+ session.sendText(message, Callback.NOOP);return this;}@@ -97,10 +99,38 @@ public class WebSocketConnection implements IWebSocketConnection {checkClosed();ByteBuffer buf = ByteBuffer.wrap(message, offset, length);- session.getRemote().sendBytesByFuture(buf);+ session.sendBinary(buf, Callback.NOOP);return this;}+ @Override+ public java.util.concurrent.Future<Void> sendMessageAsync(String message) {+ return sendMessageAsync(message, -1);+ }++ @Override+ public java.util.concurrent.Future<Void> sendMessageAsync(String message, long timeout) {+ var callback = new Callback.Completable();+ session.sendText(message, callback);+ if (timeout >= 0)+ callback.orTimeout(timeout, java.util.concurrent.TimeUnit.MILLISECONDS);+ return callback;+ }++ @Override+ public java.util.concurrent.Future<Void> sendMessageAsync(byte[] message, int offset, int length) {+ return sendMessageAsync(message, offset, length, -1);+ }++ @Override+ public java.util.concurrent.Future<Void> sendMessageAsync(byte[] message, int offset, int length, long timeout) {+ var callback = new Callback.Completable();+ session.sendBinary(ByteBuffer.wrap(message, offset, length), callback);+ if (timeout >= 0)+ callback.orTimeout(timeout, java.util.concurrent.TimeUnit.MILLISECONDS);+ return callback;+ }+private void checkClosed() {if (!isOpen()) {throw new IllegalStateException("The connection is closed.");diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.javaindex 7e3126cde6..24a3e3c0ac 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java@@ -18,79 +18,36 @@ package io.onedev.server.web.websocket;import java.io.IOException;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.shiro.SecurityUtils;import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;-import org.eclipse.jetty.websocket.api.WebSocketPolicy;-import org.eclipse.jetty.websocket.server.WebSocketServerFactory;-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;-import org.eclipse.jetty.websocket.servlet.WebSocketCreator;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;-/**- * An upgrade filter that uses Jetty9's WebSocketServerFactory to decide whether- * to upgrade or not.- */+/** Upgrades Wicket connections through Jetty's Jakarta Servlet WebSocket container. */public class WebSocketFilter extends AbstractUpgradeFilter {- public static final String SHIRO_SUBJECT = "shiro_subject";-- private static final Logger logger = LoggerFactory.getLogger(WebSocketFilter.class);-- private WebSocketServerFactory webSocketFactory;-- private final WebSocketPolicy webSocketPolicy;-- public WebSocketFilter(WebSocketPolicy webSocketPolicy) {- this.webSocketPolicy = webSocketPolicy;- }-- @Override- public void init(final boolean isServlet, final FilterConfig filterConfig) throws ServletException {- super.init(isServlet, filterConfig);-- try {- webSocketFactory = new WebSocketServerFactory(getApplication().getServletContext(), webSocketPolicy);-- webSocketFactory.setCreator(new WebSocketCreator() {- @Override- public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {- return new WebSocketProcessor(req, resp, getApplication());- }-- });-- webSocketFactory.start();- } catch (ServletException x) {- throw x;- } catch (Exception x) {- throw new ServletException(x);- }- }-- @Override- protected boolean acceptWebSocket(HttpServletRequest req, HttpServletResponse resp)- throws ServletException, IOException {- req.setAttribute(SHIRO_SUBJECT, SecurityUtils.getSubject());- return super.acceptWebSocket(req, resp) && webSocketFactory.acceptWebSocket(req, resp);- }-- @Override- public void destroy() {- try {- if (webSocketFactory != null) {- webSocketFactory.stop();- }- } catch (Exception x) {- logger.warn("A problem occurred while stopping the web socket factory", x);- }-- super.destroy();- }+ public static final String SHIRO_SUBJECT = "shiro_subject";++ private JettyWebSocketServerContainer webSocketContainer;++ @Override+ public void init(boolean isServlet, FilterConfig filterConfig) throws ServletException {+ super.init(isServlet, filterConfig);+ webSocketContainer = JettyWebSocketServerContainer.getContainer(filterConfig.getServletContext());+ if (webSocketContainer == null)+ throw new ServletException("Jetty WebSocket container is not initialized");+ }++ @Override+ protected boolean acceptWebSocket(HttpServletRequest request, HttpServletResponse response)+ throws ServletException, IOException {+ request.setAttribute(SHIRO_SUBJECT, SecurityUtils.getSubject());+ return super.acceptWebSocket(request, response)+ && webSocketContainer.upgrade((req, resp) -> new WebSocketProcessor(req, resp, getApplication()),+ request, response);+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex 2726fd2c04..246ad6e1dc 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -16,16 +16,16 @@*/package io.onedev.server.web.websocket;-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;+import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor;import org.eclipse.jetty.websocket.api.Session;-import org.eclipse.jetty.websocket.api.WebSocketListener;-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;+import java.nio.ByteBuffer;+import org.eclipse.jetty.websocket.api.Callback;+import org.eclipse.jetty.ee11.websocket.server.JettyServerUpgradeRequest;+import org.eclipse.jetty.ee11.websocket.server.JettyServerUpgradeResponse;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -35,15 +35,15 @@ import io.onedev.server.persistence.SessionService;/*** An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with- * Jetty 9.x {@link Session web socket} implementation.+ * Jetty 12 {@link Session web socket} implementation.** @since 6.2*/-public class WebSocketProcessor extends AbstractWebSocketProcessor implements WebSocketListener {+public class WebSocketProcessor extends AbstractWebSocketProcessor implements Session.Listener.AutoDemanding {private static final Logger logger = LoggerFactory.getLogger(WebSocketProcessor.class);- private final ServletUpgradeRequest request;+ private final Subject subject;/*** Constructor.@@ -55,18 +55,19 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We* @param application* the current Wicket Application*/- public WebSocketProcessor(final ServletUpgradeRequest upgradeRequest,- final ServletUpgradeResponse upgradeResponse, final WebApplication application) {+ public WebSocketProcessor(final JettyServerUpgradeRequest upgradeRequest,+ final JettyServerUpgradeResponse upgradeResponse, final WebApplication application) {super(upgradeRequest.getHttpServletRequest(), application);- this.request = upgradeRequest;+ this.subject = (Subject) upgradeRequest.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);}@Override- public void onWebSocketConnect(final Session session) {+ public void onWebSocketOpen(final Session session) {+ // Jetty 12 defaults to 30 seconds, which races our 30-second keep-alive schedule.+ session.setIdleTimeout(java.time.Duration.ofSeconds(WebSocketService.KEEP_ALIVE_INTERVAL * 3L));run(() -> {PageKey pageKey = new PageKey(getSessionId(), getRegistryKey());- Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);WebSocketConnection connection = new WebSocketConnection(session, WebSocketProcessor.this, pageKey, subject);onConnect(connection);});@@ -74,9 +75,13 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements Weprivate void run(Runnable runnable) {SessionService sessionService = OneDev.getInstance(SessionService.class);- Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);- ThreadContext.bind(subject);- sessionService.run(runnable);+ var threadState = new org.apache.shiro.subject.support.SubjectThreadState(subject);+ threadState.bind();+ try {+ sessionService.run(runnable);+ } finally {+ threadState.restore();+ }}@Override@@ -86,9 +91,16 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We}@Override- public void onWebSocketBinary(final byte[] payload, final int offset, final int len) {- run(() -> onMessage(payload, offset, len));- }+ public void onWebSocketBinary(ByteBuffer payload, Callback callback) {+ byte[] bytes = new byte[payload.remaining()];+ payload.get(bytes);+ try {+ run(() -> onMessage(bytes, 0, bytes.length));+ callback.succeed();+ } catch (Throwable t) {+ callback.fail(t);+ }+ }@Overridepublic void onWebSocketClose(final int statusCode, final String reason) {@@ -104,7 +116,7 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We@Overridepublic void onOpen(Object connection) {- onWebSocketConnect((Session)connection);+ onWebSocketOpen((Session)connection);}}diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.javaindex 8f26f6ab2d..bb5049e545 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java@@ -2,8 +2,8 @@ package io.onedev.server.web.websocket;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import io.onedev.server.event.Listen;import io.onedev.server.event.project.workspace.WorkspaceTerminalOpened;diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceQueryPersonalizationService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceQueryPersonalizationService.javaindex 2d58eb3d88..8b99af0393 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceQueryPersonalizationService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceQueryPersonalizationService.java@@ -4,9 +4,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.stream.Collectors;-import javax.inject.Singleton;+import jakarta.inject.Singleton;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import io.onedev.server.model.WorkspaceQueryPersonalization;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex 097acea7f0..52926d2e59 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -31,20 +31,20 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.From;+import jakarta.persistence.criteria.Order;+import jakarta.persistence.criteria.Path;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;import org.apache.shiro.subject.Subject;import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.eclipse.jgit.lib.ObjectId;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.hibernate.query.Query;import org.jspecify.annotations.Nullable;import org.quartz.ScheduleBuilder;@@ -433,9 +433,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<ProjectWorkspaceStatusStat> criteriaQuery = builder.createQuery(ProjectWorkspaceStatusStat.class);Root<Workspace> root = criteriaQuery.from(Workspace.class);- criteriaQuery.multiselect(+ criteriaQuery.select(builder.construct(ProjectWorkspaceStatusStat.class,root.get(Workspace.PROP_PROJECT).get(Project.PROP_ID),- root.get(Workspace.PROP_STATUS), builder.count(root));+ root.get(Workspace.PROP_STATUS), builder.count(root)));criteriaQuery.groupBy(root.get(Workspace.PROP_PROJECT), root.get(Workspace.PROP_STATUS));criteriaQuery.where(root.get(Workspace.PROP_PROJECT).in(projects));criteriaQuery.orderBy(builder.asc(root.get(Workspace.PROP_STATUS)));@@ -544,7 +544,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>@Sessionalprotected Map<Long, Long> queryPendingOrActive() {Query<?> query = getSession().createQuery("select id, project.id from Workspace where "- + "status=:pending or status=:active");+ + "status=:pending or status=:active", Object[].class);query.setParameter("pending", Workspace.Status.PENDING);query.setParameter("active", Workspace.Status.ACTIVE);diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.javaindex 7b37b5523f..c69e1266d2 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java@@ -30,14 +30,14 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.function.Consumer;import java.util.stream.Collectors;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.SerializationUtils;import org.eclipse.jgit.errors.MissingObjectException;@@ -541,7 +541,7 @@ public class DefaultCommitInfoService extends AbstractEnvironmentServiceuserCommits = deserializeUserCommits(readBytes(userCommitsStore, txn, new StringByteIterable(author.getEmailAddress())));userCommitsCache.put(author.getEmailAddress(), userCommits);}- userCommits.put(ObjectId.fromString(currentCommit.getHash()), currentCommit.getAuthor().getWhen().getTime());+ userCommits.put(ObjectId.fromString(currentCommit.getHash()), currentCommit.getAuthor().getWhenAsInstant().toEpochMilli());}}}diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.javaindex 4761aefe5d..2cfc219392 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoService.java@@ -12,8 +12,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.apache.commons.lang.SerializationUtils;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.javaindex 896e01aeec..c042c2ffcf 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultPullRequestInfoService.java@@ -10,8 +10,8 @@ import java.util.Collection;import java.util.HashSet;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoService.javaindex e71e34bd2e..80a4206a94 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultVisitInfoService.java@@ -9,14 +9,14 @@ import java.io.ObjectStreamException;import java.io.Serializable;import java.util.Date;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import org.joda.time.DateTime;import org.slf4j.Logger;diff --git a/server-core/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletRequest.java b/server-core/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletRequest.javaindex 54f7711ebb..92504293f3 100644--- a/server-core/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletRequest.java+++ b/server-core/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletRequest.java@@ -21,41 +21,48 @@ package org.apache.shiro.web.servlet;import org.apache.shiro.SecurityUtils;import org.apache.shiro.session.Session;import org.apache.shiro.subject.Subject;+import org.apache.wicket.request.cycle.RequestCycle;import org.apache.shiro.subject.support.DisabledSessionException;import org.apache.shiro.web.util.WebUtils;-import org.apache.wicket.request.cycle.RequestCycle;-import javax.servlet.ServletContext;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletRequestWrapper;-import javax.servlet.http.HttpSession;+import jakarta.servlet.ServletContext;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletRequestWrapper;+import jakarta.servlet.http.HttpSession;import java.security.Principal;/*** A {@code ShiroHttpServletRequest} wraps the Servlet container's original {@code ServletRequest} instance, but ensures* that all {@link HttpServletRequest} invocations that require Shiro's support ({@link #getRemoteUser getRemoteUser},- * {@link #getSession getSession}, etc) can be executed first by Shiro as necessary before allowing the underlying+ * {@link #getSession getSession}, etc.) can be executed first by Shiro as necessary before allowing the underlying* Servlet container instance's method to be invoked.** @since 0.2*/+@SuppressWarnings({"checkstyle:JavadocVariable"})public class ShiroHttpServletRequest extends HttpServletRequestWrapper {//The following 7 constants support the Shiro's implementation of the Servlet Specificationpublic static final String COOKIE_SESSION_ID_SOURCE = "cookie";public static final String URL_SESSION_ID_SOURCE = "url";- public static final String REFERENCED_SESSION_ID = ShiroHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID";- public static final String REFERENCED_SESSION_ID_IS_VALID = ShiroHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID_VALID";- public static final String REFERENCED_SESSION_IS_NEW = ShiroHttpServletRequest.class.getName() + "_REFERENCED_SESSION_IS_NEW";- public static final String REFERENCED_SESSION_ID_SOURCE = ShiroHttpServletRequest.class.getName() + "REFERENCED_SESSION_ID_SOURCE";- public static final String IDENTITY_REMOVED_KEY = ShiroHttpServletRequest.class.getName() + "_IDENTITY_REMOVED_KEY";- public static final String SESSION_ID_URL_REWRITING_ENABLED = ShiroHttpServletRequest.class.getName() + "_SESSION_ID_URL_REWRITING_ENABLED";-- protected ServletContext servletContext = null;-- protected HttpSession session = null;- protected boolean httpSessions = true;+ public static final String REFERENCED_SESSION_ID = ShiroHttpServletRequest.class.getName()+ + "_REQUESTED_SESSION_ID";+ public static final String REFERENCED_SESSION_ID_IS_VALID = ShiroHttpServletRequest.class.getName()+ + "_REQUESTED_SESSION_ID_VALID";+ public static final String REFERENCED_SESSION_IS_NEW = ShiroHttpServletRequest.class.getName()+ + "_REFERENCED_SESSION_IS_NEW";+ public static final String REFERENCED_SESSION_ID_SOURCE = ShiroHttpServletRequest.class.getName()+ + "REFERENCED_SESSION_ID_SOURCE";+ public static final String IDENTITY_REMOVED_KEY = ShiroHttpServletRequest.class.getName()+ + "_IDENTITY_REMOVED_KEY";+ public static final String SESSION_ID_URL_REWRITING_ENABLED = ShiroHttpServletRequest.class.getName()+ + "_SESSION_ID_URL_REWRITING_ENABLED";++ protected ServletContext servletContext;++ protected HttpSession session;+ protected boolean httpSessions;public ShiroHttpServletRequest(HttpServletRequest wrapped, ServletContext servletContext, boolean httpSessions) {super(wrapped);@@ -71,10 +78,10 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {String remoteUser;Object scPrincipal = getSubjectPrincipal();if (scPrincipal != null) {- if (scPrincipal instanceof String) {- return (String) scPrincipal;- } else if (scPrincipal instanceof Principal) {- remoteUser = ((Principal) scPrincipal).getName();+ if (scPrincipal instanceof String string) {+ return string;+ } else if (scPrincipal instanceof Principal principal) {+ remoteUser = principal.getName();} else {remoteUser = scPrincipal.toString();}@@ -110,8 +117,8 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {Principal userPrincipal;Object scPrincipal = getSubjectPrincipal();if (scPrincipal != null) {- if (scPrincipal instanceof Principal) {- userPrincipal = (Principal) scPrincipal;+ if (scPrincipal instanceof Principal principal) {+ userPrincipal = principal;} else {userPrincipal = new ObjectPrincipal(scPrincipal);}@@ -143,7 +150,7 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {httpSession = super.getSession(false);if (httpSession == null && create) {//Shiro 1.2: assert that creation is enabled (SHIRO-266):- if (RequestCycle.get() != null || WebUtils._isSessionCreationEnabled(this)) {+ if (RequestCycle.get() != null || WebUtils.isSessionCreationEnabled(this)) {httpSession = super.getSession(create);} else {throw newNoSessionCreationException();@@ -151,17 +158,17 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {}} else {boolean existing = getSubject().getSession(false) != null;-+if (this.session == null || !existing) {Session shiroSession = getSubject().getSession(create);if (shiroSession != null) {this.session = new ShiroHttpSession(shiroSession, this, this.servletContext);- if (!existing) {- setAttribute(REFERENCED_SESSION_IS_NEW, Boolean.TRUE);- }} else if (this.session != null) {this.session = null;}+ if (shiroSession != null && !existing) {+ setAttribute(REFERENCED_SESSION_IS_NEW, Boolean.TRUE);+ }}httpSession = this.session;}@@ -177,11 +184,11 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {* @since 1.2*/private DisabledSessionException newNoSessionCreationException() {- String msg = "Session creation has been disabled for the current request. This exception indicates " +- "that there is either a programming error (using a session when it should never be " +- "used) or that Shiro's configuration needs to be adjusted to allow Sessions to be created " +- "for the current request. See the " + DisabledSessionException.class.getName() + " JavaDoc " +- "for more.";+ String msg = "Session creation has been disabled for the current request. This exception indicates "+ + "that there is either a programming error (using a session when it should never be "+ + "used) or that Shiro's configuration needs to be adjusted to allow Sessions to be created "+ + "for the current request. See the " + DisabledSessionException.class.getName() + " JavaDoc "+ + "for more.";return new DisabledSessionException(msg);}@@ -216,14 +223,15 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {}}+ @Deprecatedpublic boolean isRequestedSessionIdFromUrl() {return isRequestedSessionIdFromURL();}private class ObjectPrincipal implements java.security.Principal {- private Object object = null;+ private Object object;- public ObjectPrincipal(Object object) {+ ObjectPrincipal(Object object) {this.object = object;}@@ -240,8 +248,7 @@ public class ShiroHttpServletRequest extends HttpServletRequestWrapper {}public boolean equals(Object o) {- if (o instanceof ObjectPrincipal) {- ObjectPrincipal op = (ObjectPrincipal) o;+ if (o instanceof ObjectPrincipal op) {return getObject().equals(op.getObject());}return false;diff --git a/server-core/src/main/java/org/apache/wicket/Component.java b/server-core/src/main/java/org/apache/wicket/Component.javaindex 63385bdb2c..e4727e3f0f 100644--- a/server-core/src/main/java/org/apache/wicket/Component.java+++ b/server-core/src/main/java/org/apache/wicket/Component.java@@ -16,13 +16,16 @@*/package org.apache.wicket;++import io.onedev.server.util.ComponentHierarchical;+import io.onedev.server.util.HierarchicalContext;+import java.io.Serializable;-import java.lang.reflect.Method;-import java.util.ArrayList;import java.util.Arrays;import java.util.Iterator;import java.util.List;import java.util.Locale;+import java.util.Optional;import org.apache.wicket.ajax.IAjaxRegionMarkupIdProvider;import org.apache.wicket.application.IComponentInstantiationListener;@@ -32,8 +35,8 @@ import org.apache.wicket.authorization.IAuthorizationStrategy;import org.apache.wicket.authorization.UnauthorizedActionException;import org.apache.wicket.authorization.strategies.page.SimplePageAuthorizationStrategy;import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;+import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;+import org.apache.wicket.core.request.handler.ListenerRequestHandler;import org.apache.wicket.core.request.handler.PageAndComponentProvider;import org.apache.wicket.core.util.lang.WicketObjects;import org.apache.wicket.core.util.string.ComponentStrings;@@ -41,9 +44,11 @@ import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;import org.apache.wicket.event.IEventSink;import org.apache.wicket.event.IEventSource;+import org.apache.wicket.feedback.FeedbackDelay;import org.apache.wicket.feedback.FeedbackMessage;import org.apache.wicket.feedback.FeedbackMessages;import org.apache.wicket.feedback.IFeedback;+import org.apache.wicket.feedback.IFeedbackContributor;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.IMarkupFragment;import org.apache.wicket.markup.Markup;@@ -58,7 +63,6 @@ import org.apache.wicket.markup.head.StringHeaderItem;import org.apache.wicket.markup.html.IHeaderContributor;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponent;-import org.apache.wicket.markup.html.form.IFormSubmitListener;import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;import org.apache.wicket.markup.html.panel.DefaultMarkupSourcingStrategy;import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;@@ -88,16 +92,12 @@ import org.apache.wicket.util.lang.Classes;import org.apache.wicket.util.string.PrependingStringBuffer;import org.apache.wicket.util.string.Strings;import org.apache.wicket.util.value.ValueMap;-import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitFilter;import org.apache.wicket.util.visit.IVisitor;import org.apache.wicket.util.visit.Visit;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.util.ComponentHierarchical;-import io.onedev.server.util.HierarchicalContext;-/*** Component serves as the highest level abstract base class for all components.@@ -137,7 +137,7 @@ import io.onedev.server.util.HierarchicalContext;* unlikely for a web application and even the need to implement a listener interface directly is* highly discouraged. Instead, calls to listeners are routed through logic specific to the event,* resulting in calls to user code through other overridable methods. See {@link Form} for an- * example of a component which listens for events via {@link IFormSubmitListener}.</li>+ * example of a component which listens for events via {@link IRequestListener}.</li>* <li><b>Rendering </b>- Before a page or part of a page (in case of Ajax updates) is rendered, all* containing components are able to prepare for rendering via two hook methods:* {@link #onConfigure()} (regardless whether they are visible or not) and {@link #onBeforeRender()}@@ -210,6 +210,7 @@ import io.onedev.server.util.HierarchicalContext;* <li><b>Security </b>- All components are subject to an {@link IAuthorizationStrategy} which* controls instantiation, visibility and enabling. See {@link SimplePageAuthorizationStrategy} for* a simple implementation.</li>+ * </ul>** @author Jonathan Locke* @author Chris Turner@@ -227,7 +228,9 @@ public abstract class ComponentIHeaderContributor,IHierarchical<Component>,IEventSink,- IEventSource+ IEventSource,+ IMetadataContext<Serializable, Component>,+ IFeedbackContributor{/** Log. */private static final Logger log = LoggerFactory.getLogger(Component.class);@@ -285,13 +288,13 @@ public abstract class Componentpublic static final Action RENDER = new Action(Action.RENDER);/** meta data for user specified markup id */- private static final MetaDataKey<String> MARKUP_ID_KEY = new MetaDataKey<String>()+ private static final MetaDataKey<String> MARKUP_ID_KEY = new MetaDataKey<>(){private static final long serialVersionUID = 1L;};/** meta data for user specified markup id */- private static final MetaDataKey<FeedbackMessages> FEEDBACK_KEY = new MetaDataKey<FeedbackMessages>()+ private static final MetaDataKey<FeedbackMessages> FEEDBACK_KEY = new MetaDataKey<>(){private static final long serialVersionUID = 1L;};@@ -318,12 +321,6 @@ public abstract class Component}};- /** an unused flag */- private static final int FLAG_UNUSED0 = 0x20000000;- private static final int FLAG_UNUSED1 = 0x800000;- private static final int FLAG_UNUSED2 = 0x1000000;- private static final int FLAG_UNUSED3 = 0x10000000;-/** True when a component is being auto-added */private static final int FLAG_AUTO = 0x0001;@@ -395,17 +392,6 @@ public abstract class Component*/private static final int FLAG_MODEL_SET = 0x100000;- /** True when a component is being removed from the hierarchy */- protected static final int FLAG_REMOVING_FROM_HIERARCHY = 0x200000;-- /**- * Flag that makes we are in before-render callback phase Set after component.onBeforeRender is- * invoked (right before invoking beforeRender on children)- */- protected static final int FLAG_RENDERING = 0x2000000;- protected static final int FLAG_PREPARED_FOR_RENDER = 0x4000000;- protected static final int FLAG_AFTER_RENDERING = 0x8000000;-/*** Flag that restricts visibility of a component when set to true. This is usually used when a* component wants to restrict visibility of another component. Calling@@ -414,8 +400,6 @@ public abstract class Component*/private static final int FLAG_VISIBILITY_ALLOWED = 0x40000000;- private static final int FLAG_DETACHING = 0x80000000;-/*** The name of attribute that will hold markup id*/@@ -425,7 +409,7 @@ public abstract class Component* Meta data key for line precise error logging for the moment of addition. Made package private* for access in {@link MarkupContainer} and {@link Page}*/- static final MetaDataKey<String> ADDED_AT_KEY = new MetaDataKey<String>()+ static final MetaDataKey<String> ADDED_AT_KEY = new MetaDataKey<>(){private static final long serialVersionUID = 1L;};@@ -434,7 +418,7 @@ public abstract class Component* meta data key for line precise error logging for the moment of construction. Made package* private for access in {@link Page}*/- static final MetaDataKey<String> CONSTRUCTED_AT_KEY = new MetaDataKey<String>()+ static final MetaDataKey<String> CONSTRUCTED_AT_KEY = new MetaDataKey<>(){private static final long serialVersionUID = 1L;};@@ -443,16 +427,34 @@ public abstract class Componentprivate int flags = FLAG_VISIBLE | FLAG_ESCAPE_MODEL_STRINGS | FLAG_VERSIONED | FLAG_ENABLED |FLAG_IS_RENDER_ALLOWED | FLAG_VISIBILITY_ALLOWED | FLAG_RESERVED5 /* page's stateless hint */;- private static final short RFLAG_ENABLED_IN_HIERARCHY_VALUE = 0x1;- private static final short RFLAG_ENABLED_IN_HIERARCHY_SET = 0x2;- private static final short RFLAG_VISIBLE_IN_HIEARARCHY_VALUE = 0x4;- private static final short RFLAG_VISIBLE_IN_HIERARCHY_SET = 0x8;+ // @formatter:off+ private static final short RFLAG_ENABLED_IN_HIERARCHY_VALUE = 0x1;+ private static final short RFLAG_ENABLED_IN_HIERARCHY_SET = 0x2;+ private static final short RFLAG_VISIBLE_IN_HIERARCHY_VALUE = 0x4;+ private static final short RFLAG_VISIBLE_IN_HIERARCHY_SET = 0x8;/** onconfigure has been called */- private static final short RFLAG_CONFIGURED = 0x10;+ private static final short RFLAG_CONFIGURED = 0x10;private static final short RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED = 0x20;- private static final short RFLAG_INITIALIZE_SUPER_CALL_VERIFIED = 0x40;- protected static final short RFLAG_CONTAINER_DEQUEING = 0x80;- private static final short RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED = 0x100;+ private static final short RFLAG_INITIALIZE_SUPER_CALL_VERIFIED = 0x40;+ protected static final short RFLAG_CONTAINER_DEQUEING = 0x80;+ private static final short RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED = 0x100;+ /**+ * Flag that makes we are in before-render callback phase Set after component.onBeforeRender is+ * invoked (right before invoking beforeRender on children)+ */+ private static final short RFLAG_RENDERING = 0x200;+ private static final short RFLAG_PREPARED_FOR_RENDER = 0x400;+ private static final short RFLAG_AFTER_RENDER_SUPER_CALL_VERIFIED = 0x800;+ private static final short RFLAG_DETACHING = 0x1000;+ /** True when a component is being removed from the hierarchy */+ private static final short RFLAG_REMOVING_FROM_HIERARCHY = 0x2000;+ /**+ * This flag tracks if removals have been set on this component. Clearing this key is an+ * expensive operation. With this flag this expensive call can be avoided.+ */+ protected static final short RFLAG_CONTAINER_HAS_REMOVALS = 0x4000;+ private static final short RFLAG_ON_CONFIGURE_SUPER_CALL_VERIFIED = (short) 0x8000;+ // @formatter:on/*** Flags that only keep their value during the request. Useful for cache markers, etc. At the@@ -461,7 +463,7 @@ public abstract class Componentprivate transient short requestFlags = 0;/** Component id. */- private String id;+ private final String id;/** Any parent container. */private MarkupContainer parent;@@ -492,7 +494,8 @@ public abstract class Component* <li>MetaDataEntry (optionally {@link MetaDataEntry}[] if more metadata entries are present) ** <li>{@link Behavior}(s) added to component. The behaviors are not stored in separate array,* they are part of the {@link #data} array (this is in order to save the space of the pointer- * to an empty array as most components have no behaviours).+ * to an empty array as most components have no behaviours). -+ * correct?* </ul>* If there is only one attribute set (i.e. model or MetaDataEntry([]) or one behavior), the* #data object points directly to value of that attribute. Otherwise the data is of type@@ -547,7 +550,7 @@ public abstract class Component{if (index > data_length() - 1){- throw new IndexOutOfBoundsException("cannot set data at " + index ++ throw new IndexOutOfBoundsException("can not set data at " + index +" when data_length() is " + data_length());}else if (index == 0 && !(data instanceof Object[] && !(data instanceof MetaDataEntry<?>[])))@@ -575,7 +578,7 @@ public abstract class Component}if (position > currentLength){- throw new IndexOutOfBoundsException("cannot insert data at " + position ++ throw new IndexOutOfBoundsException("can not insert data at " + position +" when data_length() is " + currentLength);}if (currentLength == 0)@@ -684,13 +687,15 @@ public abstract class Component*/public Component(final String id, final IModel<?> model){- setId(id);+ checkId(id);+ this.id = id;init();- getApplication().getComponentInstantiationListeners().onInstantiation(this);+ Application application = getApplication();+ application.getComponentInstantiationListeners().onInstantiation(this);- final DebugSettings debugSettings = getApplication().getDebugSettings();+ final DebugSettings debugSettings = application.getDebugSettings();if (debugSettings.isLinePreciseReportingOnNewComponentEnabled() && debugSettings.getComponentUseCheck()){setMetaData(CONSTRUCTED_AT_KEY,@@ -751,7 +756,7 @@ public abstract class Component// Don't know how to find the markupthrow new MarkupNotFoundException(- "Cannot determine Markup. Component is not yet connected to a parent. " ++ "Can not determine Markup. Component is not yet connected to a parent. " +toString());}@@ -780,7 +785,7 @@ public abstract class Component/*** Set the markup for the component. Note that the component's markup variable is transient and- * thus must only be used for one render cycle. E.g. auto-component are using it. You may also+ * thus must only be used for one render cycle. E.g. auto components are using it. You may also* it if you subclassed getMarkup().** @param markup@@ -792,7 +797,7 @@ public abstract class Component}/**- * Called once per request on components before they are about to be rendered. This method+ * Called on all components before any component is rendered. This method* should be used to configure such things as visibility and enabled flags.* <p>* Overrides must call {@code super.onConfigure()}, usually before any other code@@ -817,6 +822,7 @@ public abstract class Component*/protected void onConfigure(){+ setRequestFlag(RFLAG_ON_CONFIGURE_SUPER_CALL_VERIFIED, true);}/**@@ -854,13 +860,13 @@ public abstract class Component** @return {@code true} if component has been initialized*/- final boolean isInitialized()+ public final boolean isInitialized(){return getFlag(FLAG_INITIALIZED);}/**- * THIS METHOD IS NOT PART OF THE PUBLIC API, DO NOT CALL IT+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!** Used to call {@link #onInitialize()}*/@@ -879,31 +885,20 @@ public abstract class Componentif (!getFlag(FLAG_INITIALIZED)){setFlag(FLAG_INITIALIZED, true);+setRequestFlag(RFLAG_INITIALIZE_SUPER_CALL_VERIFIED, false);onInitialize();- if (!getRequestFlag(RFLAG_INITIALIZE_SUPER_CALL_VERIFIED))- {- throw new IllegalStateException(Component.class.getName() +- " has not been properly initialized. Something in the hierarchy of " +- getClass().getName() +- " has not called super.onInitialize() in the override of onInitialize() method");- }- setRequestFlag(RFLAG_INITIALIZE_SUPER_CALL_VERIFIED, false);+ verifySuperCall("onInitialize", RFLAG_INITIALIZE_SUPER_CALL_VERIFIED);getApplication().getComponentInitializationListeners().onInitialize(this);}else if (getFlag(FLAG_REMOVED)){setFlag(FLAG_REMOVED, false);+setRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED, false);onReAdd();- if (!getRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED))- {- throw new IllegalStateException(Component.class.getName() +- " has not been properly added. Something in the hierarchy of " +- getClass().getName() +- " has not called super.onReAdd() in the override of onReAdd() method");- }+ verifySuperCall("onReAdd", RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED);}} finally {HierarchicalContext.pop();@@ -911,80 +906,33 @@ public abstract class Component}/**- * Called on every component after the page is rendered. It will call onAfterRender for it self- * and its children.+ * Called on every component after the page is rendered. Calls hook {@link #onAfterRender()}.*/- public final void afterRender()+ final void afterRender(){+ setRequestFlag(RFLAG_PREPARED_FOR_RENDER, false);+try{- setFlag(FLAG_AFTER_RENDERING, true);-- // always detach children because components can be attached- // independently of their parents- onAfterRenderChildren();+ setRequestFlag(RFLAG_AFTER_RENDER_SUPER_CALL_VERIFIED, false);onAfterRender();getApplication().getComponentOnAfterRenderListeners().onAfterRender(this);- if (getFlag(FLAG_AFTER_RENDERING))- {- throw new IllegalStateException(Component.class.getName() +- " has not been properly detached. Something in the hierarchy of " +- getClass().getName() +- " has not called super.onAfterRender() in the override of onAfterRender() method");- }+ verifySuperCall("onAfterRender", RFLAG_AFTER_RENDER_SUPER_CALL_VERIFIED);}finally{// this flag must always be set to false.- markRendering(false);+ setRequestFlag(RFLAG_RENDERING, false);}}/**+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!*- */- private void internalBeforeRender()- {- configure();-- if ((determineVisibility()) && !getFlag(FLAG_RENDERING) &&- !getFlag(FLAG_PREPARED_FOR_RENDER))- {- setRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED, false);-- getApplication().getComponentPreOnBeforeRenderListeners().onBeforeRender(this);-- onBeforeRender();- getApplication().getComponentPostOnBeforeRenderListeners().onBeforeRender(this);-- if (!getRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED))- {- throw new IllegalStateException(Component.class.getName() +- " has not been properly rendered. Something in the hierarchy of " +- getClass().getName() +- " has not called super.onBeforeRender() in the override of onBeforeRender() method");- }- }- }-- /**- * We need to postpone calling beforeRender() on components that implement {@link IFeedback}, to- * be sure that all other component's beforeRender() has been already called, so that IFeedbacks- * can collect all feedback messages. This is the key under list of postponed {@link IFeedback}- * is stored to request cycle metadata. The List is then iterated over in- * {@link #prepareForRender()} after calling {@link #beforeRender()}, to initialize postponed- * components.- */- private static final MetaDataKey<List<Component>> FEEDBACK_LIST = new MetaDataKey<List<Component>>()- {- private static final long serialVersionUID = 1L;- };-- /**- * Called for every component when the page is getting to be rendered. it will call- * {@link #configure()} and {@link #onBeforeRender()} for this component and all the child- * components+ * Called on all components before any component is rendered. Calls hooks+ * {@link #configure()} and (if visible) {@link #onBeforeRender()}+ * and delegates to {@link #beforeRender()} of all child components.*/public final void beforeRender(){@@ -992,41 +940,33 @@ public abstract class Componenttry {if (this instanceof IFeedback){- // this component is a feedback. Feedback must be initialized last, so that- // they can collect messages from other components- List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST);- if (feedbacks == null)- {- feedbacks = new ArrayList<Component>();- getRequestCycle().setMetaData(FEEDBACK_LIST, feedbacks);+ Optional<FeedbackDelay> delay = FeedbackDelay.get(getRequestCycle());+ if (delay.isPresent()) {+ delay.get().postpone((IFeedback)this);+ return;}+ }- if (this instanceof MarkupContainer)- {- ((MarkupContainer)this).visitChildren(IFeedback.class,- new IVisitor<Component, Void>()- {- @Override- public void component(Component feedback, IVisit<Void> visit)- {- feedback.beforeRender();+ configure();- // don't need to go deeper,- // as the feedback will visit its children on its own- visit.dontGoDeeper();- }- });- }+ if ((determineVisibility()) && !getRequestFlag(RFLAG_RENDERING) &&+ !getRequestFlag(RFLAG_PREPARED_FOR_RENDER))+ {+ try {+ setRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED, false);- if (!feedbacks.contains(this))- {- feedbacks.add(this);+ Application application = getApplication();+ application.getComponentPreOnBeforeRenderListeners().onBeforeRender(this);++ onBeforeRender();+ application.getComponentPostOnBeforeRenderListeners().onBeforeRender(this);++ verifySuperCall("onBeforeRender", RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED);+ } catch (RuntimeException ex) {+ setRequestFlag(RFLAG_PREPARED_FOR_RENDER, false);+ throw ex;}}- else- {- internalBeforeRender();- }} finally {HierarchicalContext.pop();}@@ -1046,7 +986,7 @@ public abstract class Component* <pre>* final WebMarkupContainer source=new WebMarkupContainer("a") {* protected void onConfigure() {- * setVisible(Math.rand()>0.5f);+ * setVisible(Math.rand()>0.5f);* }* };*@@ -1066,7 +1006,11 @@ public abstract class Component{clearEnabledInHierarchyCache();clearVisibleInHierarchyCache();++ setRequestFlag(RFLAG_ON_CONFIGURE_SUPER_CALL_VERIFIED, false);onConfigure();+ verifySuperCall("onConfigure", RFLAG_ON_CONFIGURE_SUPER_CALL_VERIFIED);+for (Behavior behavior : getBehaviors()){if (isBehaviorAccepted(behavior))@@ -1087,9 +1031,19 @@ public abstract class Component}/**- *- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!- *+ * Verify super calls of an overridden hook method.+ */+ private final void verifySuperCall(String method, short flag)+ {+ if (!getRequestFlag(flag))+ {+ throw new IllegalStateException(String.format("%s() in the hierarchy of %s has not called super.%s()", method, getClass().getName(), method));+ }++ setRequestFlag(flag, false);+ }++ /*** Called after the {@link #onConfigure()}, but before {@link #onBeforeRender()}*/void internalOnAfterConfigure()@@ -1138,6 +1092,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void debug(final Serializable message){getFeedbackMessages().debug(this, message);@@ -1149,17 +1104,17 @@ public abstract class Component*/final void internalOnRemove(){- setFlag(FLAG_REMOVING_FROM_HIERARCHY, true);+ setRequestFlag(RFLAG_REMOVING_FROM_HIERARCHY, true);onRemove();setFlag(FLAG_REMOVED, true);- if (getFlag(FLAG_REMOVING_FROM_HIERARCHY))+ if (getRequestFlag(RFLAG_REMOVING_FROM_HIERARCHY)){throw new IllegalStateException(Component.class.getName() +- " has not been properly removed from hierachy. Something in the hierarchy of " ++ " has not been properly removed from hierarchy. Something in the hierarchy of " +getClass().getName() +" has not called super.onRemove() in the override of onRemove() method");}- new Behaviors(this).onRemove(this);+ Behaviors.onRemove(this);removeChildren();}@@ -1172,9 +1127,9 @@ public abstract class Component{try{- setFlag(FLAG_DETACHING, true);+ setRequestFlag(RFLAG_DETACHING, true);onDetach();- if (getFlag(FLAG_DETACHING))+ if (getRequestFlag(RFLAG_DETACHING)){throw new IllegalStateException(Component.class.getName() +" has not been properly detached. Something in the hierarchy of " +@@ -1188,7 +1143,7 @@ public abstract class ComponentdetachModels();// detach any behaviors- new Behaviors(this).detach();+ Behaviors.detach(this);}catch (Exception x){@@ -1211,20 +1166,8 @@ public abstract class ComponentclearEnabledInHierarchyCache();clearVisibleInHierarchyCache();- boolean beforeRenderSuperCallVerified = getRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED);- boolean initializeSuperCallVerified = getRequestFlag(RFLAG_INITIALIZE_SUPER_CALL_VERIFIED);-- requestFlags = 0;-- // preserve the super_call_verified flags if they were set. WICKET-5417- if (beforeRenderSuperCallVerified)- {- setRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED, true);- }- if (initializeSuperCallVerified)- {- setRequestFlag(RFLAG_INITIALIZE_SUPER_CALL_VERIFIED, true);- }+ // clear request flags but keep super call verifications WICKET-5417+ requestFlags &= (RFLAG_INITIALIZE_SUPER_CALL_VERIFIED | RFLAG_ON_CONFIGURE_SUPER_CALL_VERIFIED | RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED);detachFeedback();@@ -1282,6 +1225,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void error(final Serializable message){getFeedbackMessages().error(this, message);@@ -1294,6 +1238,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void fatal(final Serializable message){getFeedbackMessages().fatal(this, message);@@ -1462,11 +1407,13 @@ public abstract class Component}/**+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!+ ** Get the first component tag in the associated markup** @return first component tag*/- private ComponentTag getMarkupTag()+ protected final ComponentTag getMarkupTag(){IMarkupFragment markup = getMarkup();if (markup != null)@@ -1484,7 +1431,7 @@ public abstract class Component}/**- * THIS IS WICKET INTERNAL ONLY. DO NOT USE IT.+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!** Get a copy of the markup's attributes which are associated with the component.* <p>@@ -1588,6 +1535,7 @@ public abstract class Component* @return The metadata or null of no metadata was found for the given key* @see MetaDataKey*/+ @Overridepublic final <M extends Serializable> M getMetaData(final MetaDataKey<M> key){return key.get(getMetaData());@@ -1767,7 +1715,8 @@ public abstract class Componentif (page == null){// Give up with a nice exception- throw new WicketRuntimeException("No Page found for component " + this);+ throw new WicketRuntimeException("No Page found for component: " + this.toString(true)+ + ". You probably forgot to add it to its parent component.");}return page;@@ -2023,6 +1972,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void info(final Serializable message){getFeedbackMessages().info(this, message);@@ -2035,6 +1985,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void success(final Serializable message){getFeedbackMessages().success(this, message);@@ -2084,7 +2035,7 @@ public abstract class Component* Checks the security strategy if the {@link Component#RENDER} action is allowed on this* component*- * @return ture if {@link Component#RENDER} action is allowed, false otherwise+ * @return true if {@link Component#RENDER} action is allowed, false otherwise*/public final boolean isRenderAllowed(){@@ -2100,13 +2051,9 @@ public abstract class Component*/public final boolean isStateless(){- if (- // the component is either invisible or disabled- (isVisibleInHierarchy() && isEnabledInHierarchy()) == false &&-- // and it can't call listener interfaces- canCallListenerInterface(null) == false)+ if ((isVisibleInHierarchy() && isEnabledInHierarchy()) == false && canCallListener() == false){+ // the component is either invisible or disabled and it can't call listeners// then pretend the component is statelessreturn true;}@@ -2176,15 +2123,25 @@ public abstract class Component*/public final boolean isVisibleInHierarchy(){+ if (getRequestFlag(RFLAG_VISIBLE_IN_HIERARCHY_SET))+ {+ return getRequestFlag(RFLAG_VISIBLE_IN_HIERARCHY_VALUE);+ }++ final boolean state;Component parent = getParent();if (parent != null && !parent.isVisibleInHierarchy()){- return false;+ state = false;}else{- return determineVisibility();+ state = determineVisibility();}++ setRequestFlag(RFLAG_VISIBLE_IN_HIERARCHY_SET, true);+ setRequestFlag(RFLAG_VISIBLE_IN_HIERARCHY_VALUE, state);+ return state;}/**@@ -2196,8 +2153,6 @@ public abstract class Component* @param setRenderingFlag* if this is false only the PREPARED_FOR_RENDER flag is removed from component, the* RENDERING flag is not set.- *- * @see #internalPrepareForRender(boolean)*/public final void markRendering(boolean setRenderingFlag){@@ -2232,62 +2187,6 @@ public abstract class Component}}- /**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!- * <p>- * Prepares the component and it's children for rendering. On whole page render this method must- * be called on the page. On AJAX request, this method must be called on the updated component.- *- * @param setRenderingFlag- * Whether to set the rendering flag. This must be true if the page is about to be- * rendered. However, there are usecases to call this method without an immediate- * render (e.g. on stateless listener request target to build the component- * hierarchy), in that case setRenderingFlag should be false.- */- public void internalPrepareForRender(boolean setRenderingFlag)- {- beforeRender();-- if (setRenderingFlag)- {- // only process feedback panel when we are about to be rendered.- // setRenderingFlag is false in case prepareForRender is called only to build component- // hierarchy (i.e. in BookmarkableListenerInterfaceRequestHandler).- // prepareForRender(true) is always called before the actual rendering is done so- // that's where feedback panels gather the messages-- List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST);- if (feedbacks != null)- {- // iterate over a copy because a IFeedback may add more IFeedback children-// (WICKET-4687)- Component[] feedbacksCopy = feedbacks.toArray(new Component[feedbacks.size()]);- for (Component feedback : feedbacksCopy)- {- // render it only if it is still in the page hierarchy (WICKET-4895)- if (feedback.findPage() != null)- {- feedback.internalBeforeRender();- }- }- }- getRequestCycle().setMetaData(FEEDBACK_LIST, null);- }-- markRendering(setRenderingFlag);- }-- /**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!- *- * Prepares the component and it's children for rendering. On whole page render this method must- * be called on the page. On AJAX request, this method must be called on updated component.- */- public final void prepareForRender()- {- internalPrepareForRender(true);- }-/*** Redirects browser to an intermediate page such as a sign-in page. The current request's URL* is saved for future use by method {@link #continueToOriginalDestination()}; only use this method when@@ -2323,26 +2222,46 @@ public abstract class Componentparent.remove(this);}+ /**+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!+ * <p>+ * Renders this component as a part of a response - the caller has to+ * make sure that this component is prepared for render.+ *+ * @see #beforeRender()+ */+ public final void renderPart() {+ Page page = getPage();++ page.startComponentRender(this);++ markRendering(true);++ render();++ page.endComponentRender(this);+ }/**- * Render the Component.+ * Render this component and all its children. Always calls hook {@link #onAfterRender()}+ * regardless of any exception.*/public final void render(){HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));try {- RuntimeException exception = null;+ if (isAuto())+ {+ // auto components are prepared when rendered+ beforeRender();+ }+ // Do the render+ RuntimeException exception = null;try{- // Invoke prepareForRender only if this is the root component to be rendered- MarkupContainer parent = getParent();- if ((parent == null) || (parent.getFlag(FLAG_RENDERING) == false) || isAuto())- {- internalPrepareForRender(true);- }-- // Do the render+ setRequestFlag(RFLAG_RENDERING, true);+internalRender();}catch (final RuntimeException ex)@@ -2392,9 +2311,6 @@ public abstract class Component// MarkupStream is an Iterator for the markupMarkupStream markupStream = new MarkupStream(markup);- // Flag: we started the render process- markRendering(true);-MarkupElement elem = markup.get(0);if (elem instanceof ComponentTag){@@ -2439,7 +2355,7 @@ public abstract class Component{if (getFlag(FLAG_PLACEHOLDER)){- renderPlaceholderTag((ComponentTag)elem, getResponse());+ renderPlaceholderTag(((ComponentTag)elem).mutable(), getResponse());}}}@@ -2484,23 +2400,13 @@ public abstract class Component*/protected void renderPlaceholderTag(final ComponentTag tag, final Response response){- String ns = Strings.isEmpty(tag.getNamespace()) ? null : tag.getNamespace() + ':';+ String name = Strings.isEmpty(tag.getNamespace()) ? tag.getName()+ : tag.getNamespace() + ':' + tag.getName();- response.write("<");- if (ns != null)- {- response.write(ns);- }- response.write(tag.getName());- response.write(" id=\"");- response.write(getAjaxRegionMarkupId());- response.write("\" style=\"display:none\"></");- if (ns != null)- {- response.write(ns);- }- response.write(tag.getName());- response.write(">");+ // prefer concatenation over String#format() for performance+ response.write(+ "<" + name + " id=\"" + getAjaxRegionMarkupId() ++ "\" hidden=\"\" data-wicket-placeholder=\"\"></" + name + ">");}@@ -2538,13 +2444,13 @@ public abstract class Component/**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!* <p>* Renders the component at the current position in the given markup stream. The method* onComponentTag() is called to allow the component to mutate the start tag. The method* onComponentTagBody() is then called to permit the component to render its body.*/- public final void internalRenderComponent()+ protected final void internalRenderComponent(){final IMarkupFragment markup = getMarkup();if (markup == null)@@ -2574,7 +2480,7 @@ public abstract class Componentif (tag.isOpenClose() && openTag.isOpen()){- markupStream.throwMarkupException("You cannot modify a open tag to open-close: " + tag);+ markupStream.throwMarkupException("You can not modify a open tag to open-close: " + tag);}try@@ -2592,7 +2498,8 @@ public abstract class Componentif (getFlag(FLAG_OUTPUT_MARKUP_ID)){String message = String.format("Markup id set on a component that renders its body only. " +- "Markup id: %s, component id: %s.", getMarkupId(), getId());+ "Markup id: %s, component id: %s, type: %s, path: %s",+ getMarkupId(), getId(), getClass(), getPage().getPageClass() + ":" + getPageRelativePath());if (notRenderableErrorStrategy == ExceptionSettings.NotRenderableErrorStrategy.THROW_EXCEPTION){throw new IllegalStateException(message);@@ -2602,7 +2509,8 @@ public abstract class Componentif (getFlag(FLAG_PLACEHOLDER)){String message = String.format("Placeholder tag set on a component that renders its body only. " +- "Component id: %s.", getId());+ "Component id: %s, type: %s, path: %s\", ",+ getId(), getClass(), getPage().getPageClass() + ":" + getPageRelativePath());if (notRenderableErrorStrategy == ExceptionSettings.NotRenderableErrorStrategy.THROW_EXCEPTION){throw new IllegalStateException(message);@@ -2634,7 +2542,7 @@ public abstract class Component{// Close the manually opened tag. And since the user might have changed the// tag name ...- getResponse().write(tag.syntheticCloseTagString());+ tag.writeSyntheticCloseTag(getResponse());}}}@@ -2726,7 +2634,7 @@ public abstract class Component}/**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!** Print to the web response what ever the component wants to contribute to the head section.* Make sure that all attached behaviors are asked as well.@@ -2752,7 +2660,8 @@ public abstract class ComponentIHeaderResponse response = container.getHeaderResponse();// Allow component to contribute- if (response.wasRendered(this) == false)+ boolean wasRendered = response.wasRendered(this);+ if (wasRendered == false){StringResponse markupHeaderResponse = new StringResponse();Response oldResponse = getResponse();@@ -2773,9 +2682,7 @@ public abstract class ComponentRequestCycle.get().setResponse(oldResponse);}// Then let the component itself to contribute to the header- renderHead(this, response);-- response.markRendered(this);+ renderHead(response);}// Then ask all behaviors@@ -2783,14 +2690,19 @@ public abstract class Component{if (isBehaviorAccepted(behavior)){- if (response.wasRendered(behavior) == false)+ List<IClusterable> pair = List.of(this, behavior);+ if (!response.wasRendered(pair)){behavior.renderHead(this, response);- List<IClusterable> pair = Arrays.asList(this, behavior);response.markRendered(pair);}}}++ if (wasRendered == false)+ {+ response.markRendered(this);+ }}} finally {HierarchicalContext.pop();@@ -2980,6 +2892,7 @@ public abstract class Component{Args.notEmpty(markupId, "markupId");+setMarkupIdImpl(markupId);return this;}@@ -2999,12 +2912,13 @@ public abstract class Component* @throws IllegalArgumentException* @see MetaDataKey*/+ @Overridepublic final <M extends Serializable> Component setMetaData(final MetaDataKey<M> key, final M object){MetaDataEntry<?>[] old = getMetaData();Object metaData = null;- MetaDataEntry<?>[] metaDataArray = key.set(getMetaData(), object);+ MetaDataEntry<?>[] metaDataArray = key.set(old, object);if (metaDataArray != null && metaDataArray.length > 0){metaData = (metaDataArray.length > 1) ? metaDataArray : metaDataArray[0];@@ -3143,7 +3057,14 @@ public abstract class Componentif (!getModelComparator().compare(this, object)){modelChanging();- model.setObject(object);+ try+ {+ model.setObject(object);+ }+ catch (UnsupportedOperationException uox)+ {+ throw new WicketRuntimeException("You need to use writeable IModel for component " + getPageRelativePath(), uox);+ }modelChanged();}@@ -3170,7 +3091,7 @@ public abstract class Component/*** Render a placeholder tag when the component is not visible. The tag is of form:- * <componenttag style="display:none;" id="markupid"/>. This method will also call+ * <componenttag hidden="" id="markupid"/>. This method will also call* <code>setOutputMarkupId(true)</code>.** This is useful, for example, in ajax situations where the component starts out invisible and@@ -3394,30 +3315,26 @@ public abstract class Component}/**- * Gets a URL for the listener interface on a behavior (e.g. IBehaviorListener on- * AjaxPagingNavigationBehavior).+ * Gets a URL for the listener interface on a behavior (e.g. {@link IRequestListener} on+ * {@link org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationBehavior}).** @param behaviour* The behavior that the URL should point to- * @param listener- * The listener interface that the URL should call* @param parameters* The parameters that should be rendered into the urls* @return The URL*/- public final CharSequence urlFor(final Behavior behaviour,- final RequestListenerInterface listener, final PageParameters parameters)+ public final CharSequence urlForListener(final Behavior behaviour, final PageParameters parameters){int id = getBehaviorId(behaviour);- IRequestHandler handler = createRequestHandler(listener, parameters, id);+ IRequestHandler handler = createRequestHandler(parameters, id);return getRequestCycle().urlFor(handler);}/*** Create a suitable request handler depending whether the page is stateless or bookmarkable.*/- private IRequestHandler createRequestHandler(RequestListenerInterface listener,- PageParameters parameters, Integer id)+ private IRequestHandler createRequestHandler(PageParameters parameters, Integer id){Page page = getPage();@@ -3426,11 +3343,11 @@ public abstract class Componentif (page.isPageStateless()|| (page.isBookmarkable() && page.wasCreatedBookmarkable())){- return new BookmarkableListenerInterfaceRequestHandler(provider, listener, id);+ return new BookmarkableListenerRequestHandler(provider, id);}else{- return new ListenerInterfaceRequestHandler(provider, listener, id);+ return new ListenerRequestHandler(provider, id);}}@@ -3450,20 +3367,17 @@ public abstract class Component}/**- * Gets a URL for the listener interface (e.g. ILinkListener).+ * Gets a URL for this {@link IRequestListener}.** @see RequestCycle#urlFor(IRequestHandler)*- * @param listener- * The listener interface that the URL should call* @param parameters- * The parameters that should be rendered into the urls+ * The parameters that should be rendered into the URL* @return The URL*/- public final CharSequence urlFor(final RequestListenerInterface listener,- final PageParameters parameters)+ public final CharSequence urlForListener(final PageParameters parameters){- IRequestHandler handler = createRequestHandler(listener, parameters, null);+ IRequestHandler handler = createRequestHandler(parameters, null);return getRequestCycle().urlFor(handler);}@@ -3553,6 +3467,7 @@ public abstract class Component* @param message* The feedback message*/+ @Overridepublic final void warn(final Serializable message){getFeedbackMessages().warn(this, message);@@ -3675,7 +3590,7 @@ public abstract class Componentprotected void checkHierarchyChange(final Component component){// Throw exception if modification is attempted during rendering- if (getFlag(FLAG_RENDERING) && !component.isAuto())+ if (getRequestFlag(RFLAG_RENDERING) && !component.isAuto()){throw new WicketRuntimeException("Cannot modify component hierarchy after render phase has started (page version cant change then anymore)");@@ -3749,7 +3664,7 @@ public abstract class Component*/public <M extends Behavior> List<M> getBehaviors(Class<M> type){- return new Behaviors(this).getBehaviors(type);+ return Behaviors.getBehaviors(this, type);}/**@@ -3906,15 +3821,16 @@ public abstract class Component}/**- * Called just after a component is rendered.+ * Called immediately after a component and all its children have been rendered,+ * regardless of any exception.*/protected void onAfterRender(){- setFlag(FLAG_AFTER_RENDERING, false);+ setRequestFlag(RFLAG_AFTER_RENDER_SUPER_CALL_VERIFIED, true);}/**- * Called just before a component is rendered only if the component is visible.+ * Called on all visible components before any component is rendered.* <p>* <strong>NOTE</strong>: If you override this, you *must* call super.onBeforeRender() within* your implementation.@@ -3930,7 +3846,7 @@ public abstract class Component*/protected void onBeforeRender(){- setFlag(FLAG_PREPARED_FOR_RENDER, true);+ setRequestFlag(RFLAG_PREPARED_FOR_RENDER, true);onBeforeRenderChildren();setRequestFlag(RFLAG_BEFORE_RENDER_SUPER_CALL_VERIFIED, true);}@@ -3943,7 +3859,6 @@ public abstract class Component* @param tag* Tag to modify*/- @SuppressWarnings("deprecation")protected void onComponentTag(final ComponentTag tag){// We can't try to get the ID from markup. This could be different than@@ -3957,11 +3872,6 @@ public abstract class ComponentDebugSettings debugSettings = getApplication().getDebugSettings();String componentPathAttributeName = debugSettings.getComponentPathAttributeName();- if (Strings.isEmpty(componentPathAttributeName) && debugSettings.isOutputComponentPath())- {- // fallback to the old 'wicketpath'- componentPathAttributeName = "wicketpath";- }if (Strings.isEmpty(componentPathAttributeName) == false){String path = getPageRelativePath();@@ -3994,7 +3904,7 @@ public abstract class Component*/protected void onDetach(){- setFlag(FLAG_DETACHING, false);+ setRequestFlag(RFLAG_DETACHING, false);}/**@@ -4005,7 +3915,7 @@ public abstract class Component*/protected void onRemove(){- setFlag(FLAG_REMOVING_FROM_HIERARCHY, false);+ setRequestFlag(RFLAG_REMOVING_FROM_HIERARCHY, false);}/**@@ -4042,6 +3952,7 @@ public abstract class Component// apply behaviors that are attached to the component tag.if (tag.hasBehaviors()){+ tag = tag.mutable();Iterator<? extends Behavior> tagBehaviors = tag.getBehaviors();while (tagBehaviors.hasNext()){@@ -4197,14 +4108,12 @@ public abstract class Component}/**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!- ** @param flag* The flag to set* @param set* True to turn the flag on, false to turn it off*/- protected final Component setRequestFlag(final short flag, final boolean set)+ final Component setRequestFlag(final short flag, final boolean set){if (set){@@ -4287,9 +4196,9 @@ public abstract class Componentvoid internalMarkRendering(boolean setRenderingFlag){// WICKET-5460 no longer prepared for render- setFlag(FLAG_PREPARED_FOR_RENDER, false);+ setRequestFlag(RFLAG_PREPARED_FOR_RENDER, false);- setFlag(FLAG_RENDERING, setRenderingFlag);+ setRequestFlag(RFLAG_RENDERING, setRenderingFlag);}/**@@ -4314,14 +4223,7 @@ public abstract class Component*/boolean isPreparedForRender(){- return getFlag(FLAG_PREPARED_FOR_RENDER);- }-- /**- *- */- protected void onAfterRenderChildren()- {+ return getRequestFlag(RFLAG_PREPARED_FOR_RENDER);}/**@@ -4356,7 +4258,7 @@ public abstract class Component// Render the close tagif ((renderBodyOnly == false) && needToRenderTag(openTag)){- getResponse().write(openTag.syntheticCloseTagString());+ openTag.writeSyntheticCloseTag(getResponse());}}else if (openTag.requiresCloseTag())@@ -4374,7 +4276,7 @@ public abstract class Component* @param id* The non-null id of this component*/- final Component setId(final String id)+ private void checkId(final String id){if (!(this instanceof Page)){@@ -4388,9 +4290,6 @@ public abstract class Component{throw new WicketRuntimeException("The component ID must not contain ':' or '~' chars.");}-- this.id = id;- return this;}/**@@ -4449,7 +4348,11 @@ public abstract class Component*/public final Component setVisibilityAllowed(boolean allowed){- setFlag(FLAG_VISIBILITY_ALLOWED, allowed);+ if (allowed != getFlag(FLAG_VISIBILITY_ALLOWED))+ {+ setFlag(FLAG_VISIBILITY_ALLOWED, allowed);+ onVisibleStateChanged();+ }return this;}@@ -4507,20 +4410,18 @@ public abstract class Component}/**- * Says if the component is rendering or not checking the corresponding flag.+ * Says if the component is rendering currently.** @return true if this component is rendering, false otherwise.*/public final boolean isRendering(){- return getFlag(FLAG_RENDERING);+ return getRequestFlag(RFLAG_PREPARED_FOR_RENDER) || getRequestFlag(RFLAG_RENDERING);}/**- * Checks whether or not a listener method can be invoked on this component. Usually components- * deny these invocations if they are either invisible or disabled in hierarchy. Components can- * examine which listener interface is being invoked by examining the declaring class of the- * passed in {@literal method} parameter.+ * Checks whether or not an {@link IRequestListener} can be invoked on this component. Usually components+ * deny these invocations if they are either invisible or disabled in hierarchy.* <p>* WARNING: be careful when overriding this method because it may open security holes - such as* allowing a user to click on a link that should be disabled.@@ -4529,41 +4430,18 @@ public abstract class Component* Example usecase for overriding: Suppose you are building an component that displays images.* The component generates a callback to itself using {@link IRequestListener} interface and* uses this callback to stream image data. If such a component is placed inside a disabled- * webmarkupcontainer we still want to allow the invocation of the request listener callback+ * {@code WebMarkupContainer} we still want to allow the invocation of the request listener callback* method so that image data can be streamed. Such a component would override this method and- * return {@literal true} if the listener method belongs to {@link IRequestListener}.+ * return {@literal true}.* </p>*- * @param method- * listener method about to be invoked on this component. Could be {@code null} - in- * this case it means <em>any</em> method.- ** @return {@literal true} iff the listener method can be invoked on this component*/- public boolean canCallListenerInterface(Method method)+ public boolean canCallListener(){return isEnabledInHierarchy() && isVisibleInHierarchy();}- /**- * CAUTION: this method is not meant to be overridden like it was in wicket 1.4 when- * implementing {@link IHeaderContributor}. overload- * {@link Component#renderHead(org.apache.wicket.markup.head.IHeaderResponse)} instead to- * contribute to the response header.- *- * @param component- * @param response- */- public final void renderHead(Component component, IHeaderResponse response)- {- if (component != this)- {- throw new IllegalStateException(- "This method is only meant to be invoked on the component where the parameter component==this");- }- renderHead(response);- }-/*** Render to the web response whatever the component wants to contribute to the head section.*@@ -4586,8 +4464,12 @@ public abstract class Component@Overridepublic final <T> void send(IEventSink sink, Broadcast type, T payload){- new ComponentEventSender(this, getApplication().getFrameworkSettings()).send(sink, type,- payload);+ // if there are no event dispatchers then don't even try to send event+ if (getApplication().getFrameworkSettings().hasAnyEventDispatchers())+ {+ new ComponentEventSender(this, getApplication().getFrameworkSettings()).send(sink, type,+ payload);+ }}/**@@ -4600,10 +4482,9 @@ public abstract class Component*/public Component remove(final Behavior... behaviors){- Behaviors helper = new Behaviors(this);for (Behavior behavior : behaviors){- helper.remove(behavior);+ Behaviors.remove(this, behavior);}return this;}@@ -4612,14 +4493,19 @@ public abstract class Component@Overridepublic final Behavior getBehaviorById(int id){- return new Behaviors(this).getBehaviorById(id);+ return Behaviors.getBehaviorById(this, id);}/** {@inheritDoc} */@Overridepublic final int getBehaviorId(Behavior behavior){- return new Behaviors(this).getBehaviorId(behavior);+ if (behavior.isTemporary(this))+ {+ throw new IllegalArgumentException(+ "Cannot get a stable id for temporary behavior " + behavior);+ }+ return Behaviors.getBehaviorId(this, behavior);}/**@@ -4631,15 +4517,15 @@ public abstract class Component*/public Component add(final Behavior... behaviors){- new Behaviors(this).add(behaviors);+ Behaviors.add(this, behaviors);return this;}/**- * Gets the currently coupled {@link Behavior}s as a unmodifiable list. Returns an empty list+ * Gets the currently coupled {@link Behavior}s as an unmodifiable list. Returns an empty list* rather than null if there are no behaviors coupled to this component.*- * @return The currently coupled behaviors as a unmodifiable list+ * @return The currently coupled behaviors as an unmodifiable list*/public final List<? extends Behavior> getBehaviors(){@@ -4647,10 +4533,10 @@ public abstract class Component}@Override- public boolean canCallListenerInterfaceAfterExpiry()+ public boolean canCallListenerAfterExpiry(){return getApplication().getPageSettings()- .getCallListenerInterfaceAfterExpiry() || isStateless();+ .getCallListenerAfterExpiry() || isStateless();}/*** This method is called whenever a component is re-added to the page's component tree, if itdiff --git a/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.javadeleted file mode 100644index b93f33e289..0000000000--- a/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java+++ /dev/null@@ -1,357 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.wicket;--import java.lang.reflect.InvocationTargetException;-import java.lang.reflect.Method;-import java.util.Collection;-import java.util.Collections;-import java.util.HashMap;-import java.util.Map;--import org.apache.wicket.authorization.AuthorizationException;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;-import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;-import org.apache.wicket.request.component.IRequestableComponent;-import org.apache.wicket.util.lang.Classes;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import io.onedev.server.util.ComponentHierarchical;-import io.onedev.server.util.HierarchicalContext;---/**- * Base class for request listener interfaces.- *- * @author Jonathan Locke- */-public class RequestListenerInterface-{- /** Map from name to request listener interface */- private static final Map<String, RequestListenerInterface> interfaces = Collections.synchronizedMap(new HashMap<String, RequestListenerInterface>());-- /** Log. */- private static final Logger log = LoggerFactory.getLogger(RequestListenerInterface.class);-- /**- * Looks up a request interface listener by name.- *- * @param interfaceName- * The interface name- * @return The RequestListenerInterface object, or null if none is found- *- */- public static RequestListenerInterface forName(final String interfaceName)- {- return interfaces.get(interfaceName);- }-- /** The listener interface method */- private Method method;-- /** The name of this listener interface */- private final String name;-- /**- * Whether the render count should be included in URL. This should be true for every listener- * interface URL that should only be active on last rendered page (links, etc) and false for- * other (resources);- */- private boolean includeRenderCount = true;-- /**- * Whether the page should be rendered by default after the invocation of this listener- * interface. Applies only during non-ajax requests.- */- private boolean renderPageAfterInvocation = true;-- final Class<? extends IRequestListener> listenerInterfaceClass;-- /**- * Constructor.- *- * @param listenerInterfaceClass- * The interface class, which must extend IRequestListener.- */- public RequestListenerInterface(final Class<? extends IRequestListener> listenerInterfaceClass)- {- this.listenerInterfaceClass = listenerInterfaceClass;-- // Ensure that it extends IRequestListener- if (!IRequestListener.class.isAssignableFrom(listenerInterfaceClass))- {- throw new IllegalArgumentException("Class " + listenerInterfaceClass +- " must extend IRequestListener");- }-- // Get interface methods- final Method[] methods = listenerInterfaceClass.getMethods();-- // If there is only one method- if (methods.length == 1)- {- // and that method takes no parameters- if (methods[0].getParameterTypes().length == 0)- {- method = methods[0];- }- else- {- throw new IllegalArgumentException("Method " + methods[0] + " in interface " +- listenerInterfaceClass + " cannot take any arguments");- }- }- else- {- throw new IllegalArgumentException("Interface " + listenerInterfaceClass +- " can have only one method");- }-- // Save short class name- name = Classes.simpleName(listenerInterfaceClass);-- // Register this listener- register();- }--- /**- * @return The interface class, which must extend IRequestListener.- */- public Class<? extends IRequestListener> getListenerInterfaceClass()- {- return listenerInterfaceClass;- }--- /**- * @param includeRenderCount- * @return self- */- public RequestListenerInterface setIncludeRenderCount(boolean includeRenderCount)- {- this.includeRenderCount = includeRenderCount;- return this;- }-- /**- * @return whether the render count should be included in url- */- public boolean isIncludeRenderCount()- {- return includeRenderCount;- }-- /**- * @param renderPageAfterInvocation- * @return self- */- public RequestListenerInterface setRenderPageAfterInvocation(boolean renderPageAfterInvocation)- {- this.renderPageAfterInvocation = renderPageAfterInvocation;- return this;- }-- /**- * @return whether the page should be rendered after invocation of this interface (during- * non-ajax requests)- */- public boolean isRenderPageAfterInvocation()- {- return renderPageAfterInvocation;- }-- /**- * @return The method for this request listener interface- */- public final Method getMethod()- {- return method;- }-- /**- * @return The name of this request listener interface- */- public final String getName()- {- return name;- }-- /**- * Invokes a given interface on a component.- *- * @param rcomponent- * The component- *- * @throws ListenerInvocationNotAllowedException- * when listener invocation attempted on a component that does not allow it- */- public final void invoke(final IRequestableComponent rcomponent)- {- // we are in Wicket core land- final Component component = (Component)rcomponent;-- HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(component)));- try {- if (!component.canCallListenerInterface(method))- {- // just return so that we have a silent fail and just re-render the- // page- log.info("component not enabled or visible; ignoring call. Component: " + component);- throw new ListenerInvocationNotAllowedException(this, component, null,- "Component rejected interface invocation");- }-- internalInvoke(component, component);- } finally {- HierarchicalContext.pop();- }- }-- /**- * Invokes a given interface on a component's behavior.- *- * @param rcomponent- * The component- * @param behavior- * @throws ListenerInvocationNotAllowedException- * when listener invocation attempted on a component that does not allow it- */- public final void invoke(final IRequestableComponent rcomponent, final Behavior behavior)- {- // we are in Wicket core land- final Component component = (Component)rcomponent;-- HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(component)));- try {- if (!behavior.canCallListenerInterface(component, method))- {- log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,- component);- throw new ListenerInvocationNotAllowedException(this, component, behavior,- "Behavior rejected interface invocation. ");- }-- internalInvoke(component, behavior);- } finally {- HierarchicalContext.pop();- }- }-- private void internalInvoke(final Component component, final Object target)- {- // save a reference to the page because the component can be removed- // during the invocation of the listener and thus lose its parent- Page page = component.getPage();-- // initialization is required for stateless pages- if (!page.isInitialized())- {- page.internalInitialize();- }-- try- {- method.invoke(target);- }- catch (InvocationTargetException e)- {- if (e.getTargetException() instanceof ReplaceHandlerException ||- e.getTargetException() instanceof AuthorizationException ||- e.getTargetException() instanceof WicketRuntimeException)- {- throw (RuntimeException)e.getTargetException();- }- throw new WicketRuntimeException("Method " + method.getName() + " of " +- method.getDeclaringClass() + " targeted at " + target + " on component " +- component + " threw an exception", e);- }- catch (Exception e)- {- throw new WicketRuntimeException("Method " + method.getName() + " of " +- method.getDeclaringClass() + " targeted at " + target + " on component " +- component + " threw an exception", e);- }- }-- /**- * Method to call to register this interface for use- */- public void register()- {- // Register this listener interface- registerRequestListenerInterface(this);- }-- /**- * @see java.lang.Object#toString()- */- @Override- public String toString()- {- return "[RequestListenerInterface name=" + name + ", method=" + method + "]";- }--- /**- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.- * <p>- * In previous versions of Wicket, request listeners were manually registered by calling this- * method. Now there is a first class RequestListenerInterface object which should be- * constructed as a constant member of the interface to enable automatic interface registration.- * <p>- * Adds a request listener interface to the map of interfaces that can be invoked by outsiders.- *- * @param requestListenerInterface- * The request listener interface object- */- private void registerRequestListenerInterface(final RequestListenerInterface requestListenerInterface)- {- // Check that a different interface method with the same name has not- // already been registered- final RequestListenerInterface existingInterface = RequestListenerInterface.forName(requestListenerInterface.getName());- if (existingInterface != null)- {- if (existingInterface.getMethod().equals(requestListenerInterface.getMethod()) == false)- {- throw new IllegalStateException("Cannot register listener interface " +- requestListenerInterface +- " because it conflicts with the already registered interface " + existingInterface);- }- }- else- {- // Save this interface method by the non-qualified class name- interfaces.put(requestListenerInterface.getName(), requestListenerInterface);-- log.info("registered listener interface " + this);- }- }-- /**- *- * @return collection of all registered interfaces- */- public static Collection<RequestListenerInterface> getRegisteredInterfaces()- {- return Collections.unmodifiableCollection(interfaces.values());- }---}diff --git a/server-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java b/server-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.javaindex 0a3edfb021..69c259e26e 100644--- a/server-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java+++ b/server-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java@@ -26,6 +26,7 @@ import java.util.Map;import org.apache.wicket.core.request.handler.PageProvider;import org.apache.wicket.core.request.handler.RenderPageRequestHandler;import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;+import org.apache.wicket.core.request.mapper.MapperUtils;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.IWritableRequestParameters;@@ -112,6 +113,23 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExceptreturn postParameters;}+ /**+ * Replace the session during login while retaining only the intercepted request.+ * Wicket 10 clears session metadata during replacement. Keeping this entry+ * allows login to resume without retaining unrelated metadata or skipping+ * session destruction listeners and application-specific session cleanup.+ */+ public static void replaceSessionPreservingOriginalDestination()+ {+ Session session = Session.get();+ InterceptData data = InterceptData.get();+ session.replaceSession();+ if (data != null)+ {+ session.setMetaData(InterceptData.key, data);+ }+ }+/*** INTERNAL CLASS, DO NOT USE*@@ -189,7 +207,7 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept}}- private static final MetaDataKey<InterceptData> key = new MetaDataKey<InterceptData>()+ private static final MetaDataKey<InterceptData> key = new MetaDataKey<>(){private static final long serialVersionUID = 1L;};@@ -202,8 +220,13 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept{String url = RequestCycle.get().getUrlRenderer().renderUrl(data.originalUrl);Url parsedUrl = Url.parse(url);- // Fix issue ##1301- parsedUrl.getQueryParameters().removeIf(it -> it.getName().contains(".IBehaviorListener."));+ // Do not replay an expired Ajax callback after login (#1301). Wicket 10+ // encodes the behavior id numerically instead of naming IBehaviorListener.+ parsedUrl.getQueryParameters().removeIf(parameter -> {+ var info = MapperUtils.parsePageComponentInfoParameter(parameter);+ return info != null && info.getComponentInfo() != null+ && info.getComponentInfo().getBehaviorId() != null;+ });throw new NonResettingRestartException(parsedUrl.toString());}}diff --git a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex bc3a57e253..96dedd5c1c 100644--- a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -64,7 +64,7 @@ public abstract class AbstractClassResolver implements IClassResolverelse if (className.equals(FieldUtils.FIELD_BEAN_CLASS_NAME_WITH_DEFAULT_VALUE))return FieldUtils.getFieldBeanClass(true);- Class<?> clazz = ParamUtils.loadBeanClass(className);+ Class<?> clazz = ParamUtils.loadParamBeanClass(className);if (clazz != null)return clazz;diff --git a/server-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java b/server-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.javanew file mode 100644index 0000000000..f4bcdda5d8--- /dev/null+++ b/server-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java@@ -0,0 +1,334 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.wicket.core.request.handler;++import io.onedev.server.util.ComponentHierarchical;+import io.onedev.server.util.HierarchicalContext;++import org.apache.wicket.Component;+import org.apache.wicket.IRequestListener;+import org.apache.wicket.Page;+import org.apache.wicket.WicketRuntimeException;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;+import org.apache.wicket.core.request.handler.logger.ListenerLogData;+import org.apache.wicket.request.ILoggableRequestHandler;+import org.apache.wicket.request.IRequestCycle;+import org.apache.wicket.request.component.IRequestableComponent;+import org.apache.wicket.request.component.IRequestablePage;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.lang.Args;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++/**+ * Request handler that invokes an {@link IRequestListener} on component or behavior and renders page afterwards.+ *+ * @author Matej Knopp+ */+public class ListenerRequestHandler+ implements+ IPageRequestHandler,+ IComponentRequestHandler,+ ILoggableRequestHandler+{++ private static final Logger LOG = LoggerFactory.getLogger(ListenerRequestHandler.class);++ private final IPageAndComponentProvider pageComponentProvider;++ private final Integer behaviorId;++ private ListenerLogData logData;++ /**+ * Construct.+ *+ * @param pageComponentProvider+ * @param behaviorIndex+ */+ public ListenerRequestHandler(IPageAndComponentProvider pageComponentProvider, Integer behaviorIndex)+ {+ Args.notNull(pageComponentProvider, "pageComponentProvider");++ this.pageComponentProvider = pageComponentProvider;+ behaviorId = behaviorIndex;+ }++ /**+ * Construct.+ *+ * @param pageComponentProvider+ */+ public ListenerRequestHandler(PageAndComponentProvider pageComponentProvider)+ {+ this(pageComponentProvider, null);+ }++ public boolean includeRenderCount()+ {+ if (behaviorId == null)+ {+ return ((IRequestListener)getComponent()).rendersPage();+ }+ else+ {+ return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex()))+ .rendersPage();+ }+ }++ @Override+ public IRequestableComponent getComponent()+ {+ return pageComponentProvider.getComponent();+ }++ @Override+ public IRequestablePage getPage()+ {+ return pageComponentProvider.getPageInstance();+ }++ @Override+ public Class<? extends IRequestablePage> getPageClass()+ {+ return pageComponentProvider.getPageClass();+ }++ @Override+ public Integer getPageId()+ {+ return pageComponentProvider.getPageId();+ }++ @Override+ public PageParameters getPageParameters()+ {+ return pageComponentProvider.getPageParameters();+ }++ @Override+ public void detach(IRequestCycle requestCycle)+ {+ if (logData == null)+ {+ logData = new ListenerLogData(pageComponentProvider, behaviorId);+ }+ pageComponentProvider.detach();+ }++ /**+ * Index of target behavior or <code>null</code> if component is the target.+ *+ * @return behavior index or <code>null</code>+ */+ public Integer getBehaviorIndex()+ {+ return behaviorId;+ }++ @Override+ public void respond(final IRequestCycle requestCycle)+ {+ final IRequestablePage page = getPage();+ final boolean freshPage = pageComponentProvider.doesProvideNewPage();+ final boolean isAjax = ((WebRequest)requestCycle.getRequest()).isAjax();++ IRequestableComponent component;+ try+ {+ component = getComponent();+ }+ catch (ComponentNotFoundException e)+ {+ // either the page is stateless and the component we are looking for is not added in the+ // constructor+ // or the page is stateful+stale and a new instances was created by pageprovider+ // we denote this by setting component to null+ component = null;+ }++ if ((component == null && !freshPage) || (component != null && component.getPage() != page))+ {+ throw new ComponentNotFoundException("Component '" + getComponentPath()+ + "' has been removed from page.");+ }++ RedirectPolicy policy = page.isPageStateless()+ ? RedirectPolicy.NEVER_REDIRECT+ : RedirectPolicy.AUTO_REDIRECT;++ boolean blockIfExpired = component != null && !component.canCallListenerAfterExpiry();++ boolean lateComponent = component == null && freshPage;++ if ((pageComponentProvider.wasExpired() && blockIfExpired) || lateComponent)+ {+ // A request listener is invoked on an expired page or the component couldn't be+ // determined. The best we can do is to re-paint the newly constructed page.+ // Reference: WICKET-4454, WICKET-6288++ if (LOG.isDebugEnabled())+ {+ LOG.debug(+ "An IRequestListener was called but its page/component({}) couldn't be resolved. "+ + "Scheduling re-create of the page and ignoring the listener interface...",+ getComponentPath());+ }++ if (isAjax)+ {+ policy = RedirectPolicy.ALWAYS_REDIRECT;+ }++ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(+ new PageProvider(page), policy));+ return;+ }++ invokeListener(requestCycle, policy, isAjax);+ }++ private void invokeListener(IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax)+ {+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical((Component) getComponent())));+ try {+ if (getBehaviorIndex() == null)+ {+ invoke(requestCycle, policy, ajax, getComponent());+ }+ else+ {+ final Behavior behavior;+ try+ {+ behavior = getComponent().getBehaviorById(behaviorId);+ }+ catch (IndexOutOfBoundsException e)+ {+ throw new WicketRuntimeException("Couldn't find component behavior.", e);+ }+ invoke(requestCycle, policy, ajax, getComponent(), behavior);+ }+ } finally {+ HierarchicalContext.pop();+ }+ }++ /**+ * Invokes a given interface on a component.+ *+ * @param rcomponent+ * The component+ *+ * @throws ListenerInvocationNotAllowedException+ * when listener invocation attempted on a component that does not allow it+ */+ private final void invoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final IRequestableComponent rcomponent)+ {+ // we are in Wicket core land+ final Component component = (Component)rcomponent;++ if (!component.canCallListener())+ {+ // just return so that we have a silent fail and just re-render the+ // page+ LOG.info("component not enabled or visible; ignoring call. Component: " + component);+ throw new ListenerInvocationNotAllowedException(component, null,+ "Component rejected interface invocation");+ }++ internalInvoke(requestCycle, policy, ajax, component, component);+ }++ /**+ * Invokes a given interface on a component's behavior.+ *+ * @param rcomponent+ * The component+ * @param behavior+ * @throws ListenerInvocationNotAllowedException+ * when listener invocation attempted on a component that does not allow it+ */+ private final void invoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final IRequestableComponent rcomponent, final Behavior behavior)+ {+ // we are in Wicket core land+ final Component component = (Component)rcomponent;++ if (!behavior.canCallListener(component))+ {+ LOG.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,+ component);+ throw new ListenerInvocationNotAllowedException(component, behavior,+ "Behavior rejected interface invocation. ");+ }++ internalInvoke(requestCycle, policy, ajax, component, behavior);+ }++ private void internalInvoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final Component component, final Object target)+ {+ // save a reference to the page because the component can be removed+ // during the invocation of the listener and thus lose its parent+ Page page = component.getPage();++ // initialization is required for stateless pages+ if (!page.isInitialized())+ {+ page.internalInitialize();+ }++ IRequestListener requestListener = (IRequestListener)target;++ if (requestListener.rendersPage() && !ajax)+ {+ // schedule page render after current request handler is done. this can be+ // overridden during invocation of listener+ // method (i.e. by calling RequestCycle#setResponsePage)+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(+ new PageProvider(page), policy));+ }++ requestListener.onRequest();+ }++ @Override+ public final boolean isPageInstanceCreated()+ {+ return pageComponentProvider.hasPageInstance();+ }++ @Override+ public final String getComponentPath()+ {+ return pageComponentProvider.getComponentPath();+ }++ @Override+ public final Integer getRenderCount()+ {+ return pageComponentProvider.getRenderCount();+ }++ @Override+ public ListenerLogData getLogData()+ {+ return logData;+ }+}diff --git a/server-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/server-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.javaindex cbe2949cb4..32970a4cdc 100644--- a/server-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java+++ b/server-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java@@ -18,8 +18,10 @@ package org.apache.wicket.core.request.mapper;import java.util.List;import java.util.Map;-import java.util.StringTokenizer;+import java.util.Locale;import java.util.concurrent.ConcurrentHashMap;+import java.util.StringTokenizer;+import java.util.function.Supplier;import org.apache.wicket.core.util.lang.WicketObjects;import org.apache.wicket.request.IRequestHandler;@@ -28,16 +30,12 @@ import org.apache.wicket.request.Url;import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.IResource;-import org.apache.wicket.request.resource.MetaInfStaticResourceReference;-import org.apache.wicket.request.resource.ResourceReference;-import org.apache.wicket.request.resource.ResourceReferenceRegistry;+import org.apache.wicket.request.resource.*;import org.apache.wicket.request.resource.caching.IResourceCachingStrategy;import org.apache.wicket.request.resource.caching.IStaticCacheableResource;import org.apache.wicket.request.resource.caching.ResourceUrl;import org.apache.wicket.resource.ResourceUtil;import org.apache.wicket.resource.bundles.ResourceBundleReference;-import org.apache.wicket.util.IProvider;import org.apache.wicket.util.lang.Args;import org.apache.wicket.util.lang.Checks;import org.apache.wicket.util.string.Strings;@@ -61,12 +59,12 @@ import org.apache.wicket.util.string.Strings;*/public class BasicResourceReferenceMapper extends AbstractResourceReferenceMapper{+ private static final Map<String, String> classNames = new ConcurrentHashMap<>();+protected final IPageParametersEncoder pageParametersEncoder;/** resource caching strategy */- protected final IProvider<? extends IResourceCachingStrategy> cachingStrategy;-- private static Map<String, String> classNames = new ConcurrentHashMap<>();+ protected final Supplier<? extends IResourceCachingStrategy> cachingStrategy;/*** Construct.@@ -75,7 +73,7 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe* @param cachingStrategy*/public BasicResourceReferenceMapper(IPageParametersEncoder pageParametersEncoder,- IProvider<? extends IResourceCachingStrategy> cachingStrategy)+ Supplier<? extends IResourceCachingStrategy> cachingStrategy){this.pageParametersEncoder = Args.notNull(pageParametersEncoder, "pageParametersEncoder");this.cachingStrategy = cachingStrategy;@@ -93,11 +91,13 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe// extract the PageParameters from URL if there are anyPageParameters pageParameters = extractPageParameters(request, segmentsSize,pageParametersEncoder);+ if (pageParameters != null)+ {+ pageParameters.setLocale(resolveLocale());+ }String normalizedClassName = url.getSegments().get(2);- String className = classNames.get(normalizedClassName);- if (className == null)- className = normalizedClassName;+ String className = classNames.getOrDefault(normalizedClassName, normalizedClassName);StringBuilder name = new StringBuilder(segmentsSize * 2);for (int i = 3; i < segmentsSize; ++i)@@ -134,9 +134,17 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappeif (scope != null && scope.getPackage() != null){+ ResourceReference.UrlAttributes sanitized = attributes.sanitize(scope, name.toString());+ boolean createIfNotFound = false;+ if (sanitized != null)+ {+ attributes = sanitized;+ createIfNotFound = true;+ }+ResourceReference res = getContext().getResourceReferenceRegistry().getResourceReference(scope, name.toString(), attributes.getLocale(),- attributes.getStyle(), attributes.getVariation(), true, true);+ attributes.getStyle(), attributes.getVariation(), true, createIfNotFound);if (res != null){@@ -200,30 +208,15 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappeList<String> segments = url.getSegments();segments.add(getContext().getNamespace());segments.add(getContext().getResourceIdentifier());-String className = getClassName(reference.getScope());-- /*- * Avoid using mixed case in url as some agents will convert url to lower case- */- String normalizedClassName = className.toLowerCase();+ String normalizedClassName = className.toLowerCase(Locale.ROOT);classNames.put(normalizedClassName, className);segments.add(normalizedClassName);// setup resource parameters- PageParameters parameters = referenceRequestHandler.getPageParameters();-- if (parameters == null)- {- parameters = new PageParameters();- }- else- {- parameters = new PageParameters(parameters);-- // need to remove indexed parameters otherwise the URL won't be able to decode- parameters.clearIndexed();- }+ PageParameters parameters = new PageParameters(referenceRequestHandler.getPageParameters());+ // need to remove indexed parameters otherwise the URL won't be able to decode+ parameters.clearIndexed();ResourceUtil.encodeResourceReferenceAttributes(url, reference);diff --git a/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java b/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.javaindex bca39e2697..c486faf136 100644--- a/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java+++ b/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java@@ -19,6 +19,8 @@ package org.apache.wicket.extensions.ajax.markup.html.autocomplete;import java.util.Iterator;import org.apache.wicket.Application;+import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;import org.apache.wicket.request.IRequestCycle;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.cycle.RequestCycle;@@ -88,6 +90,13 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavithis.renderer = Args.notNull(renderer, "renderer");}+ @Override+ protected void onBind() {+ super.onBind();++ getComponent().add(new AttributeModifier("aria-autocomplete", "list"));+ }+@Overrideprotected final void onRequest(final String val, final RequestCycle requestCycle){@@ -122,11 +131,6 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehaviHierarchicalContext.pop();}}-- @Override- public void detach(final IRequestCycle requestCycle)- {- }};requestCycle.scheduleRequestHandlerAfterCurrent(target);@@ -142,4 +146,10 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavi* @return iterator over all possible choice objects*/protected abstract Iterator<T> getChoices(String input);-}\ No newline at end of file++ @Override+ public void detach(Component component)+ {+ renderer.detach();+ }+}diff --git a/server-core/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java b/server-core/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.javaindex 392c941e10..cf60fd7f6f 100644--- a/server-core/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java+++ b/server-core/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java@@ -17,10 +17,10 @@package org.apache.wicket.extensions.markup.html.repeater.data.table;import org.apache.wicket.AttributeModifier;-import org.apache.wicket.markup.html.WebComponent;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;/*** Toolbar that displays links used to navigate the pages of the datatable as well as a message@@ -54,16 +54,7 @@ public class NavigationToolbar extends AbstractToolbar};add(span);- span.add(AttributeModifier.replace("colspan", new AbstractReadOnlyModel<String>()- {- private static final long serialVersionUID = 1L;-- @Override- public String getObject()- {- return String.valueOf(table.getColumns().size()).intern();- }- }));+ span.add(AttributeModifier.replace("colspan", (IModel<String>) () -> String.valueOf(table.getColumns().size()).intern()));}@@ -83,16 +74,16 @@ public class NavigationToolbar extends AbstractToolbar}/**- * Factory method used to create the navigator label that will be used by the datatable+ * Factory method used to create the navigator label.** @param navigatorId* component id navigator label should be created with* @param table- * dataview used by datatable+ * DataTable used by datatable* @return navigator label that will be used to navigate the data table**/- protected WebComponent newNavigatorLabel(final String navigatorId, final DataTable<?, ?> table)+ protected Component newNavigatorLabel(final String navigatorId, final DataTable<?, ?> table){return new NavigatorLabel(navigatorId, table);}diff --git a/server-core/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java b/server-core/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.javaindex 1ca69a8054..bd77d8957f 100644--- a/server-core/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java+++ b/server-core/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java@@ -57,7 +57,7 @@ class GuiceProxyTargetLocator implements IProxyTargetLocator}@Override- public Object locateProxyTarget()+ public <T> T locateProxyTarget(){Injector injector = getInjector();@@ -81,8 +81,10 @@ class GuiceProxyTargetLocator implements IProxyTargetLocatorreturn null;}}-- return injector.getInstance(key);++ // Resolve the declared field type and check the injected instance at the reflection boundary.+ Class<T> targetClass = WicketObjects.resolveClass(key.getTypeLiteral().getRawType().getName());+ return targetClass.cast(injector.getInstance(key));}private Key<?> newGuiceKey()diff --git a/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.javaindex b1671933f9..c51ed89c3c 100644--- a/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java+++ b/server-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java@@ -29,7 +29,6 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Set;-import javax.servlet.http.HttpServletRequest;import org.apache.wicket.Application;import org.apache.wicket.Component;@@ -39,15 +38,15 @@ import org.apache.wicket.Localizer;import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.core.util.lang.WicketObjects;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.form.AutoLabelResolver.AutoLabelMarker;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.IObjectClassAwareModel;import org.apache.wicket.model.IPropertyReflectionAwareModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.Request;-import org.apache.wicket.request.parameter.EmptyRequestParameters;import org.apache.wicket.util.convert.ConversionException;import org.apache.wicket.util.convert.IConverter;import org.apache.wicket.util.lang.Args;@@ -105,7 +104,7 @@ import org.slf4j.LoggerFactory;**/public abstract class FormComponent<T> extends LabeledWebMarkupContainer implements- IFormVisitorParticipant, IFormModelUpdateListener, IGenericComponent<T>+ IFormVisitorParticipant, IFormModelUpdateListener, IGenericComponent<T, FormComponent<T>>{private static final Logger logger = LoggerFactory.getLogger(FormComponent.class);@@ -118,18 +117,15 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme{private final Set<String> triedKeys = new LinkedHashSet<>();- /**- * @see org.apache.wicket.validation.IErrorMessageSource#getMessage(String, java.util.Map)- */@Overridepublic String getMessage(String key, Map<String, Object> vars){final FormComponent<T> formComponent = FormComponent.this;- // Use the following log4j config for detailed logging on the property resolution- // process- // log4j.logger.org.apache.wicket.resource.loader=DEBUG- // log4j.logger.org.apache.wicket.Localizer=DEBUG+ // Use the following slf4j-simple config for detailed logging+ // on the property resolution process+ // org.slf4j.simpleLogger.log.org.apache.wicket.resource.loader=DEBUG+ // org.slf4j.simpleLogger.log.org.apache.wicket.Localizer=DEBUGfinal Localizer localizer = formComponent.getLocalizer();@@ -305,6 +301,13 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme}}+ @Override+ protected void onBeforeRender()+ {+ // WICKET-7101 update related auto-label+ getRequestCycle().find(IPartialPageRequestHandler.class).ifPresent(handler -> updateAutoLabels(handler, true));+ super.onBeforeRender();+ }/*** Adapter that makes this component appear as {@link IValidatable}@@ -544,14 +547,13 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme* @see #add(IValidator)* @return form component for chaining*/- @SuppressWarnings("unlikely-arg-type")public final FormComponent<T> remove(final IValidator<? super T> validator){Args.notNull(validator, "validator");Behavior match = null;for (Behavior behavior : getBehaviors()){- if (behavior.equals(validator))+ if (validator instanceof Behavior validatorBehavior && behavior.equals(validatorBehavior)){match = behavior;break;@@ -589,6 +591,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme* if validator is null* @see IValidator*/+ // The varargs array is only iterated; it is never modified or retained.@SafeVarargspublic final FormComponent<T> add(final IValidator<? super T>... validators){@@ -642,7 +645,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme/*** Clears the user input.*/- public final void clearInput()+ public void clearInput(){rawInput = NO_RAW_INPUT;}@@ -776,12 +779,12 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme{if (values != null && values.length == 1 && values[0] == null){- // we the key got passed in (otherwise values would be null),+ // the key got passed in (otherwise values would be null),// but the value was set to null.// As the servlet spec isn't clear on what to do with 'empty'// request values - most return an empty string, but some null -// we have to workaround here and deliberately set to an empty- // string if the the component is not nullable (text components)+ // string if the component is not nullable (text components)return EMPTY_STRING_ARRAY;}}@@ -799,37 +802,11 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme*/protected List<StringValue> getParameterValues(String inputName){- String method = Form.METHOD_POST;- final Request request = getRequest();- if (getRequest().getContainerRequest() instanceof HttpServletRequest)- {- method = ((HttpServletRequest)getRequest().getContainerRequest()).getMethod();- }- else- {- final Form<?> form = findParent(Form.class);- if (form != null)- {- method = form.getMethod();- }- }-- final IRequestParameters parameters;- switch (method.toLowerCase(Locale.ROOT))- {- case Form.METHOD_POST:- parameters = request.getPostParameters();- break;- case Form.METHOD_GET:- parameters = request.getQueryParameters();- break;- default:- parameters = EmptyRequestParameters.INSTANCE;- }+ final IRequestParameters parameters = Form.getRequestParameters(this);return parameters.getParameterValues(inputName);}-+/*** Gets the string to be used for the <tt>name</tt> attribute of the form element. Generated* using the path from the form to the component, excluding the form itself. Override it if you@@ -980,7 +957,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme* Gets whether this component's input can be null. By default, components that do not get input* will have null values passed in for input. However, component TextField is an example* (possibly the only one) that never gets a null passed in, even if the field is left empty- * UNLESS it had attribute <code>disabled="disabled"</code> set.+ * UNLESS it has attribute <code>disabled="disabled"</code> set.** @return True if this component's input can be null. Returns true by default.*/@@ -1079,6 +1056,8 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme}/**+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!+ ** Sets the value for a form component.** @param value@@ -1101,7 +1080,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemeif (!required && getType() != null && getType().isPrimitive()){throw new WicketRuntimeException(- "FormComponent has to be required when the type is primitive class: " + this);+ "FormComponent has to be required when the type is primitive class: " + this);}if (required != isRequired()){@@ -1425,7 +1404,6 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme* Tag to modify* @see org.apache.wicket.Component#onComponentTag(ComponentTag)*/- @SuppressWarnings("deprecation")@Overrideprotected void onComponentTag(final ComponentTag tag){@@ -1436,11 +1414,6 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemeonDisabled(tag);}- if (isRequired())- {- onRequired(tag);- }-super.onComponentTag(tag);}@@ -1453,7 +1426,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemeprotected void onDetach(){super.onDetach();-// convertedInput = null;+ // Keep converted input when the component is serialized between requests.}/**@@ -1469,17 +1442,6 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemetag.put("disabled", "disabled");}- /**- * Called by {@link #onComponentTag(ComponentTag)} when the component is required.- *- * @param tag- * the tag that is being rendered- */- @Deprecated- protected void onRequired(final ComponentTag tag)- {- }-/*** Handle invalidation*/@@ -1605,39 +1567,14 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemereturn new ValidatableAdapter();}- @Override- @SuppressWarnings("unchecked")- public final IModel<T> getModel()- {- return (IModel<T>)getDefaultModel();- }-- @Override- public final void setModel(IModel<T> model)- {- setDefaultModel(model);- }-- @SuppressWarnings("unchecked")- @Override- public final T getModelObject()- {- return (T)getDefaultModelObject();- }-- @Override- public final void setModelObject(T object)- {- setDefaultModelObject(object);- }-/*** Updates auto label css classes such as error/required during ajax updates when the labels may* not be directly repainted in the response.*- * @param target+ * @param target The {@link IPartialPageRequestHandler}+ * @param checkAuto if true then we check is the related auto-label is marked as auto before updating it.*/- public final void updateAutoLabels(AjaxRequestTarget target)+ public final void updateAutoLabels(IPartialPageRequestHandler target, boolean checkAuto){AutoLabelMarker marker = getMetaData(AutoLabelResolver.MARKER_KEY);@@ -1647,15 +1584,64 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemereturn;}+ if (checkAuto)+ {+ if (!marker.isAuto())+ {+ return;+ }+ marker.updateFrom(this, target);+ return;+ }+marker.updateFrom(this, target);}++ /**+ * @deprecated method in favor of the one receiving {@link IPartialPageRequestHandler}+ */+ @Deprecated(since = "9.17.0, 10.0.0", forRemoval = true)+ public final void updateAutoLabels(AjaxRequestTarget target)+ {+ updateAutoLabels(target, false);+ }++ /**+ * @return if this form component is visited during the form processing+ */+ public boolean isFormParticipant()+ {+ Component parent = getParent();+ boolean outsideParentForm = false;+ while (parent != null)+ {+ if (parent instanceof IFormVisitorParticipant && !((IFormVisitorParticipant)parent).processChildren() && !outsideParentForm)+ {+ return false;+ }+ if (parent instanceof Form form)+ {+ if (!form.wantSubmitOnParentFormSubmit())+ {+ return false;+ }+ if (form == this.getForm())+ {+ outsideParentForm = true;+ }+ }+ parent = parent.getParent();+ }+ return true;+ }+/*** Update the model of a {@link FormComponent} containing a {@link Collection}.*- * If the model object does not yet exists, a new {@link ArrayList} is filled with the converted+ * If the model object does not yet exists, a new suitable collection is filled with the converted* input and used as the new model object. Otherwise the existing collection is modified- * in-place, then {@link Model#setObject(Object)} is called with the same instance: it allows+ * in-place, then {@link IModel#setObject(Object)} is called with the same instance: it allows* the Model to be notified of changes even when {@link Model#getObject()} returns a different* {@link Collection} at every invocation.*@@ -1677,7 +1663,14 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemeCollection<S> collection = formComponent.getModelObject();if (collection == null){- collection = new ArrayList<>(convertedInput);+ Class<?> hint = null;+ if (formComponent.getModel() instanceof IObjectClassAwareModel) {+ hint = ((IObjectClassAwareModel<?>)formComponent.getModel()).getObjectClass();+ }+ if (hint == null) {+ hint = List.class;+ }+ collection = newCollection(hint, convertedInput);formComponent.setModelObject(collection);}else@@ -1699,7 +1692,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemelogger.debug("An error occurred while trying to modify the collection attached to "+ formComponent, unmodifiable);}- collection = new ArrayList<>(convertedInput);+ collection = newCollection(collection.getClass(), convertedInput);}try@@ -1723,4 +1716,21 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemeformComponent.modelChanged();}}++ /**+ * Creates a new collection.+ *+ * @param hint type deciding the type of the returned collection+ * @param elements elements for the new collection+ * @return collection+ * @throws IllegalArgumentException if type is not supported+ */+ private static <S> Collection<S> newCollection(Class<?> hint, Collection<S> elements)+ {+ if (Set.class.isAssignableFrom(hint)) {+ return new LinkedHashSet<>(elements);+ } else {+ return new ArrayList<>(elements);+ }+ }}diff --git a/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.java b/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.javadeleted file mode 100644index 775255936a..0000000000--- a/server-core/src/main/java/org/apache/wicket/page/PageStoreManager.java+++ /dev/null@@ -1,335 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.wicket.page;--import java.io.Serializable;-import java.util.List;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.ConcurrentMap;--import javax.servlet.http.HttpSessionBindingEvent;-import javax.servlet.http.HttpSessionBindingListener;--import org.apache.wicket.pageStore.IPageStore;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--/**- *- */-public class PageStoreManager extends AbstractPageManager-{- private static final Logger logger = LoggerFactory.getLogger(PageStoreManager.class);-- /**- * A cache that holds all registered page managers. <br/>- * applicationName -> page manager- */- private static final ConcurrentMap<String, PageStoreManager> MANAGERS = new ConcurrentHashMap<>();-- private static final String ATTRIBUTE_NAME = "wicket:persistentPageManagerData";-- /**- * A flag indicating whether this session entry is being re-set in the Session.- * <p>- * Web containers intercept- * {@link javax.servlet.http.HttpSession#setAttribute(String, Object)} to detect changes and- * replicate the session. If the attribute has been already bound in the session then- * {@link SessionEntry#valueUnbound(HttpSessionBindingEvent)} might get called - this flag- * helps us to ignore the invocation in that case.- *- * @see SessionEntry#valueUnbound(HttpSessionBindingEvent)- */- private static final ThreadLocal<Boolean> STORING_TOUCHED_PAGES = new ThreadLocal<Boolean>()- {- protected Boolean initialValue()- {- return Boolean.FALSE;- };- };-- private final IPageStore pageStore;-- private final String applicationName;-- /**- * Construct.- *- * @param applicationName- * @param pageStore- * @param context- */- public PageStoreManager(final String applicationName, final IPageStore pageStore,- final IPageManagerContext context)- {- super(context);-- this.applicationName = applicationName;- this.pageStore = pageStore;-- if (MANAGERS.containsKey(applicationName))- {- throw new IllegalStateException(- "Manager for application with key '" + applicationName + "' already exists.");- }- MANAGERS.put(applicationName, this);- }-- /**- * Represents entry for single session. This is stored as session attribute and caches pages- * between requests.- *- * @author Matej Knopp- */- private static class SessionEntry implements Serializable, HttpSessionBindingListener- {- private static final long serialVersionUID = 1L;-- private final String applicationName;-- /**- * The id handed to the {@link IPageStore} to identify the session.- * <p>- * Note: If the container changes a session's id, this field remains unchanged on its- * initial value.- */- private final String sessionId;-- /**- * Construct.- *- * @param applicationName- * @param sessionId- */- public SessionEntry(String applicationName, String sessionId)- {- this.applicationName = applicationName;- this.sessionId = sessionId;- }-- /**- *- * @return page store- */- private IPageStore getPageStore()- {- PageStoreManager manager = MANAGERS.get(applicationName);-- if (manager == null)- {- return null;- }-- return manager.pageStore;- }-- /**- *- * @param id- * @return manageable page- */- public synchronized IManageablePage getPage(int id)- {- IManageablePage page = null;- final IPageStore pageStore = getPageStore();- if (pageStore != null)- {- page = pageStore.getPage(sessionId, id);- }- return page;- }-- /**- * set the list of pages to remember after the request- *- * @param pages- */- public synchronized void setSessionCache(final List<IManageablePage> pages)- {- }-- @Override- public void valueBound(HttpSessionBindingEvent event)- {- }-- @Override- public void valueUnbound(HttpSessionBindingEvent event)- {- if (STORING_TOUCHED_PAGES.get())- {- // triggered by #storeTouchedPages(), so do not remove the data- return;- }- clear();- }-- @Override- public boolean equals(Object o)- {- // see https://issues.apache.org/jira/browse/WICKET-5390- return false;- }-- public void clear()- {- // WICKET-5164 use the original sessionId- IPageStore store = getPageStore();- // store might be null if destroyed already- if (store != null)- {- store.unbind(sessionId);- }- }- }-- private String getAttributeName()- {- return ATTRIBUTE_NAME + " - " + applicationName;- }-- /**- * {@link RequestAdapter} for {@link PageStoreManager}- *- * @author Matej Knopp- */- protected class PersistentRequestAdapter extends RequestAdapter- {- /**- * Construct.- *- * @param context- */- public PersistentRequestAdapter(IPageManagerContext context)- {- super(context);- }-- @Override- protected IManageablePage getPage(int id)- {- IManageablePage touchedPage = findPage(id);- if (touchedPage != null)- {- return touchedPage;- }-- // try to get session entry for this session- SessionEntry entry = getSessionEntry(false);-- if (entry != null)- {- return entry.getPage(id);- }- else- {- return null;- }- }-- /**- *- * @param create- * @return Session Entry- */- private SessionEntry getSessionEntry(boolean create)- {- SessionEntry entry = (SessionEntry)getSessionAttribute(getAttributeName());- if (entry == null && create)- {- bind();- entry = new SessionEntry(applicationName, getSessionId());- }- return entry;- }-- @Override- protected void newSessionCreated()- {- // if the session is not temporary bind a session entry to it- if (getSessionId() != null)- {- getSessionEntry(true);- }- }-- @Override- protected void storeTouchedPages(final List<IManageablePage> touchedPages)- {- if (!touchedPages.isEmpty())- {- try {- SessionEntry entry = getSessionEntry(true);- entry.setSessionCache(touchedPages);- for (IManageablePage page : touchedPages)- {- // WICKET-5103 use the same sessionId as used in- // SessionEntry#getPage()- pageStore.storePage(entry.sessionId, page);- }-- STORING_TOUCHED_PAGES.set(true);- try- {- setSessionAttribute(getAttributeName(), entry);- }- finally- {- STORING_TOUCHED_PAGES.remove();- }- } catch (IllegalStateException e) {- if (e.getMessage().contains("Response is committed"))- logger.debug("Error storing touched pages", e);- else- throw e;- }- }- }- }-- @Override- protected RequestAdapter newRequestAdapter(IPageManagerContext context)- {- return new PersistentRequestAdapter(context);- }-- @Override- public boolean supportsVersioning()- {- return true;- }-- @Override- public void clear()- {- RequestAdapter requestAdapter = getRequestAdapter();- requestAdapter.clear();- String sessionEntryAttributeName = getAttributeName();- Serializable sessionEntry = requestAdapter.getSessionAttribute(sessionEntryAttributeName);- if (sessionEntry instanceof SessionEntry)- {- ((SessionEntry)sessionEntry).clear();- }- }-- @Override- public void destroy()- {- MANAGERS.remove(applicationName);- pageStore.destroy();- }-}diff --git a/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.java b/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.javadeleted file mode 100644index 7d44d1b65b..0000000000--- a/server-core/src/main/java/org/apache/wicket/page/RequestAdapter.java+++ /dev/null@@ -1,184 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.wicket.page;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--/**- * Request scoped helper class for {@link IPageManager}.- *- * @author Matej Knopp- */-public abstract class RequestAdapter-{- private final IPageManagerContext context;-- private final List<IManageablePage> touchedPages = new ArrayList<IManageablePage>();-- /**- * Construct.- *- * @param context- * The page manager context- */- public RequestAdapter(final IPageManagerContext context)- {- this.context = context;- }-- /**- * Returns the page with specified id. The page is then cached by {@link RequestAdapter} during- * the rest of request processing.- *- * @param id- * @return page instance or <code>null</code> if the page does not exist.- */- protected abstract IManageablePage getPage(int id);-- /**- * Store the list of stateful pages.- *- * @param touchedPages- */- protected abstract void storeTouchedPages(List<IManageablePage> touchedPages);-- /**- * Notification on new session being created.- */- protected abstract void newSessionCreated();-- /**- * Bind the session- *- * @see IPageManagerContext#bind()- */- protected void bind()- {- context.bind();- }-- /**- * @see IPageManagerContext#setSessionAttribute(String, Serializable)- *- * @param key- * @param value- */- public void setSessionAttribute(String key, Serializable value)- {- context.setSessionAttribute(key, value);- }-- /**- * @see IPageManagerContext#getSessionAttribute(String)- *- * @param key- * @return the session attribute- */- public Serializable getSessionAttribute(final String key)- {- return context.getSessionAttribute(key);- }-- /**- * @see IPageManagerContext#getSessionId()- *- * @return session id- */- public String getSessionId()- {- return context.getSessionId();- }-- /**- *- * @param id- * @return null, if not found- */- protected IManageablePage findPage(final int id)- {- for (IManageablePage page : touchedPages)- {- if (page.getPageId() == id)- {- return page;- }- }- return null;- }-- /**- * Touches a page, so it will be stored in the page stores- * at the end of the request cycle- *- * @param page The page to mark as dirty- */- protected void touch(final IManageablePage page)- {- if (findPage(page.getPageId()) == null)- {- touchedPages.add(page);- }- }-- /**- * @param page The page to unmark as dirty, so it won't be stored- * at the end of the request cycle- */- protected void untouch(final IManageablePage page)- {- Iterator<IManageablePage> iterator = touchedPages.iterator();- while (iterator.hasNext())- {- IManageablePage touchedPage = iterator.next();- if (touchedPage.getPageId() == page.getPageId())- {- iterator.remove();- break;- }- }- }-- /**- * Modified by Robin to remove the logic to check stateless page as otherwise Wicket reports error- * when a page containing "wicket:enclosure" is accessed anonymously and is redirected to signin page- */- protected void commitRequest()- {- // store pages that are not stateless- if (touchedPages.isEmpty() == false)- {- List<IManageablePage> statefulPages = new ArrayList<IManageablePage>(- touchedPages.size());- for (IManageablePage page : touchedPages)- {- statefulPages.add(page);- }-- if (statefulPages.isEmpty() == false)- {- storeTouchedPages(statefulPages);- }- }- }-- public void clear() {- touchedPages.clear();- }-}\ No newline at end of filediff --git a/server-core/src/main/java/org/apache/wicket/pageStore/RequestPageStore.java b/server-core/src/main/java/org/apache/wicket/pageStore/RequestPageStore.javanew file mode 100644index 0000000000..dacd8ab7da--- /dev/null+++ b/server-core/src/main/java/org/apache/wicket/pageStore/RequestPageStore.java@@ -0,0 +1,200 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.wicket.pageStore;++import java.util.ArrayList;+import java.util.LinkedList;++import org.apache.wicket.MetaDataKey;+import org.apache.wicket.page.IManageablePage;+import org.apache.wicket.request.cycle.RequestCycle;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++/**+ * Buffers storage of added pages until the end of the request, when they are delegated to the next store in+ * the identical order they where added.+ */+public class RequestPageStore extends DelegatingPageStore+{++ private static final Logger log = LoggerFactory.getLogger(RequestPageStore.class);++ private static final MetaDataKey<RequestData> KEY = new MetaDataKey<>()+ {+ private static final long serialVersionUID = 1L;+ };++ public RequestPageStore(IPageStore delegate)+ {+ super(delegate);+ }++ @Override+ public IManageablePage getPage(IPageContext context, int id)+ {+ IManageablePage page = getRequestData(context).get(id);+ if (page != null)+ {+ return page;+ }++ return getDelegate().getPage(context, id);+ }++ @Override+ public void addPage(IPageContext context, IManageablePage page)+ {+ getRequestData(context).add(page);+ }++ @Override+ public void removePage(IPageContext context, IManageablePage page)+ {+ getRequestData(context).remove(page);++ getDelegate().removePage(context, page);+ }++ @Override+ public void removeAllPages(IPageContext context)+ {+ getRequestData(context).removeAll();++ getDelegate().removeAllPages(context);+ }++ @Override+ public void revertPage(IPageContext context, IManageablePage page)+ {+ getRequestData(context).remove(page);++ getDelegate().revertPage(context, page);+ }++ @Override+ public void end(IPageContext context)+ {+ getDelegate().end(context);++ RequestData requestData = getRequestData(context);+ for (IManageablePage page : requestData.pages())+ {+ if (isPageStateless(page) == false)+ {+ // last opportunity to create a session+ try+ {+ context.getSessionId(true);+ }+ catch (IllegalStateException e)+ {+ handlePageStoreException(e);+ // Detach must not retry creating a session after response commitment.+ requestData.removeAll();+ }+ break;+ }+ }+ }++ @Override+ public void detach(IPageContext context)+ {+ RequestData requestData = getRequestData(context);+ try+ {+ for (IManageablePage page : requestData.pages())+ {+ if (isPageStateless(page) == false)+ {+ getDelegate().addPage(context, page);+ }+ }+ }+ catch (IllegalStateException e)+ {+ handlePageStoreException(e);+ }+ requestData.removeAll();++ getDelegate().detach(context);+ }++ private void handlePageStoreException(IllegalStateException exception)+ {+ // Preserve the former PageStoreManager's handling of late session creation.+ if (exception.getMessage() != null && exception.getMessage().contains("Response is committed"))+ log.debug("Error storing touched pages", exception);+ else+ throw exception;+ }++ private boolean isPageStateless(final IManageablePage page) {+ // Checking statelessness during an intercepted login request can evaluate+ // an uninitialized wicket:enclosure. Preserve OneDev's stateful page storage.+ return false;+ }++ private RequestData getRequestData(IPageContext context)+ {+ return context.getRequestData(KEY, RequestData::new);+ }++ /**+ * Data kept in the {@link RequestCycle}.+ */+ static class RequestData+ {+ private final LinkedList<IManageablePage> pages = new LinkedList<>();++ public void add(IManageablePage page)+ {+ // add as last+ pages.remove(page);+ pages.addLast(page);+ }++ public Iterable<IManageablePage> pages()+ {+ // must work on copy to prevent concurrent modification when page is re-added during detaching+ return new ArrayList<>(pages);+ }++ public IManageablePage get(int id)+ {+ for (IManageablePage page : pages)+ {+ if (page.getPageId() == id)+ {+ return page;+ }+ }+ return null;+ }++ public void remove(IManageablePage page)+ {+ pages.remove(page);+ }++ public void removeAll()+ {+ pages.clear();+ }+ }+}diff --git a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.javaindex 81fcbcda04..88f66285cb 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java@@ -17,18 +17,16 @@package org.apache.wicket.protocol.http.servlet;import java.io.IOException;--import javax.servlet.http.Cookie;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-+import java.time.Instant;+import jakarta.servlet.http.Cookie;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.request.Url;import org.apache.wicket.request.UrlRenderer;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.util.lang.Args;-import org.apache.wicket.util.time.Time;/*** WebResponse that wraps a {@link ServletWebResponse}.@@ -84,10 +82,16 @@ public class ServletWebResponse extends WebResponse}@Override- public void setDateHeader(String name, Time date)+ public void setDateHeader(String name, Instant date){Args.notNull(date, "date");- httpServletResponse.setDateHeader(name, date.getMilliseconds());+ httpServletResponse.setDateHeader(name, date.toEpochMilli());+ }++ @Override+ public boolean isHeaderSupported()+ {+ return !httpServletResponse.isCommitted();}@Overridediff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.javaindex 11d92dd316..977a4d887f 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java@@ -16,10 +16,12 @@*/package org.apache.wicket.protocol.ws.api;+import jakarta.servlet.http.HttpServletRequest;import java.io.IOException;--import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpSession;+import io.onedev.server.OneDev;+import io.onedev.server.web.websocket.WebSocketMessages;+import io.onedev.server.web.websocket.WebSocketService;+import jakarta.servlet.http.HttpSession;import org.apache.wicket.Application;import org.apache.wicket.MarkupContainer;@@ -36,6 +38,7 @@ import org.apache.wicket.protocol.ws.api.event.WebSocketAbortedPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketBinaryPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketClosedPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketConnectedPayload;+import org.apache.wicket.protocol.ws.api.event.WebSocketErrorPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketPushPayload;import org.apache.wicket.protocol.ws.api.event.WebSocketTextPayload;@@ -51,9 +54,10 @@ import org.apache.wicket.protocol.ws.api.registry.IKey;import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;import org.apache.wicket.protocol.ws.api.registry.PageIdKey;import org.apache.wicket.protocol.ws.api.registry.ResourceNameKey;+import org.apache.wicket.protocol.ws.api.registry.ResourceNameTokenKey;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.cycle.RequestCycleContext;import org.apache.wicket.request.http.WebRequest;@@ -67,10 +71,6 @@ import org.apache.wicket.util.string.Strings;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.OneDev;-import io.onedev.server.web.websocket.WebSocketMessages;-import io.onedev.server.web.websocket.WebSocketService;-/*** The base implementation of IWebSocketProcessor. Provides the common logic* for registering a web socket connection and broadcasting its events.@@ -88,7 +88,9 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorprivate final WebRequest webRequest;private final int pageId;+ private final String context;private final String resourceName;+ private final String connectionToken;private final Url baseUrl;private final WebApplication application;private final String sessionId;@@ -101,7 +103,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor* Constructor.** @param request- * the http request that was used to create the TomcatWebSocketProcessor+ * the http request that was used to create this {@link IWebSocketProcessor}* @param application* the current Wicket Application*/@@ -114,9 +116,10 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor"able to find the stored page to update its components");}this.sessionId = httpSession.getId();-String pageId = request.getParameter("pageId");- resourceName = request.getParameter("resourceName");+ this.context = request.getParameter("context");+ this.resourceName = request.getParameter("resourceName");+ this.connectionToken = request.getParameter("connectionToken");if (Strings.isEmpty(pageId) && Strings.isEmpty(resourceName)){throw new IllegalArgumentException("The request should have either 'pageId' or 'resourceName' parameter!");@@ -151,13 +154,13 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor@Overridepublic void onMessage(final String message){- broadcastMessage(new TextMessage(message));+ broadcastMessage(new TextMessage(getApplication(), getSessionId(), getRegistryKey(), message));}@Overridepublic void onMessage(byte[] data, int offset, int length){- BinaryMessage binaryMessage = new BinaryMessage(data, offset, length);+ BinaryMessage binaryMessage = new BinaryMessage(getApplication(), getSessionId(), getRegistryKey(), data, offset, length);broadcastMessage(binaryMessage);}@@ -184,7 +187,8 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor}}- broadcastMessage(new ConnectedMessage(getApplication(), getSessionId(), key));+ broadcastMessage(new ConnectedMessage(getApplication(), getSessionId(), key), connection, webSocketSettings.isAsynchronousPush(), webSocketSettings.getAsynchronousPushTimeout());+ // Replay observable changes that arrived between page rendering and connection establishment.OneDev.getInstance(WebSocketService.class).onConnect(connection);}@@ -192,10 +196,28 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorpublic void onClose(int closeCode, String message){IKey key = getRegistryKey();- broadcastMessage(new ClosedMessage(getApplication(), getSessionId(), key));+ if (webSocketSettings.shouldNotifyOnCloseEvent(closeCode)) {+ broadcastMessage(new ClosedMessage(getApplication(), getSessionId(), key, closeCode, message));+ }connectionRegistry.removeConnection(getApplication(), getSessionId(), key);}+ @Override+ public void onError(Throwable t)+ {+ if (webSocketSettings.shouldNotifyOnErrorEvent(t)) {+ IKey key = getRegistryKey();+ broadcastMessage(new ErrorMessage(getApplication(), getSessionId(), key, t));+ }+ }++ public final void broadcastMessage(final IWebSocketMessage message)+ {+ IKey key = getRegistryKey();+ IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, key);+ broadcastMessage(message, connection, webSocketSettings.isAsynchronousPush(), webSocketSettings.getAsynchronousPushTimeout());+ }+/*** Exports the Wicket thread locals and broadcasts the received message from the client to all* interested components and behaviors in the page with id {@code #pageId}@@ -207,19 +229,23 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor** @param message* the message to broadcast+ * @param connection+ * the {@link org.apache.wicket.protocol.ws.api.IWebSocketConnection}+ * @param asynchronousPush+ * whether asynchronous pus is used or not+ * @param timeout+ * The time ut to use for operation (in milliseconds). A negative value means use default timeout+ * (specified by container).*/- public final void broadcastMessage(final IWebSocketMessage message)+ public final void broadcastMessage(final IWebSocketMessage message, IWebSocketConnection connection, boolean asynchronousPush, long timeout){- IKey key = getRegistryKey();- IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, key);-- if (connection != null && (connection.isOpen() || isSpecialMessage(message)))+ if (connection != null && (connection.isOpen() || isSpecialMessage(message))){Application oldApplication = ThreadContext.getApplication();Session oldSession = ThreadContext.getSession();RequestCycle oldRequestCycle = ThreadContext.getRequestCycle();- WebResponse webResponse = webSocketSettings.newWebSocketResponse(connection);+ WebResponse webResponse = webSocketSettings.newWebSocketResponse(connection, asynchronousPush, timeout);try{WebSocketRequestMapper requestMapper = new WebSocketRequestMapper(application.getRootRequestMapper());@@ -242,30 +268,30 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorif (session == null){- connectionRegistry.removeConnection(application, sessionId, key);- LOG.debug("No Session could be found for session id '{}' and key '{}'!", sessionId, key);+ connectionRegistry.removeConnection(application, sessionId, connection.getKey());+ LOG.debug("No Session could be found for session id '{}' and key '{}'!", sessionId, connection.getKey());return;}-+IPageManager pageManager = session.getPageManager();Page page = getPage(pageManager);- if (page != null)+ if (page != null){WebSocketRequestHandler requestHandler = webSocketSettings.newWebSocketRequestHandler(page, connection);- @SuppressWarnings("rawtypes")- WebSocketPayload payload = createEventPayload(message, requestHandler);+ WebSocketPayload<?> payload = createEventPayload(message, requestHandler);- if (!(message instanceof ConnectedMessage || isSpecialMessage(message)))- {+ if (!(message instanceof ConnectedMessage || isSpecialMessage(message))) {requestCycle.scheduleRequestHandlerAfterCurrent(requestHandler);}IRequestHandler broadcastingHandler = new WebSocketMessageBroadcastHandler(pageId, resourceName, payload);requestMapper.setHandler(broadcastingHandler);requestCycle.processRequestAndDetach();- } else {+ }+ else+ {LOG.debug("Page with id '{}' has been expired. No message will be broadcast!", pageId);}}@@ -273,7 +299,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor{try {connection.sendMessage(WebSocketMessages.ERROR_MESSAGE);- } catch (IOException e1) {+ } catch (IOException ignored) {}LOG.error("An error occurred during processing of a WebSocket message", x);}@@ -307,16 +333,16 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorRequestCycleContext context = new RequestCycleContext(webRequest, webResponse,requestMapper, application.getExceptionMapperProvider().get());- RequestCycle requestCycle = application.getRequestCycleProvider().get(context);+ RequestCycle requestCycle = application.getRequestCycleProvider().apply(context);requestCycle.getListeners().add(application.getRequestCycleListeners());- requestCycle.getListeners().add(new AbstractRequestCycleListener()+ requestCycle.getListeners().add(new IRequestCycleListener(){@Overridepublic void onDetach(final RequestCycle requestCycle){if (Session.exists()){- Session.get().getPageManager().commitRequest();+ Session.get().getPageManager().detach();}}});@@ -353,10 +379,9 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorreturn sessionId;}- @SuppressWarnings("rawtypes")- private WebSocketPayload createEventPayload(IWebSocketMessage message, WebSocketRequestHandler handler)+ private WebSocketPayload<?> createEventPayload(IWebSocketMessage message, WebSocketRequestHandler handler){- final WebSocketPayload payload;+ final WebSocketPayload<?> payload;if (message instanceof TextMessage){payload = new WebSocketTextPayload((TextMessage) message, handler);@@ -373,6 +398,10 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor{payload = new WebSocketClosedPayload((ClosedMessage) message, handler);}+ else if (message instanceof ErrorMessage)+ {+ payload = new WebSocketErrorPayload((ErrorMessage) message, handler);+ }else if (message instanceof AbortedMessage){payload = new WebSocketAbortedPayload((AbortedMessage) message, handler);@@ -393,11 +422,16 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorIKey key;if (Strings.isEmpty(resourceName)){- key = new PageIdKey(pageId);+ key = new PageIdKey(pageId, context);}else{- key = new ResourceNameKey(resourceName);+ if (Strings.isEmpty(connectionToken))+ {+ key = new ResourceNameKey(resourceName, context);+ } else {+ key = new ResourceNameTokenKey(resourceName, connectionToken, context);+ }}return key;}diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.javadeleted file mode 100644index 6157376a46..0000000000--- a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java+++ /dev/null@@ -1,561 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.wicket.protocol.ws.api;--import java.io.BufferedReader;-import java.io.IOException;-import java.io.UnsupportedEncodingException;-import java.security.Principal;-import java.util.Collection;-import java.util.Collections;-import java.util.Enumeration;-import java.util.HashMap;-import java.util.Locale;-import java.util.Map;--import javax.servlet.AsyncContext;-import javax.servlet.DispatcherType;-import javax.servlet.RequestDispatcher;-import javax.servlet.ServletContext;-import javax.servlet.ServletException;-import javax.servlet.ServletInputStream;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.Cookie;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpSession;-import javax.servlet.http.HttpUpgradeHandler;-import javax.servlet.http.Part;--/**- * A copy of the http servlet request used to create the WebSocket.- * Copy its details because they are discarded at the end of the request (even if we- * use AsyncContext from Servlet 3 spec). This copy is used later for following requests- * through the WebSocket connection to construct WebSocketRequest.- *- * @since 6.0- */-public class ServletRequestCopy implements HttpServletRequest-{- private final String contextPath;- private final String servletPath;- private final String pathInfo;- private final String requestUri;- private final HttpSessionCopy httpSession;- private final StringBuffer requestURL;- private final Map<String, Object> attributes = new HashMap<>();- private final Map<String, Enumeration<String>> headers = new HashMap<>();- private final Map<String, String[]> parameters = new HashMap<>();- private final String method;- private final String serverName;- private final int serverPort;- private final String protocol;- private final String scheme;- private final String contentType;- private final Locale locale;- private final Enumeration<Locale> locales;- private final boolean isSecure;- private final String remoteUser;- private final String remoteAddr;- private final String remoteHost;- private final int remotePort;- private final String localAddr;- private final String localName;- private final int localPort;- private final String pathTranslated;- private final String requestedSessionId;- private final Principal principal;-- private String characterEncoding;-- public ServletRequestCopy(HttpServletRequest request) {- this.servletPath = request.getServletPath();- this.contextPath = request.getContextPath();- this.pathInfo = request.getPathInfo();- this.requestUri = request.getRequestURI();- this.requestURL = request.getRequestURL();- this.method = request.getMethod();- this.serverName = request.getServerName();- this.serverPort = request.getServerPort();- this.protocol = request.getProtocol();- this.scheme = request.getScheme();--- /*- * have to comment out below two lines as otherwise web socket will- * report UnSupportedOperationException upon connection- */- //this.characterEncoding = request.getCharacterEncoding();- //this.contentType = request.getContentType();- //this.requestedSessionId = request.getRequestedSessionId();- this.characterEncoding = null;- this.contentType = null;- this.requestedSessionId = null;-- this.locale = request.getLocale();- this.locales = request.getLocales();- this.isSecure = request.isSecure();- this.remoteUser = request.getRemoteUser();- this.remoteAddr = request.getRemoteAddr();- this.remoteHost = request.getRemoteHost();- this.remotePort = request.getRemotePort();- this.localAddr = request.getLocalAddr();- this.localName = request.getLocalName();- this.localPort = request.getLocalPort();- this.pathTranslated = request.getPathTranslated();- this.principal = request.getUserPrincipal();-- HttpSession session = request.getSession(true);- httpSession = new HttpSessionCopy(session);-- String s;- Enumeration<String> e = request.getHeaderNames();- while (e != null && e.hasMoreElements()) {- s = e.nextElement();- Enumeration<String> headerValues = request.getHeaders(s);- this.headers.put(s, headerValues);- }-- e = request.getAttributeNames();- while (e != null && e.hasMoreElements()) {- s = e.nextElement();- attributes.put(s, request.getAttribute(s));- }-- e = request.getParameterNames();- while (e != null && e.hasMoreElements()) {- s = e.nextElement();- parameters.put(s, request.getParameterValues(s));- }- }-- @Override- public String getServerName() {- return serverName;- }-- @Override- public int getServerPort() {- return serverPort;- }-- @Override- public BufferedReader getReader() throws IOException- {- return null;- }-- @Override- public String getRemoteAddr()- {- return remoteAddr;- }-- @Override- public String getRemoteHost()- {- return remoteHost;- }-- @Override- public HttpSession getSession(boolean create) {- return httpSession;- }-- @Override- public String getMethod() {- return method;- }-- @Override- public String getAuthType()- {- return null;- }-- @Override- public Cookie[] getCookies()- {- return new Cookie[0];- }-- @Override- public long getDateHeader(String name)- {- return 0;- }-- @Override- public String getHeader(String name)- {- Enumeration<String> values = headers.get(name);- if (values != null && values.hasMoreElements())- {- return values.nextElement();- }- return null;- }-- @Override- public Enumeration<String> getHeaders(final String name)- {- return headers.get(name);- }-- @Override- public Enumeration<String> getParameterNames() {- return Collections.enumeration(parameters.keySet());- }-- @Override- public String getParameter(String name) {- return parameters.get(name) != null ? parameters.get(name)[0] : null;- }-- @Override- public String[] getParameterValues(final String name) {- return parameters.get(name);- }-- @SuppressWarnings({ "unchecked", "rawtypes" })- @Override- public Map getParameterMap()- {- return parameters;- }-- @Override- public String getProtocol()- {- String _protocol = "ws";- if ("https".equalsIgnoreCase(protocol))- {- _protocol = "wss";- }- return _protocol;- }-- @Override- public String getScheme()- {- String _scheme = "ws";- if ("https".equalsIgnoreCase(scheme))- {- _scheme = "wss";- }- return _scheme;- }-- @Override- public Enumeration<String> getHeaderNames() {- return Collections.enumeration(headers.keySet());- }-- @Override- public int getIntHeader(String name)- {- Enumeration<String> values = headers.get(name);- int result = -1;- if (values.hasMoreElements())- {- String value = values.nextElement();- result = Integer.parseInt(value, 10);- }- return result;- }-- @Override- public Object getAttribute(String name) {- return attributes.get(name);- }-- @Override- public Enumeration<String> getAttributeNames() {- return Collections.enumeration(attributes.keySet());- }-- @Override- public String getCharacterEncoding()- {- return characterEncoding;- }-- @Override- public void setCharacterEncoding(String characterEncoding) throws UnsupportedEncodingException- {- this.characterEncoding = characterEncoding;- }-- @Override- public int getContentLength()- {- return 0;- }-- @Override- public String getContentType()- {- return contentType;- }-- @Override- public ServletInputStream getInputStream() throws IOException- {- return null;- }-- @Override- public void setAttribute(String name, Object o) {- attributes.put(name, o);- }-- @Override- public void removeAttribute(String name) {- attributes.remove(name);- }-- @Override- public Locale getLocale()- {- return locale;- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- @Override- public Enumeration getLocales()- {- return locales;- }-- @Override- public boolean isSecure()- {- return isSecure;- }-- @Override- public RequestDispatcher getRequestDispatcher(String path)- {- return null;- }-- @Override- public String getRealPath(String path)- {- return null;- }-- @Override- public int getRemotePort()- {- return remotePort;- }-- @Override- public String getLocalName()- {- return localName;- }-- @Override- public String getLocalAddr()- {- return localAddr;- }-- @Override- public int getLocalPort()- {- return localPort;- }-- @Override- public ServletContext getServletContext()- {- return null;- }-- @Override- public AsyncContext startAsync() throws IllegalStateException- {- return null;- }-- @Override- public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException- {- return null;- }-- @Override- public boolean isAsyncStarted()- {- return false;- }-- @Override- public boolean isAsyncSupported()- {- return false;- }-- @Override- public AsyncContext getAsyncContext()- {- return null;- }-- @Override- public DispatcherType getDispatcherType()- {- return null;- }-- @Override- public String getContextPath() {- return contextPath;- }-- @Override- public String getQueryString()- {- return null;- }-- @Override- public String getRemoteUser()- {- return remoteUser;- }-- @Override- public boolean isUserInRole(String role)- {- return false;- }-- @Override- public Principal getUserPrincipal()- {- return principal;- }-- @Override- public String getRequestedSessionId()- {- return requestedSessionId;- }-- @Override- public String getServletPath() {- return servletPath;- }-- @Override- public String getPathInfo() {- return pathInfo;- }-- @Override- public String getPathTranslated()- {- return pathTranslated;- }-- @Override- public String getRequestURI() {- return requestUri;- }-- @Override- public HttpSession getSession() {- return httpSession;- }-- @Override- public boolean isRequestedSessionIdValid()- {- return false;- }-- @Override- public boolean isRequestedSessionIdFromCookie()- {- return false;- }-- @Override- public boolean isRequestedSessionIdFromURL()- {- return false;- }-- @Override- public boolean isRequestedSessionIdFromUrl()- {- return false;- }-- @Override- public boolean authenticate(HttpServletResponse response) throws IOException, ServletException- {- return false;- }-- @Override- public void login(String username, String password) throws ServletException- {- }-- @Override- public void logout() throws ServletException- {- }-- @Override- public Collection<Part> getParts() throws IOException, ServletException- {- return Collections.emptyList();- }-- @Override- public Part getPart(String name) throws IOException, ServletException- {- return null;- }-- @Override- public StringBuffer getRequestURL() {- return requestURL;- }-- @Override- public long getContentLengthLong() {- return 0;- }-- @Override- public String changeSessionId() {- return null;- }-- @Override- public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {- return null;- }-}diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.javaindex 2d879f3aa4..27f172cd3e 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java@@ -19,39 +19,34 @@ package org.apache.wicket.protocol.ws.api;import java.io.IOException;import java.util.Collection;import java.util.Collections;+import java.util.concurrent.CompletableFuture;+import java.util.concurrent.Future;import org.apache.wicket.Component;-import org.apache.wicket.MarkupContainer;-import org.apache.wicket.Page;+import org.apache.wicket.core.request.handler.AbstractPartialPageRequestHandler;import org.apache.wicket.core.request.handler.logger.PageLogData;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.page.PartialPageUpdate;import org.apache.wicket.page.XmlPartialPageUpdate;import org.apache.wicket.request.ILogData;import org.apache.wicket.request.IRequestCycle;import org.apache.wicket.request.Response;-import org.apache.wicket.request.component.IRequestablePage;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.util.lang.Args;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.server.OneDev;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.websocket.WebSocketService;+import org.apache.wicket.response.StringResponse;+import org.apache.wicket.util.lang.Args;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;/*** A handler of WebSocket requests.** @since 6.0*/-public class WebSocketRequestHandler implements IWebSocketRequestHandler+public class WebSocketRequestHandler extends AbstractPartialPageRequestHandler implements IWebSocketRequestHandler{private static final Logger LOG = LoggerFactory.getLogger(WebSocketRequestHandler.class);- private final Page page;private final IWebSocketConnection connection;@@ -61,7 +56,7 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandlerpublic WebSocketRequestHandler(final Component component, final IWebSocketConnection connection){- this.page = Args.notNull(component, "component").getPage();+ super(Args.notNull(component, "component").getPage());this.connection = Args.notNull(connection, "connection");}@@ -85,6 +80,27 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler}}+ @Override+ public Future<Void> pushAsync(CharSequence message, long timeout)+ {+ if (connection.isOpen())+ {+ Args.notNull(message, "message");+ return connection.sendMessageAsync(message.toString(), timeout);+ }+ else+ {+ LOG.warn("The websocket connection is already closed. Cannot push the text message '{}'", message);+ }+ return CompletableFuture.completedFuture(null);+ }++ @Override+ public Future<Void> pushAsync(CharSequence message)+ {+ return pushAsync(message, -1);+ }+@Overridepublic void push(byte[] message, int offset, int length){@@ -106,14 +122,41 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler}@Override- public void add(Component component, String markupId)+ public Future<Void> pushAsync(byte[] message, int offset, int length)+ {+ return pushAsync(message, offset, length, -1);+ }++ @Override+ public Future<Void> pushAsync(byte[] message, int offset, int length, long timeout){- getUpdate().add(component, markupId);+ if (connection.isOpen())+ {+ Args.notNull(message, "message");+ return connection.sendMessageAsync(message, offset, length, timeout);+ }+ else+ {+ LOG.warn("The websocket connection is already closed. Cannot push the binary message '{}'", message);+ }+ return CompletableFuture.completedFuture(null);}- private PartialPageUpdate getUpdate() {+ /**+ * @return if <code>true</code> then EMPTY partial updates will se send. If <code>false</code> then EMPTY+ * partial updates will be skipped. A possible use case is: a page receives and a push event but no one is+ * listening to it, and nothing is added to {@link org.apache.wicket.protocol.ws.api.WebSocketRequestHandler}+ * thus no real push to client is needed. For compatibilities this is set to true. Thus EMPTY updates are sent+ * by default.+ */+ protected boolean shouldPushWhenEmpty()+ {+ return true;+ }++ protected PartialPageUpdate getUpdate() {if (update == null) {- update = new XmlPartialPageUpdate(page) {+ update = new XmlPartialPageUpdate(getPage()) {@Overrideprotected void onBeforeRespond(Response response) {@@ -140,51 +183,6 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandlerreturn update;}- @Override- public void add(Component... components)- {- for (final Component component : components)- {- Args.notNull(component, "component");-- if (component.getOutputMarkupId() == false)- {- throw new IllegalArgumentException(- "cannot update component that does not have setOutputMarkupId property set to true. Component: " +- component.toString());- }- add(component, component.getMarkupId());- }- }-- @Override- public final void addChildren(MarkupContainer parent, Class<?> childCriteria)- {- Args.notNull(parent, "parent");- Args.notNull(childCriteria, "childCriteria");-- parent.visitChildren(childCriteria, new IVisitor<Component, Void>()- {- @Override- public void component(final Component component, final IVisit<Void> visit)- {- add(component);- visit.dontGoDeeper();- }- });- }-- @Override- public void appendJavaScript(CharSequence javascript)- {- getUpdate().appendJavaScript(javascript);- }-- @Override- public void prependJavaScript(CharSequence javascript)- {- getUpdate().prependJavaScript(javascript);- }@Overridepublic Collection<? extends Component> getComponents()@@ -196,74 +194,26 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler}}- @Override- public final void focusComponent(Component component)- {- if (component != null && component.getOutputMarkupId() == false)- {- throw new IllegalArgumentException(- "cannot update component that does not have setOutputMarkupId property set to true. Component: " +- component.toString());- }- final String id = component != null ? ("'" + component.getMarkupId() + "'") : "null";- appendJavaScript("Wicket.Focus.setFocusOnId(" + id + ");");- }-- @Override- public IHeaderResponse getHeaderResponse()- {- return getUpdate().getHeaderResponse();- }-- @Override- public Page getPage()- {- return page;- }-- @Override- public Integer getPageId()- {- return page.getPageId();- }-- @Override- public boolean isPageInstanceCreated()- {- return true;- }-- @Override- public Integer getRenderCount()- {- return page.getRenderCount();- }-@Overridepublic ILogData getLogData(){return logData;}- @Override- public Class<? extends IRequestablePage> getPageClass()- {- return page.getPageClass();- }-- @Override- public PageParameters getPageParameters()- {- return page.getPageParameters();- }@Overridepublic void respond(IRequestCycle requestCycle){- if (update != null)- {- update.writeTo(requestCycle.getResponse(), "UTF-8");- }+ if (update != null && (shouldPushWhenEmpty() || !update.isEmpty())) {+ // see WICKET-7098+ // A malformed XML is generated if a runtime exception happen during rendering phase of a web+ // socket push request. Writing to a buffer allows to generate a proper XML+ // as request's buffer will not be polluted by partial write operations+ StringResponse bodyResponse = new StringResponse();+ // additionally, we use the charset for the request instead of a hardcoded UTF-8+ update.writeTo(bodyResponse, requestCycle.getRequest().getCharset().name());+ requestCycle.getResponse().write(bodyResponse.getBuffer());+ }}@Override@@ -271,7 +221,7 @@ public class WebSocketRequestHandler implements IWebSocketRequestHandler{if (logData == null){- logData = new PageLogData(page);+ logData = new PageLogData(getPage());}if (update != null) {diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.javadeleted file mode 100644index c553ab0605..0000000000--- a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java+++ /dev/null@@ -1,161 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.wicket.protocol.ws.api.registry;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.concurrent.ConcurrentMap;--import org.apache.wicket.Application;-import org.apache.wicket.MetaDataKey;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;-import org.apache.wicket.util.lang.Args;-import org.apache.wicket.util.lang.Generics;--/**- * A registry that keeps all currently opened web socket connections in- * maps in Application's meta data.- *- * @since 6.0- */-public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRegistry-{- private static final MetaDataKey<ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>>> KEY =- new MetaDataKey<ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>>>()- {- };-- @Override- public IWebSocketConnection getConnection(Application application, String sessionId, IKey key)- {- Args.notNull(application, "application");- Args.notNull(sessionId, "sessionId");- Args.notNull(key, "key");-- IWebSocketConnection connection = null;- ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);- if (connectionsBySession != null)- {- ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);- if (connectionsByPage != null)- {- connection = connectionsByPage.get(key);- }- }- return connection;- }-- @Override- public Collection<IWebSocketConnection> getConnections(Application application, String sessionId)- {- Args.notNull(application, "application");- Args.notNull(sessionId, "sessionId");-- Collection<IWebSocketConnection> connections = Collections.emptyList();- ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);- if (connectionsBySession != null)- {- ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);- if (connectionsByPage != null)- {- connections = connectionsByPage.values();- }- }- return connections;- }-- /**- * Returns a collection of currently active websockets. The connections might close at any time.- *- * @param application- * The application- * @return a collection of currently active websockets- */- public Collection<IWebSocketConnection> getConnections(Application application)- {- Args.notNull(application, "application");-- Collection<IWebSocketConnection> connections = new ArrayList<>();- ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);- if (connectionsBySession != null)- {- for (ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage : connectionsBySession.values())- {- connections.addAll(connectionsByPage.values());- }- }- return connections;- }-- @Override- public void setConnection(Application application, String sessionId, IKey key, IWebSocketConnection connection)- {- Args.notNull(application, "application");- Args.notNull(sessionId, "sessionId");- Args.notNull(key, "key");-- ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);- if (connectionsBySession == null)- {- synchronized (KEY)- {- connectionsBySession = application.getMetaData(KEY);- if (connectionsBySession == null)- {- connectionsBySession = Generics.newConcurrentHashMap();- application.setMetaData(KEY, connectionsBySession);- }- }- }-- ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);- if (connectionsByPage == null && connection != null)- {- connectionsByPage = connectionsBySession.get(sessionId);- if (connectionsByPage == null)- {- connectionsByPage = Generics.newConcurrentHashMap();- ConcurrentMap<IKey, IWebSocketConnection> old = connectionsBySession.putIfAbsent(sessionId, connectionsByPage);- if (old != null)- {- connectionsByPage = old;- }- }- }-- if (connection != null)- {- connectionsByPage.put(key, connection);- }- else if (connectionsByPage != null)- {- connectionsByPage.remove(key);- if (connectionsByPage.isEmpty())- {- connectionsBySession.remove(sessionId);- }- }- }-- @Override- public void removeConnection(Application application, String sessionId, IKey key)- {- setConnection(application, sessionId, key, null);- }--}diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.jsindex 919cdb2bb3..8f3123aecf 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js@@ -68,14 +68,26 @@}url = protocol + '//' + document.location.hostname + _port + WWS.contextPath + WWS.filterPrefix + '/wicket/websocket';+ if (WWS.sessionId !== '') {+ url += ';jsessionid=' + encodeURIComponent(WWS.sessionId);+ }+if (WWS.pageId !== false) {url += '?pageId=' + encodeURIComponent(WWS.pageId);} else if (WWS.resourceName) {url += '?resourceName=' + encodeURIComponent(WWS.resourceName);+ if (WWS.connectionToken) {+ url += '&connectionToken=' + encodeURIComponent(WWS.connectionToken);+ }+ }++ if (WWS.context) {+ url += '&context=' + encodeURIComponent(WWS.context);}url += '&wicket-ajax-baseurl=' + encodeURIComponent(WWS.baseUrl);url += '&wicket-app-name=' + encodeURIComponent(WWS.appName);+self.ws = new WebSocket(url);self.ws.onopen = function (evt) {@@ -115,16 +127,16 @@if (self.ws) {self.ws.close();self.ws = null;- Wicket.Event.publish(topics.Closed, evt);}+ Wicket.Event.publish(topics.Closed, evt);};self.ws.onerror = function (evt) {if (self.ws) {self.ws.close();self.ws = null;- Wicket.Event.publish(topics.Error, evt);}+ Wicket.Event.publish(topics.Error, evt);};} else {var errMessage = '[WebSocket.initialize] WebSocket is not supported in your browser!';diff --git a/server-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/server-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.javaindex 58c8f88a2e..915c1dcc39 100644--- a/server-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java+++ b/server-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java@@ -16,12 +16,17 @@*/package org.apache.wicket.request.cycle;+import java.util.Optional;+import java.io.Serializable;import java.util.concurrent.ConcurrentHashMap;-import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.eclipse.jetty.io.EofException;+import io.onedev.server.exception.ExceptionUtils;import org.apache.wicket.Application;+import org.apache.wicket.IMetadataContext;+import org.apache.wicket.IWicketInternalException;import org.apache.wicket.MetaDataEntry;import org.apache.wicket.MetaDataKey;import org.apache.wicket.Page;@@ -40,7 +45,8 @@ import org.apache.wicket.request.IRequestCycle;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.Request;-import org.apache.wicket.request.RequestHandlerStack;+import org.apache.wicket.request.RequestHandlerExecutor;+import org.apache.wicket.request.RequestHandlerExecutor.ReplaceHandlerException;import org.apache.wicket.request.Response;import org.apache.wicket.request.Url;import org.apache.wicket.request.UrlRenderer;@@ -52,12 +58,10 @@ import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;import org.apache.wicket.request.resource.caching.IStaticCacheableResource;import org.apache.wicket.util.lang.Args;-import org.eclipse.jetty.io.EofException;+import org.apache.wicket.util.lang.Exceptions;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.exception.ExceptionUtils;-/*** {@link RequestCycle} consists of two steps:* <ol>@@ -67,32 +71,22 @@ import io.onedev.server.exception.ExceptionUtils;* During {@link IRequestHandler} execution the handler can schedule another {@link IRequestHandler}* to run after it is done, or replace all {@link IRequestHandler}s on stack with another* {@link IRequestHandler}.- *+ ** @see #scheduleRequestHandlerAfterCurrent(IRequestHandler)* @see #replaceAllRequestHandlers(IRequestHandler)- *+ ** @author Matej Knopp* @author igor.vaynberg*/-public class RequestCycle implements IRequestCycle, IEventSink+public class RequestCycle implements IRequestCycle, IEventSink, IMetadataContext<Object, RequestCycle>{+ private final ConcurrentHashMap<ResourceUrlCacheKey, CharSequence> resourceUrlCache = new ConcurrentHashMap<>();+ private final ConcurrentHashMap<PageUrlCacheKey, CharSequence> pageUrlCache = new ConcurrentHashMap<>();private static final Logger log = LoggerFactory.getLogger(RequestCycle.class);-- private ConcurrentHashMap<ResourceUrlCacheKey, CharSequence> resourceUrlCache = new ConcurrentHashMap<>();-- private ConcurrentHashMap<PageUrlCacheKey, CharSequence> pageUrlCache = new ConcurrentHashMap<>();-- /**- * An additional logger which is used to log extra information.- * Could be disabled separately than the main logger if the application developer- * does not want to see this extra information.- */- @SuppressWarnings("unused")- private static final Logger logExtra = LoggerFactory.getLogger("RequestCycleExtra");-+/*** Returns request cycle associated with current thread.- *+ ** @return request cycle instance or <code>null</code> if no request cycle is associated with* current thread.*/@@ -102,7 +96,7 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- *+ ** @param requestCycle*/private static void set(RequestCycle requestCycle)@@ -128,13 +122,13 @@ public class RequestCycle implements IRequestCycle, IEventSink/** the time that this request cycle object was created. */private final long startTime;- private final RequestHandlerStack requestHandlerExecutor;+ private final RequestHandlerExecutor requestHandlerExecutor;private Response activeResponse;/*** Construct.- *+ ** @param context*/public RequestCycle(RequestCycleContext context)@@ -156,7 +150,7 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- *+ ** @return a new url renderer*/protected UrlRenderer newUrlRenderer()@@ -169,7 +163,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* Get the original response the request was created with. Access to the original response may* be necessary if the response has been temporarily replaced but the components require methods* from original response (i.e. cookie methods of WebResponse, etc).- *+ ** @return The original response object.*/public Response getOriginalResponse()@@ -179,7 +173,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Returns {@link UrlRenderer} for this {@link RequestCycle}.- *+ ** @return UrlRenderer instance.*/@Override@@ -194,7 +188,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Resolves current request to a {@link IRequestHandler}.- *+ ** @return RequestHandler instance*/protected IRequestHandler resolveRequestHandler()@@ -216,9 +210,29 @@ public class RequestCycle implements IRequestCycle, IEventSinkreturn retries;}+ /**+ * Convenience method that processes the request and detaches the {@link RequestCycle}.+ *+ * @return <code>true</code> if the request resolved to a Wicket request, <code>false</code>+ * otherwise.+ */+ public boolean processRequestAndDetach()+ {+ boolean result;+ try+ {+ result = processRequest();+ }+ finally+ {+ detach();+ }+ return result;+ }+/*** Processes the request.- *+ ** @return <code>true</code> if the request resolved to a Wicket request, <code>false</code>* otherwise.*/@@ -230,128 +244,133 @@ public class RequestCycle implements IRequestCycle, IEventSinklisteners.onBeginRequest(this);onBeginRequest();IRequestHandler handler = resolveRequestHandler();- if (handler != null)+ if (handler == null)+ {+ // Did not find any suitable handler, thus not executing the request+ log.debug(+ "No suitable handler found for URL {}, falling back to container to process this request",+ request.getUrl());+ }+ else{execute(handler);return true;}-- // Did not find any suitable handler, thus not executing the request- log.debug(- "No suitable handler found for URL {}, falling back to container to process this request",- request.getUrl());}- catch (Exception e)+ catch (Exception exception){- IRequestHandler handler = handleException(e);- if (handler != null)+ return executeExceptionRequestHandler(exception, getExceptionRetryCount());+ }+ finally+ {+ try{- listeners.onExceptionRequestHandlerResolved(this, handler, e);- executeExceptionRequestHandler(handler, getExceptionRetryCount());- listeners.onRequestHandlerExecuted(this, handler);+ listeners.onEndRequest(this);+ onEndRequest();}- else+ catch (RuntimeException e){- log.error("Error during request processing. URL=" + request.getUrl(), e);+ log.error("Exception occurred during onEndRequest", e);}- return true;- }- finally- {+set(null);}+return false;}/**- * Executes a request handler and fires pre/post listener methods- *+ * Execute a request handler and notify registered {@link IRequestCycleListener}s.+ ** @param handler*/private void execute(IRequestHandler handler){Args.notNull(handler, "handler");- try- {- listeners.onRequestHandlerResolved(this, handler);- requestHandlerExecutor.execute(handler);- listeners.onRequestHandlerExecuted(this, handler);- }- catch (RuntimeException e)- {- IRequestHandler replacement = requestHandlerExecutor.resolveHandler(e);- if (replacement != null)+ while (handler != null) {+ try{- execute(replacement);+ listeners.onRequestHandlerResolved(this, handler);+ IRequestHandler next = requestHandlerExecutor.execute(handler);+ listeners.onRequestHandlerExecuted(this, handler);++ handler = next;}- else+ catch (RuntimeException e){- throw e;+ ReplaceHandlerException replacer = Exceptions.findCause(e, ReplaceHandlerException.class);++ if (replacer == null)+ {+ throw e;+ }++ if (replacer.getRemoveScheduled())+ {+ requestHandlerExecutor.schedule(null);+ }++ handler = replacer.getReplacementRequestHandler();}}}/**- * Convenience method that processes the request and detaches the {@link RequestCycle}.- *- * @return <code>true</code> if the request resolved to a Wicket request, <code>false</code>- * otherwise.+ * Process the given exception.+ *+ * @param exception+ * @param retryCount*/- public boolean processRequestAndDetach()+ private boolean executeExceptionRequestHandler(Exception exception, int retryCount){- boolean result;- try+ IRequestHandler handler = handleException(exception);+ if (handler == null){- result = processRequest();- }- finally- {- detach();+ if (ExceptionUtils.find(exception, EofException.class) == null)+ log.error("Error during request processing. URL=" + request.getUrl(), exception);+ else+ log.debug("Eof during request processing", exception);+ return false;}- return result;- }-- /**- *- * @param handler- * @param retryCount- */- private void executeExceptionRequestHandler(final IRequestHandler handler, final int retryCount)- {scheduleRequestHandlerAfterCurrent(null);try{- requestHandlerExecutor.execute(handler);+ listeners.onExceptionRequestHandlerResolved(this, handler, exception);++ execute(handler);++ return true;}catch (Exception e){if (retryCount > 0){- IRequestHandler next = handleException(e);- if (next != null)- {- executeExceptionRequestHandler(next, retryCount - 1);- return;- }+ return executeExceptionRequestHandler(exception, retryCount - 1);}- if (ExceptionUtils.find(e, EofException.class) == null)- log.error("Error during processing error message", e);else- log.debug("Eof while processing error message", e);+ {+ log.error("Exception retry count exceeded", e);+ return false;+ }}}/*** Return {@link IRequestHandler} for the given exception.- *- * @param e+ *+ * @param e exception to handle* @return RequestHandler instance+ *+ * @see IRequestCycleListener#onException(RequestCycle, Exception)+ * @see IExceptionMapper#map(Exception)*/protected IRequestHandler handleException(final Exception e){++IRequestHandler handler = listeners.onException(this, e);if (handler != null){@@ -372,7 +391,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** INTERNAL This method is for internal Wicket use. Do not call it yourself unless you know what* you are doing.- *+ ** @param request*/public void setRequest(Request request)@@ -389,7 +408,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* Sets the metadata for this request cycle using the given key. If the metadata object is not* of the correct type for the metadata key, an IllegalArgumentException will be thrown. For* information on creating MetaDataKeys, see {@link MetaDataKey}.- *+ ** @param key* The singleton key for the metadata* @param object@@ -398,6 +417,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* @throws IllegalArgumentException* @see MetaDataKey*/+ @Overridepublic final <T> RequestCycle setMetaData(final MetaDataKey<T> key, final T object){metaData = key.set(metaData, object);@@ -406,15 +426,16 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Gets metadata for this request cycle using the given key.- *+ ** @param <T>* The type of the metadata- *+ ** @param key* The key for the data* @return The metadata or null if no metadata was found for the given key* @see MetaDataKey*/+ @Overridepublic final <T> T getMetaData(final MetaDataKey<T> key){return key.get(metaData);@@ -428,7 +449,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* probably need URL relative to the currently used page, for this use* {@linkplain #urlFor(org.apache.wicket.request.IRequestHandler)}* </p>- *+ ** @param handler* the {@link IRequestHandler request handler} for which to create a callback url* @return Url instance or <code>null</code>@@ -447,7 +468,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* probably need URL relative to the currently used page, for this use* {@linkplain #urlFor(org.apache.wicket.request.resource.ResourceReference, org.apache.wicket.request.mapper.parameter.PageParameters)}* </p>- *+ ** @param reference* resource reference* @param params@@ -468,7 +489,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* probably need URL relative to the currently used page, for this use* {@linkplain #urlFor(Class, org.apache.wicket.request.mapper.parameter.PageParameters)}* </p>- *+ ** @param <C>* The type of the page* @param pageClass@@ -487,7 +508,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Returns a rendered {@link Url} for the resource reference- *+ ** @param reference* resource reference* @param params@@ -511,9 +532,9 @@ public class RequestCycle implements IRequestCycle, IEventSink* Returns a rendered bookmarkable URL that references a given page class using a given set of* page parameters. Since the URL which is returned contains all information necessary to* instantiate and render the page, it can be stored in a user's browser as a stable bookmark.- *+ ** @param <C>- *+ ** @param pageClass* Class of page* @param parameters@@ -539,7 +560,7 @@ public class RequestCycle implements IRequestCycle, IEventSink* have been rendered.* <p>* The resulting URL will be relative to current page.- *+ ** @param handler* @return Url String or <code>null</code>*/@@ -642,16 +663,6 @@ public class RequestCycle implements IRequestCycle, IEventSink*/public void onDetach(){- try- {- onEndRequest();- listeners.onEndRequest(this);- }- catch (RuntimeException e)- {- log.error("Exception occurred during onEndRequest", e);- }-try{requestHandlerExecutor.detach();@@ -673,26 +684,14 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- * Called to handle a {@link java.lang.RuntimeException} that might be- * thrown during detaching phase.- *+ * Called to handle a {@link java.lang.RuntimeException} that might be+ * thrown during detaching phase.+ ** @param exception*/- private void handleDetachException(RuntimeException exception)+ private void handleDetachException(RuntimeException exception){- boolean isBufferedResponse = true;- if (Application.exists())- {- isBufferedResponse = Application.get().getRequestCycleSettings().getBufferResponse();- }-- //if application is using a buffered response strategy,- //then we display exception to user.- if (isBufferedResponse)- {- throw exception;- }- else+ if (!(exception instanceof IWicketInternalException)){log.error("Error detaching RequestCycle", exception);}@@ -700,7 +699,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Convenience method for setting next page to be rendered.- *+ ** @param page*/public void setResponsePage(IRequestablePage page)@@ -716,7 +715,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Convenience method for setting next page to be rendered.- *+ ** @param pageClass* The class of the page to render*/@@ -740,7 +739,7 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Convenience method for setting next page to be rendered.- *+ ** @param pageClass* The class of the page to render* @param parameters@@ -796,6 +795,10 @@ public class RequestCycle implements IRequestCycle, IEventSink*/protected void onEndRequest(){+ if (Session.exists())+ {+ Session.get().endRequest();+ }}/**@@ -841,7 +844,7 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- * @see RequestHandlerStack#getActive()+ * @see RequestHandlerExecutor#getActive()* @return active handler on executor*/public IRequestHandler getActiveRequestHandler()@@ -850,7 +853,7 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- * @see RequestHandlerStack#next()+ * @see RequestHandlerExecutor#next()* @return the handler scheduled to be executed after current by the executor*/public IRequestHandler getRequestHandlerScheduledAfterCurrent()@@ -859,7 +862,7 @@ public class RequestCycle implements IRequestCycle, IEventSink}/**- * @see RequestHandlerStack#replaceAll(IRequestHandler)+ * @see RequestHandlerExecutor#replaceAll(IRequestHandler)* @param handler*/public void replaceAllRequestHandlers(final IRequestHandler handler)@@ -870,37 +873,38 @@ public class RequestCycle implements IRequestCycle, IEventSink/*** Finds a IRequestHandler which is either the currently executing handler or is scheduled to be* executed.- *- * @return the found IRequestHandler or {@code null}+ *+ * @return the found IRequestHandler or {@link Optional#empty()}*/@SuppressWarnings("unchecked")- public <T extends IRequestHandler> T find(final Class<T> type)+ public <T extends IRequestHandler> Optional<T> find(final Class<T> type){if (type == null){- return null;+ return Optional.empty();}IRequestHandler result = getActiveRequestHandler();+ if (type.isInstance(result))+ {+ return (Optional<T>)Optional.of(result);+ }- if (result == null || type.isAssignableFrom(result.getClass()) == false)+ result = getRequestHandlerScheduledAfterCurrent();+ if (type.isInstance(result)){- result = getRequestHandlerScheduledAfterCurrent();- if (result == null || type.isAssignableFrom(result.getClass()) == false)- {- result = null;- }+ return (Optional<T>)Optional.of(result);}- return (T)result;+ return Optional.empty();}/**- * Adapts {@link RequestHandlerStack} to this {@link RequestCycle}- *+ * Adapts {@link RequestHandlerExecutor} to this {@link RequestCycle}+ ** @author Igor Vaynberg*/- private class HandlerExecutor extends RequestHandlerStack+ private class HandlerExecutor extends RequestHandlerExecutor{@Overridediff --git a/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java b/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.javaindex a1448e4d24..469df08ddd 100644--- a/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java+++ b/server-core/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java@@ -16,7 +16,7 @@*/package org.apache.wicket.request.http.handler;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;import org.apache.wicket.request.IRequestCycle;import org.apache.wicket.request.IRequestHandler;@@ -76,15 +76,21 @@ public class RedirectRequestHandler implements IRequestHandler* @param redirectUrl* URL to redirect to.* @param status- * 301 (Moved permanently) or 302 (Moved temporarily)+ * 301 (Moved permanently) or+ * 302 (Found (former Moved temporarily)) or+ * 303 (See other) or+ * 307 (Temporary redirect) or+ * 308 (Permanent recirect)*/public RedirectRequestHandler(final String redirectUrl, final int status){if ((status != HttpServletResponse.SC_MOVED_PERMANENTLY) &&- (status != HttpServletResponse.SC_MOVED_TEMPORARILY) &&- (status != HttpServletResponse.SC_SEE_OTHER))+ (status != HttpServletResponse.SC_FOUND) &&+ (status != HttpServletResponse.SC_SEE_OTHER) &&+ (status != HttpServletResponse.SC_TEMPORARY_REDIRECT) &&+ (status != 308 /* Constant HttpServletResponse.SC_PERMANENT_REDIRECT, requires Jakarta servlet-api 6.1 */)){- throw new IllegalStateException("Status must be either 301, 302 or 303, but was: " + status);+ throw new IllegalStateException("Status must be either 301, 302, 303, 307 or 308 but was: " + status);}this.redirectUrl = Args.notEmpty(redirectUrl, "redirectUrl");this.status = status;@@ -106,10 +112,6 @@ public class RedirectRequestHandler implements IRequestHandlerreturn status;}- public void detach(final IRequestCycle requestCycle)- {- }-public RedirectRequestHandler mode(Mode mode){this.mode = mode != null ? mode : Mode.AUTO;@@ -132,7 +134,7 @@ public class RedirectRequestHandler implements IRequestHandlersetStatus(response, requestCycle, location);}// Mode.AUTO- else if (status == HttpServletResponse.SC_MOVED_TEMPORARILY)+ else if (status == HttpServletResponse.SC_FOUND){response.sendRedirect(location);}diff --git a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java b/server-core/src/main/java/org/apache/wicket/util/string/Strings.javaindex 8045565a30..013b1f8e26 100644--- a/server-core/src/main/java/org/apache/wicket/util/string/Strings.java+++ b/server-core/src/main/java/org/apache/wicket/util/string/Strings.java@@ -18,18 +18,12 @@ package org.apache.wicket.util.string;import java.io.UnsupportedEncodingException;import java.nio.charset.Charset;-import java.security.AccessController;-import java.security.PrivilegedAction;import java.util.ArrayList;-import java.util.Collections;-import java.util.HashSet;import java.util.List;import java.util.Locale;-import java.util.Set;import java.util.regex.Matcher;import java.util.regex.Pattern;-import org.apache.wicket.util.lang.Args;/**@@ -53,31 +47,12 @@ import org.apache.wicket.util.lang.Args;** @author Jonathan Locke*/-@SuppressWarnings("removal")public final class Strings{- /**- * The line separator for the current platform.- */- public static final String LINE_SEPARATOR;-/** A table of hex digits */private static final char[] HEX_DIGIT = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9','A', 'B', 'C', 'D', 'E', 'F' };- private static final Set<Character> NONCHARACTERS = Collections.unmodifiableSet(new HashSet<Character>()- {- private static final long serialVersionUID = 1L;- {- for (int i = 0x0000FDD0; i <= 0x0000FDEF; ++i)- {- add((char)i);- }- add((char)0x0000FFFE);- // all other non-characters are out of range of (char)- }- });-private static final Pattern HTML_NUMBER_REGEX = Pattern.compile("&#\\d+;");private static final String[] NO_STRINGS = new String[0];@@ -94,19 +69,9 @@ public final class Strings* Constructs something like <em>;jsessionid=</em>. This is what {@linkplain Strings#stripJSessionId(String)}* actually uses.*/- private static final String SESSION_ID_PARAM = ';' + SESSION_ID_PARAM_NAME + '=';-- static- {- LINE_SEPARATOR = AccessController.doPrivileged(new PrivilegedAction<String>()- {- @Override- public String run()- {- return System.getProperty("line.separator");- }- });- }+ // the field is not 'final' because we need to modify it in a unit test+ // see https://github.com/openjdk/jdk/pull/5027#issuecomment-968177213+ private static String SESSION_ID_PARAM = ';' + SESSION_ID_PARAM_NAME + '=';/*** Private constructor prevents construction.@@ -320,7 +285,7 @@ public final class Strings* @param escapeSpaces* True to replace ' ' with nonbreaking space* @param convertToHtmlUnicodeEscapes- * True to convert non-7 bit characters to unicode HTML (&#...)+ * True to convert non-7 bit characters to unicode HTML (&#...)* @return The escaped string*/public static CharSequence escapeMarkup(final CharSequence s, final boolean escapeSpaces,@@ -331,14 +296,19 @@ public final class Stringsreturn null;}- int len = s.length();+ final int len = s.length();+ if (len == 0)+ {+ return s;+ }+final AppendingStringBuffer buffer = new AppendingStringBuffer((int)(len * 1.1));for (int i = 0; i < len; i++){final char c = s.charAt(i);- if (NONCHARACTERS.contains(c))+ if (Character.getType(c) == Character.UNASSIGNED){continue;}@@ -565,8 +535,26 @@ public final class Strings*/public static boolean isEmpty(final CharSequence string){- return (string == null) || (string.length() == 0) ||- (string.toString().trim().length() == 0);+ return string == null || string.length() == 0 ||+ (string.charAt(0) <= ' ' && string.toString().trim().isEmpty());+ }++ /**+ * Checks whether the <code>string</code> is considered empty. Empty means that the string may+ * contain whitespace, but no visible characters.+ *+ * "\n\t " is considered empty, while " a" is not.+ *+ * Note: This method overloads {@link #isEmpty(CharSequence)} for performance reasons.+ *+ * @param string+ * The string+ * @return True if the string is null or ""+ */+ public static boolean isEmpty(final String string)+ {+ return string == null || string.isEmpty() ||+ (string.charAt(0) <= ' ' && string.trim().isEmpty());}/**@@ -660,7 +648,7 @@ public final class Strings{return "";}- return join(separator, fragments.toArray(new String[fragments.size()]));+ return join(separator, fragments.toArray(new String[0]));}/**@@ -685,19 +673,21 @@ public final class Stringselse{// two or more elements- StringBuilder buff = new StringBuilder(128);+ AppendingStringBuffer buff = new AppendingStringBuffer(128);if (fragments[0] != null){buff.append(fragments[0]);}+ boolean separatorNotEmpty = !Strings.isEmpty(separator);for (int i = 1; i < fragments.length; i++){String fragment = fragments[i];- if ((fragments[i - 1] != null) || (fragment != null))+ String previousFragment = fragments[i - 1];+ if (previousFragment != null || fragment != null){- boolean lhsClosed = fragments[i - 1].endsWith(separator);+ boolean lhsClosed = previousFragment.endsWith(separator);boolean rhsClosed = fragment.startsWith(separator);- if (!Strings.isEmpty(separator) && lhsClosed && rhsClosed)+ if (separatorNotEmpty && lhsClosed && rhsClosed){buff.append(fragment.substring(1));}@@ -770,7 +760,7 @@ public final class Strings// If searchFor is null or the empty string, then there is nothing to// replace, so returning s is the only option here.- if ((searchFor == null) || "".equals(searchFor))+ if ((searchFor == null) || searchFor.length() == 0){return s;}@@ -792,43 +782,12 @@ public final class Strings}else{- // Allocate a AppendingStringBuffer that will hold one replacement- // with a- // little extra room.- int size = s.length();- final int replaceWithLength = replaceWith.length();- final int searchForLength = searchFor.length();- if (replaceWithLength > searchForLength)- {- size += (replaceWithLength - searchForLength);- }- final AppendingStringBuffer buffer = new AppendingStringBuffer(size + 16);-- int pos = 0;- do- {- // Append text up to the match- append(buffer, s, pos, matchIndex);-- // Add replaceWith text- buffer.append(replaceWith);-- // Find next occurrence, if any- pos = matchIndex + searchForLength;- matchIndex = search(s, searchString, pos);- }- while (matchIndex != -1);-- // Add tail of s- buffer.append(s.subSequence(pos, s.length()));-- // Return processed buffer- return buffer;+ return s.toString().replace(searchString, replaceWith);}}/**- * Replace HTML numbers like 值 by the appropriate character.+ * Replace HTML numbers like &#20540; by the appropriate character.** @param str* The text to be evaluated@@ -865,15 +824,30 @@ public final class Strings*/public static String[] split(final String s, final char c){- if (s == null || s.length() == 0)+ if (s == null || s.isEmpty()){return NO_STRINGS;}++ int pos = s.indexOf(c);+ if (pos == -1)+ {+ return new String[] { s };+ }++ int next = s.indexOf(c, pos + 1);+ if (next == -1)+ {+ return new String[] { s.substring(0, pos), s.substring(pos + 1) };+ }+final List<String> strings = new ArrayList<>();- int pos = 0;+ strings.add(s.substring(0, pos));+ strings.add(s.substring(pos + 1, next));while (true){- int next = s.indexOf(c, pos);+ pos = next + 1;+ next = s.indexOf(c, pos);if (next == -1){strings.add(s.substring(pos));@@ -883,7 +857,6 @@ public final class Strings{strings.add(s.substring(pos, next));}- pos = next + 1;}final String[] result = new String[strings.size()];strings.toArray(result);@@ -908,7 +881,7 @@ public final class Strings// Stripping a null or empty string from the end returns the// original string.- if ((ending == null) || "".equals(ending))+ if (ending == null || ending.isEmpty()){return s;}@@ -947,7 +920,7 @@ public final class Strings}// http://.../abc;jsessionid=...?param=...- int ixSemiColon = url.toLowerCase(Locale.ROOT).indexOf(SESSION_ID_PARAM);+ int ixSemiColon = url.indexOf(SESSION_ID_PARAM);if (ixSemiColon == -1){return url;@@ -1021,7 +994,7 @@ public final class Strings*/public static String toEscapedUnicode(final String unicodeString){- if ((unicodeString == null) || (unicodeString.length() == 0))+ if (unicodeString == null || unicodeString.isEmpty()){return unicodeString;}@@ -1031,7 +1004,7 @@ public final class Stringsfor (int x = 0; x < len; x++){char aChar = unicodeString.charAt(x);- if (NONCHARACTERS.contains(aChar))+ if (Character.getType(aChar) == Character.UNASSIGNED){continue;}@@ -1115,11 +1088,14 @@ public final class Stringsreturn null;}- final AppendingStringBuffer buffer = new AppendingStringBuffer();+ final int len = s.length();++ // allocate a buffer that is 10% larger than the original string to account for markup+ final AppendingStringBuffer buffer = new AppendingStringBuffer((int) (len * 1.1) + 16);int newlineCount = 0;buffer.append("<p>");- for (int i = 0; i < s.length(); i++)+ for (int i = 0; i < len; i++){final char c = s.charAt(i);@@ -1244,6 +1220,7 @@ public final class Strings}}+ @SuppressWarnings("unused")private static void append(final AppendingStringBuffer buffer, final CharSequence s,final int from, final int to){@@ -1270,9 +1247,7 @@ public final class Stringsprivate static void outputThrowable(final Throwable cause, final AppendingStringBuffer sb,final boolean stopAtWicketServlet){- // append message instead of cause to avoid including the whole html templatesb.append(cause.getMessage());-sb.append("\n");StackTraceElement[] trace = cause.getStackTrace();for (int i = 0; i < trace.length; i++)diff --git a/server-core/src/main/java/org/eclipse/jetty/server/Response.java b/server-core/src/main/java/org/eclipse/jetty/server/Response.javadeleted file mode 100644index 5323b2cf26..0000000000--- a/server-core/src/main/java/org/eclipse/jetty/server/Response.java+++ /dev/null@@ -1,1425 +0,0 @@-//-// ========================================================================-// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.-// -------------------------------------------------------------------------// All rights reserved. This program and the accompanying materials-// are made available under the terms of the Eclipse Public License v1.0-// and Apache License v2.0 which accompanies this distribution.-//-// The Eclipse Public License is available at-// http://www.eclipse.org/legal/epl-v10.html-//-// The Apache License v2.0 is available at-// http://www.opensource.org/licenses/apache2.0.php-//-// You may elect to redistribute this code under either of these licenses.-// ========================================================================-//--package org.eclipse.jetty.server;--import java.io.IOException;-import java.io.PrintWriter;-import java.nio.channels.IllegalSelectorException;-import java.util.Collection;-import java.util.Collections;-import java.util.EnumSet;-import java.util.Iterator;-import java.util.ListIterator;-import java.util.Locale;-import java.util.function.Supplier;-import javax.servlet.ServletOutputStream;-import javax.servlet.ServletResponse;-import javax.servlet.ServletResponseWrapper;-import javax.servlet.http.Cookie;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpServletResponseWrapper;-import javax.servlet.http.HttpSession;--import org.eclipse.jetty.http.CookieCompliance;-import org.eclipse.jetty.http.DateGenerator;-import org.eclipse.jetty.http.HttpContent;-import org.eclipse.jetty.http.HttpCookie;-import org.eclipse.jetty.http.HttpCookie.SameSite;-import org.eclipse.jetty.http.HttpCookie.SetCookieHttpField;-import org.eclipse.jetty.http.HttpField;-import org.eclipse.jetty.http.HttpFields;-import org.eclipse.jetty.http.HttpGenerator;-import org.eclipse.jetty.http.HttpHeader;-import org.eclipse.jetty.http.HttpHeaderValue;-import org.eclipse.jetty.http.HttpScheme;-import org.eclipse.jetty.http.HttpStatus;-import org.eclipse.jetty.http.HttpURI;-import org.eclipse.jetty.http.HttpVersion;-import org.eclipse.jetty.http.MetaData;-import org.eclipse.jetty.http.MimeTypes;-import org.eclipse.jetty.http.PreEncodedHttpField;-import org.eclipse.jetty.io.RuntimeIOException;-import org.eclipse.jetty.server.session.SessionHandler;-import org.eclipse.jetty.util.AtomicBiInteger;-import org.eclipse.jetty.util.Callback;-import org.eclipse.jetty.util.StringUtil;-import org.eclipse.jetty.util.URIUtil;-import org.eclipse.jetty.util.log.Log;-import org.eclipse.jetty.util.log.Logger;--/**- * <p>{@link Response} provides the implementation for {@link HttpServletResponse}.</p>- */-public class Response implements HttpServletResponse-{- @SuppressWarnings("unused")- private static final Logger LOG = Log.getLogger(Response.class);- private static final int __MIN_BUFFER_SIZE = 1;- private static final HttpField __EXPIRES_01JAN1970 = new PreEncodedHttpField(HttpHeader.EXPIRES, DateGenerator.__01Jan1970);- public static final int NO_CONTENT_LENGTH = -1;- public static final int USE_KNOWN_CONTENT_LENGTH = -2;-- public enum OutputType- {- NONE, STREAM, WRITER- }-- /**- * If a header name starts with this string, the header (stripped of the prefix)- * can be set during include using only {@link #setHeader(String, String)} or- * {@link #addHeader(String, String)}.- */- public static final String SET_INCLUDE_HEADER_PREFIX = "org.eclipse.jetty.server.include.";-- private final HttpChannel _channel;- private final HttpFields _fields = new HttpFields();- private final AtomicBiInteger _errorSentAndIncludes = new AtomicBiInteger(); // hi is errorSent flag, lo is include count- private final HttpOutput _out;- private int _status = HttpStatus.OK_200;- private String _reason;- private Locale _locale;- private MimeTypes.Type _mimeType;- private String _characterEncoding;- private EncodingFrom _encodingFrom = EncodingFrom.NOT_SET;- private String _contentType;- private OutputType _outputType = OutputType.NONE;- private ResponseWriter _writer;- private long _contentLength = -1;- private Supplier<HttpFields> _trailers;-- private enum EncodingFrom- {- NOT_SET, INFERRED, SET_LOCALE, SET_CONTENT_TYPE, SET_CHARACTER_ENCODING- }-- private static final EnumSet<EncodingFrom> __localeOverride = EnumSet.of(EncodingFrom.NOT_SET, EncodingFrom.INFERRED);- private static final EnumSet<EncodingFrom> __explicitCharset = EnumSet.of(EncodingFrom.SET_LOCALE, EncodingFrom.SET_CHARACTER_ENCODING);-- public Response(HttpChannel channel, HttpOutput out)- {- _channel = channel;- _out = out;- }-- public HttpChannel getHttpChannel()- {- return _channel;- }-- protected void recycle()- {- // _channel need not be recycled- _fields.clear();- _errorSentAndIncludes.set(0);- _out.recycle();- _status = HttpStatus.OK_200;- _reason = null;- _locale = null;- _mimeType = null;- _characterEncoding = null;- _encodingFrom = EncodingFrom.NOT_SET;- _contentType = null;- _outputType = OutputType.NONE;- // _writer does not need to be recycled- _contentLength = -1;- _trailers = null;- }-- public HttpOutput getHttpOutput()- {- return _out;- }-- public void reopen()- {- // Make the response mutable and reopen output.- setErrorSent(false);- _out.reopen();- }-- public void errorClose()- {- // Make the response immutable and soft close the output.- setErrorSent(true);- _out.softClose();- }-- /**- * @return true if the response is mutable, ie not errorSent and not included- */- private boolean isMutable()- {- return _errorSentAndIncludes.get() == 0;- }-- private void setErrorSent(boolean errorSent)- {- _errorSentAndIncludes.getAndSetHi(errorSent ? 1 : 0);- }-- public boolean isIncluding()- {- return _errorSentAndIncludes.getLo() > 0;- }-- public void include()- {- _errorSentAndIncludes.add(0, 1);- }-- public void included()- {- _errorSentAndIncludes.add(0, -1);- if (_outputType == OutputType.WRITER)- {- _writer.reopen();- }- _out.reopen();- }-- public void addCookie(HttpCookie cookie)- {- if (StringUtil.isBlank(cookie.getName()))- throw new IllegalArgumentException("Cookie.name cannot be blank/null");-- // add the set cookie- _fields.add(new SetCookieHttpField(checkSameSite(cookie), getHttpChannel().getHttpConfiguration().getResponseCookieCompliance()));-- // Expire responses with set-cookie headers so they do not get cached.- _fields.put(__EXPIRES_01JAN1970);- }-- /**- * Check that samesite is set on the cookie. If not, use a- * context default value, if one has been set.- *- * @param cookie the cookie to check- * @return either the original cookie, or a new one that has the samesit default set- */- private HttpCookie checkSameSite(HttpCookie cookie)- {- if (cookie == null || cookie.getSameSite() != null)- return cookie;-- //sameSite is not set, use the default configured for the context, if one exists- SameSite contextDefault = HttpCookie.getSameSiteDefault(_channel.getRequest().getServletContext());- if (contextDefault == null)- return cookie; //no default set-- return new HttpCookie(cookie.getName(),- cookie.getValue(),- cookie.getDomain(),- cookie.getPath(),- cookie.getMaxAge(),- cookie.isHttpOnly(),- cookie.isSecure(),- cookie.getComment(),- cookie.getVersion(),- contextDefault);- }-- /**- * Replace (or add) a cookie.- * Using name, path and domain, look for a matching set-cookie header and replace it.- *- * @param cookie The cookie to add/replace- */- public void replaceCookie(HttpCookie cookie)- {- for (ListIterator<HttpField> i = _fields.listIterator(); i.hasNext(); )- {- HttpField field = i.next();-- if (field.getHeader() == HttpHeader.SET_COOKIE)- {- CookieCompliance compliance = getHttpChannel().getHttpConfiguration().getResponseCookieCompliance();-- HttpCookie oldCookie;- if (field instanceof SetCookieHttpField)- oldCookie = ((SetCookieHttpField)field).getHttpCookie();- else- oldCookie = new HttpCookie(field.getValue());-- if (!cookie.getName().equals(oldCookie.getName()))- continue;-- if (cookie.getDomain() == null)- {- if (oldCookie.getDomain() != null)- continue;- }- else if (!cookie.getDomain().equalsIgnoreCase(oldCookie.getDomain()))- continue;-- if (cookie.getPath() == null)- {- if (oldCookie.getPath() != null)- continue;- }- else if (!cookie.getPath().equals(oldCookie.getPath()))- continue;-- i.set(new SetCookieHttpField(checkSameSite(cookie), compliance));- return;- }- }-- // Not replaced, so add normally- addCookie(cookie);- }-- @Override- public void addCookie(Cookie cookie)- {- //Servlet Spec 9.3 Include method: cannot set a cookie if handling an include- if (isMutable())- {- if (StringUtil.isBlank(cookie.getName()))- throw new IllegalArgumentException("Cookie.name cannot be blank/null");-- String comment = cookie.getComment();- // HttpOnly was supported as a comment in cookie flags before the java.net.HttpCookie implementation so need to check that- boolean httpOnly = cookie.isHttpOnly() || HttpCookie.isHttpOnlyInComment(comment);- SameSite sameSite = HttpCookie.getSameSiteFromComment(comment);- comment = HttpCookie.getCommentWithoutAttributes(comment);-- addCookie(new HttpCookie(- cookie.getName(),- cookie.getValue(),- cookie.getDomain(),- cookie.getPath(),- (long)cookie.getMaxAge(),- httpOnly,- cookie.getSecure(),- comment,- cookie.getVersion(),- sameSite));- }- }-- @Override- public boolean containsHeader(String name)- {- return _fields.containsKey(name);- }-- @Override- public String encodeURL(String url)- {- if (url == null)- return null;-- final Request request = _channel.getRequest();- SessionHandler sessionService = request.getSessionHandler();-- if (sessionService == null)- return url;-- HttpURI uri = null;- boolean hasScheme = URIUtil.hasScheme(url);- if (sessionService.isCheckingRemoteSessionIdEncoding() && hasScheme)- {- uri = new HttpURI(url);- String path = uri.getPath();- path = (path == null ? "" : path);- int port = uri.getPort();- if (port < 0)- port = HttpScheme.HTTPS.asString().equalsIgnoreCase(uri.getScheme()) ? 443 : 80;-- // Is it the same server?- if (!request.getServerName().equalsIgnoreCase(uri.getHost()))- return url;- if (request.getServerPort() != port)- return url;- if (!path.startsWith(request.getContextPath()))- return url;- }-- String sessionURLPrefix = sessionService.getSessionIdPathParameterNamePrefix();- if (sessionURLPrefix == null)- return url;-- // should not encode if cookies in evidence- if ((sessionService.isUsingCookies() && request.isRequestedSessionIdFromCookie()) || !sessionService.isUsingURLs())- {- int prefix = url.indexOf(sessionURLPrefix);- if (prefix != -1)- {- int suffix = url.indexOf("?", prefix);- if (suffix < 0)- suffix = url.indexOf("#", prefix);-- if (suffix <= prefix)- return url.substring(0, prefix);- return url.substring(0, prefix) + url.substring(suffix);- }- return url;- }-- // get session;- HttpSession session = request.getSession(false);-- // no session- if (session == null)- return url;-- // invalid session- if (!sessionService.isValid(session))- return url;-- String id = sessionService.getExtendedId(session);-- // Already encoded- int prefix = url.indexOf(sessionURLPrefix);- if (prefix != -1)- {- int suffix = url.indexOf("?", prefix);- if (suffix < 0)- suffix = url.indexOf("#", prefix);-- if (suffix <= prefix)- return url.substring(0, prefix + sessionURLPrefix.length()) + id;- return url.substring(0, prefix + sessionURLPrefix.length()) + id +- url.substring(suffix);- }-- // check for a null path- String nonNullPath = "";- if (hasScheme)- {- if (uri == null)- uri = new HttpURI(url);- if (uri.getPath() == null)- nonNullPath = "/";- }-- // edit the session- int suffix = url.indexOf('?');- if (suffix < 0)- suffix = url.indexOf('#');- if (suffix < 0)- return url + nonNullPath + sessionURLPrefix + id;-- return url.substring(0, suffix) + nonNullPath + sessionURLPrefix + id + url.substring(suffix);- }-- @Override- public String encodeRedirectURL(String url)- {- return encodeURL(url);- }-- @Override- @Deprecated- public String encodeUrl(String url)- {- return encodeURL(url);- }-- @Override- @Deprecated- public String encodeRedirectUrl(String url)- {- return encodeRedirectURL(url);- }-- @Override- public void sendError(int sc) throws IOException- {- sendError(sc, null);- }-- /**- * Send an error response.- * <p>In addition to the servlet standard handling, this method supports some additional codes:</p>- * <dl>- * <dt>102</dt><dd>Send a partial PROCESSING response and allow additional responses</dd>- * <dt>-1</dt><dd>Abort the HttpChannel and close the connection/stream</dd>- * </dl>- * @param code The error code- * @param message The message- * @throws IOException If an IO problem occurred sending the error response.- */- @Override- public void sendError(int code, String message) throws IOException- {- if (isIncluding())- return;-- switch (code)- {- case -1:- _channel.abort(new IOException(message));- break;- case HttpStatus.PROCESSING_102:- sendProcessing();- break;- default:- _channel.getState().sendError(code, message);- break;- }- }-- /**- * Sends a 102-Processing response.- * If the connection is an HTTP connection, the version is 1.1 and the- * request has a Expect header starting with 102, then a 102 response is- * sent. This indicates that the request still be processed and real response- * can still be sent. This method is called by sendError if it is passed 102.- *- * @throws IOException if unable to send the 102 response- * @see javax.servlet.http.HttpServletResponse#sendError(int)- */- public void sendProcessing() throws IOException- {- if (_channel.isExpecting102Processing() && !isCommitted())- {- _channel.sendResponse(HttpGenerator.PROGRESS_102_INFO, null, true);- }- }-- /**- * Sends a response with one of the 300 series redirection codes.- *- * @param code the redirect status code- * @param location the location to send in {@code Location} headers- * @throws IOException if unable to send the redirect- */- public void sendRedirect(int code, String location) throws IOException- {- sendRedirect(code, location, false);- }-- /**- * Sends a response with a HTTP version appropriate 30x redirection.- *- * @param location the location to send in {@code Location} headers- * @param consumeAll if True, consume any HTTP/1 request input before doing the redirection. If the input cannot- * be consumed without blocking, then add a `Connection: close` header to the response.- * @throws IOException if unable to send the redirect- */- public void sendRedirect(String location, boolean consumeAll) throws IOException- {- sendRedirect(getHttpChannel().getRequest().getHttpVersion().getVersion() < HttpVersion.HTTP_1_1.getVersion()- ? HttpServletResponse.SC_MOVED_TEMPORARILY : HttpServletResponse.SC_SEE_OTHER, location, consumeAll);- }-- /**- * Sends a response with a given redirection code.- *- * @param code the redirect status code- * @param location the location to send in {@code Location} headers- * @param consumeAll if True, consume any HTTP/1 request input before doing the redirection. If the input cannot- * be consumed without blocking, then add a `Connection: close` header to the response.- * @throws IOException if unable to send the redirect- */- public void sendRedirect(int code, String location, boolean consumeAll) throws IOException- {- if (consumeAll)- getHttpChannel().ensureConsumeAllOrNotPersistent();- if (!HttpStatus.isRedirection(code))- throw new IllegalArgumentException("Not a 3xx redirect code");-- if (!isMutable())- return;-- if (location == null)- throw new IllegalArgumentException();-- /*- * The new http spec now allows to redirect to relative urls. So we comment- * out below section to avoid wrongly prepending http scheme to the url if- * OneDev running with http protocol is exposed to outside as https prococol- * via reverse proxy- */-- /*- if (!URIUtil.hasScheme(location))- {- StringBuilder buf = _channel.getHttpConfiguration().isRelativeRedirectAllowed()- ? new StringBuilder()- : _channel.getRequest().getRootURL();- if (location.startsWith("/"))- {- // absolute in context- location = URIUtil.canonicalURI(location);- }- else- {- // relative to request- String path = _channel.getRequest().getRequestURI();- String parent = (path.endsWith("/")) ? path : URIUtil.parentPath(path);- location = URIUtil.canonicalURI(URIUtil.addEncodedPaths(parent, location));- if (location != null && !location.startsWith("/"))- buf.append('/');- }-- if (location == null)- throw new IllegalStateException("path cannot be above root");- buf.append(location);-- location = buf.toString();- }- */-- resetBuffer();- setHeader(HttpHeader.LOCATION, location);- setStatus(code);- closeOutput();- }-- @Override- public void sendRedirect(String location) throws IOException- {- sendRedirect(HttpServletResponse.SC_MOVED_TEMPORARILY, location);- }-- @Override- public void setDateHeader(String name, long date)- {- if (isMutable())- _fields.putDateField(name, date);- }-- @Override- public void addDateHeader(String name, long date)- {- if (isMutable())- _fields.addDateField(name, date);- }-- public void setHeader(HttpHeader name, String value)- {- if (isMutable())- {- if (HttpHeader.CONTENT_TYPE == name)- setContentType(value);- else- {- _fields.put(name, value);-- if (HttpHeader.CONTENT_LENGTH == name)- {- if (value == null)- _contentLength = -1L;- else- _contentLength = Long.parseLong(value);- }- }- }- }-- @Override- public void setHeader(String name, String value)- {- long biInt = _errorSentAndIncludes.get();- if (biInt != 0)- {- boolean errorSent = AtomicBiInteger.getHi(biInt) != 0;- boolean including = AtomicBiInteger.getLo(biInt) > 0;- if (!errorSent && including && name.startsWith(SET_INCLUDE_HEADER_PREFIX))- name = name.substring(SET_INCLUDE_HEADER_PREFIX.length());- else- return;- }-- if (HttpHeader.CONTENT_TYPE.is(name))- setContentType(value);- else- {- _fields.put(name, value);- if (HttpHeader.CONTENT_LENGTH.is(name))- {- if (value == null)- _contentLength = -1L;- else- _contentLength = Long.parseLong(value);- }- }- }-- @Override- public Collection<String> getHeaderNames()- {- return _fields.getFieldNamesCollection();- }-- @Override- public String getHeader(String name)- {- return _fields.get(name);- }-- @Override- public Collection<String> getHeaders(String name)- {- Collection<String> i = _fields.getValuesList(name);- if (i == null)- return Collections.emptyList();- return i;- }-- @Override- public void addHeader(String name, String value)- {- long biInt = _errorSentAndIncludes.get();- if (biInt != 0)- {- boolean errorSent = AtomicBiInteger.getHi(biInt) != 0;- boolean including = AtomicBiInteger.getLo(biInt) > 0;- if (!errorSent && including && name.startsWith(SET_INCLUDE_HEADER_PREFIX))- name = name.substring(SET_INCLUDE_HEADER_PREFIX.length());- else- return;- }-- if (HttpHeader.CONTENT_TYPE.is(name))- {- setContentType(value);- return;- }-- if (HttpHeader.CONTENT_LENGTH.is(name))- {- setHeader(name, value);- return;- }-- _fields.add(name, value);- }-- @Override- public void setIntHeader(String name, int value)- {- if (isMutable())- {- _fields.putLongField(name, value);- if (HttpHeader.CONTENT_LENGTH.is(name))- _contentLength = value;- }- }-- @Override- public void addIntHeader(String name, int value)- {- if (isMutable())- {- _fields.add(name, Integer.toString(value));- if (HttpHeader.CONTENT_LENGTH.is(name))- _contentLength = value;- }- }-- @Override- public void setStatus(int sc)- {- if (sc <= 0)- throw new IllegalArgumentException();- if (isMutable())- {- // Null the reason only if the status is different. This allows- // a specific reason to be sent with setStatusWithReason followed by sendError.- if (_status != sc)- _reason = null;- _status = sc;- }- }-- @Override- @Deprecated- public void setStatus(int sc, String sm)- {- setStatusWithReason(sc, sm);- }-- public void setStatusWithReason(int sc, String sm)- {- if (sc <= 0)- throw new IllegalArgumentException();- if (isMutable())- {- _status = sc;- _reason = sm;- }- }-- @Override- public String getCharacterEncoding()- {- if (_characterEncoding == null)- {- String encoding = MimeTypes.getCharsetAssumedFromContentType(_contentType);- if (encoding != null)- return encoding;- encoding = MimeTypes.getCharsetInferredFromContentType(_contentType);- if (encoding != null)- return encoding;- return StringUtil.__ISO_8859_1;- }- return _characterEncoding;- }-- @Override- public String getContentType()- {- return _contentType;- }-- @Override- public ServletOutputStream getOutputStream() throws IOException- {- if (_outputType == OutputType.WRITER)- throw new IllegalStateException("WRITER");- _outputType = OutputType.STREAM;- return _out;- }-- public boolean isWriting()- {- return _outputType == OutputType.WRITER;- }-- public boolean isStreaming()- {- return _outputType == OutputType.STREAM;- }-- public boolean isWritingOrStreaming()- {- return isWriting() || isStreaming();- }-- @Override- public PrintWriter getWriter() throws IOException- {- if (_outputType == OutputType.STREAM)- throw new IllegalStateException("STREAM");-- if (_outputType == OutputType.NONE)- {- /* get encoding from Content-Type header */- String encoding = _characterEncoding;- if (encoding == null)- {- if (_mimeType != null && _mimeType.isCharsetAssumed())- encoding = _mimeType.getCharsetString();- else- {- encoding = MimeTypes.getCharsetAssumedFromContentType(_contentType);- if (encoding == null)- {- encoding = MimeTypes.getCharsetInferredFromContentType(_contentType);- if (encoding == null)- encoding = StringUtil.__ISO_8859_1;- setCharacterEncoding(encoding, EncodingFrom.INFERRED);- }- }- }-- Locale locale = getLocale();-- if (_writer != null && _writer.isFor(locale, encoding))- _writer.reopen();- else- {- if (StringUtil.__ISO_8859_1.equalsIgnoreCase(encoding))- _writer = new ResponseWriter(new Iso88591HttpWriter(_out), locale, encoding);- else if (StringUtil.__UTF8.equalsIgnoreCase(encoding))- _writer = new ResponseWriter(new Utf8HttpWriter(_out), locale, encoding);- else- _writer = new ResponseWriter(new EncodingHttpWriter(_out, encoding), locale, encoding);- }-- // Set the output type at the end, because setCharacterEncoding() checks for it- _outputType = OutputType.WRITER;- }- return _writer;- }-- @Override- public void setContentLength(int len)- {- // Protect from setting after committed as default handling- // of a servlet HEAD request ALWAYS sets _content length, even- // if the getHandling committed the response!- if (isCommitted() || !isMutable())- return;-- if (len > 0)- {- long written = _out.getWritten();- if (written > len)- throw new IllegalArgumentException("setContentLength(" + len + ") when already written " + written);-- _contentLength = len;- _fields.putLongField(HttpHeader.CONTENT_LENGTH, len);- if (isAllContentWritten(written))- {- try- {- closeOutput();- }- catch (IOException e)- {- throw new RuntimeIOException(e);- }- }- }- else if (len == 0)- {- long written = _out.getWritten();- if (written > 0)- throw new IllegalArgumentException("setContentLength(0) when already written " + written);- _contentLength = len;- _fields.put(HttpHeader.CONTENT_LENGTH, "0");- }- else- {- _contentLength = len;- _fields.remove(HttpHeader.CONTENT_LENGTH);- }- }-- public long getContentLength()- {- return _contentLength;- }-- public boolean isAllContentWritten(long written)- {- return (_contentLength >= 0 && written >= _contentLength);- }-- public boolean isContentComplete(long written)- {- return (_contentLength < 0 || written >= _contentLength);- }-- public void closeOutput() throws IOException- {- if (_outputType == OutputType.WRITER)- _writer.close();- else- _out.close();- }-- /**- * close the output- *- * @deprecated Use {@link #closeOutput()}- */- @Deprecated- public void completeOutput() throws IOException- {- closeOutput();- }-- public void completeOutput(Callback callback)- {- if (_outputType == OutputType.WRITER)- _writer.complete(callback);- else- _out.complete(callback);- }-- public long getLongContentLength()- {- return _contentLength;- }-- public void setLongContentLength(long len)- {- // Protect from setting after committed as default handling- // of a servlet HEAD request ALWAYS sets _content length, even- // if the getHandling committed the response!- if (isCommitted() || !isMutable())- return;- _contentLength = len;- _fields.putLongField(HttpHeader.CONTENT_LENGTH.toString(), len);- }-- @Override- public void setContentLengthLong(long length)- {- setLongContentLength(length);- }-- @Override- public void setCharacterEncoding(String encoding)- {- setCharacterEncoding(encoding, EncodingFrom.SET_CHARACTER_ENCODING);- }-- private void setCharacterEncoding(String encoding, EncodingFrom from)- {- if (!isMutable() || isWriting())- return;-- if (_outputType != OutputType.WRITER && !isCommitted())- {- if (encoding == null)- {- _encodingFrom = EncodingFrom.NOT_SET;-- // Clear any encoding.- if (_characterEncoding != null)- {- _characterEncoding = null;-- if (_mimeType != null)- {- _mimeType = _mimeType.getBaseType();- _contentType = _mimeType.asString();- _fields.put(_mimeType.getContentTypeField());- }- else if (_contentType != null)- {- _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType);- _fields.put(HttpHeader.CONTENT_TYPE, _contentType);- }- }- }- else- {- // No, so just add this one to the mimetype- _encodingFrom = from;- _characterEncoding = HttpGenerator.__STRICT ? encoding : StringUtil.normalizeCharset(encoding);- if (_mimeType != null)- {- _contentType = _mimeType.getBaseType().asString() + ";charset=" + _characterEncoding;- _mimeType = MimeTypes.CACHE.get(_contentType);- if (_mimeType == null || HttpGenerator.__STRICT)- _fields.put(HttpHeader.CONTENT_TYPE, _contentType);- else- _fields.put(_mimeType.getContentTypeField());- }- else if (_contentType != null)- {- _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType) + ";charset=" + _characterEncoding;- _fields.put(HttpHeader.CONTENT_TYPE, _contentType);- }- }- }- }-- @Override- public void setContentType(String contentType)- {- if (isCommitted() || !isMutable())- return;-- if (contentType == null)- {- if (isWriting() && _characterEncoding != null)- throw new IllegalSelectorException();-- if (_locale == null)- _characterEncoding = null;- _mimeType = null;- _contentType = null;- _fields.remove(HttpHeader.CONTENT_TYPE);- }- else- {- _contentType = contentType;- _mimeType = MimeTypes.CACHE.get(contentType);-- String charset;- if (_mimeType != null && _mimeType.getCharset() != null && !_mimeType.isCharsetAssumed())- charset = _mimeType.getCharsetString();- else- charset = MimeTypes.getCharsetFromContentType(contentType);-- if (charset == null)- {- switch (_encodingFrom)- {- case NOT_SET:- break;- case INFERRED:- case SET_CONTENT_TYPE:- if (isWriting())- {- _mimeType = null;- _contentType = _contentType + ";charset=" + _characterEncoding;- }- else- {- _encodingFrom = EncodingFrom.NOT_SET;- _characterEncoding = null;- }- break;- case SET_LOCALE:- case SET_CHARACTER_ENCODING:- {- _contentType = contentType + ";charset=" + _characterEncoding;- _mimeType = null;- }- }- }- else if (isWriting() && !charset.equalsIgnoreCase(_characterEncoding))- {- // too late to change the character encoding;- _mimeType = null;- _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType);- if (_characterEncoding != null)- _contentType = _contentType + ";charset=" + _characterEncoding;- }- else- {- _characterEncoding = charset;- _encodingFrom = EncodingFrom.SET_CONTENT_TYPE;- }-- if (HttpGenerator.__STRICT || _mimeType == null)- _fields.put(HttpHeader.CONTENT_TYPE, _contentType);- else- {- _contentType = _mimeType.asString();- _fields.put(_mimeType.getContentTypeField());- }- }- }-- @Override- public void setBufferSize(int size)- {- if (isCommitted())- throw new IllegalStateException("cannot set buffer size after response is in committed state");- if (getContentCount() > 0)- throw new IllegalStateException("cannot set buffer size after response has " + getContentCount() + " bytes already written");- if (size < __MIN_BUFFER_SIZE)- size = __MIN_BUFFER_SIZE;- _out.setBufferSize(size);- }-- @Override- public int getBufferSize()- {- return _out.getBufferSize();- }-- @Override- public void flushBuffer() throws IOException- {- if (!_out.isClosed())- _out.flush();- }-- @Override- public void reset()- {- _status = 200;- _reason = null;- _out.resetBuffer();- _outputType = OutputType.NONE;- _contentLength = -1;- _contentType = null;- _mimeType = null;- _characterEncoding = null;- _encodingFrom = EncodingFrom.NOT_SET;- _trailers = null;-- // Clear all response headers- _fields.clear();-- // recreate necessary connection related fields- for (String value : _channel.getRequest().getHttpFields().getCSV(HttpHeader.CONNECTION, false))- {- HttpHeaderValue cb = HttpHeaderValue.CACHE.get(value);- if (cb != null)- {- switch (cb)- {- case CLOSE:- _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.toString());- break;- case KEEP_ALIVE:- if (HttpVersion.HTTP_1_0.is(_channel.getRequest().getProtocol()))- _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.KEEP_ALIVE.toString());- break;- case TE:- _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.TE.toString());- break;- default:- }- }- }-- // recreate session cookies- Request request = getHttpChannel().getRequest();- HttpSession session = request.getSession(false);- if (session != null && session.isNew())- {- SessionHandler sh = request.getSessionHandler();- if (sh != null)- {- HttpCookie c = sh.getSessionCookie(session, request.getContextPath(), request.isSecure());- if (c != null)- addCookie(c);- }- }- }-- public void resetContent()- {- _out.resetBuffer();- _outputType = OutputType.NONE;- _contentLength = -1;- _contentType = null;- _mimeType = null;- _characterEncoding = null;- _encodingFrom = EncodingFrom.NOT_SET;-- // remove the content related response headers and keep all others- for (Iterator<HttpField> i = getHttpFields().iterator(); i.hasNext(); )- {- HttpField field = i.next();- if (field.getHeader() == null)- continue;-- switch (field.getHeader())- {- case CONTENT_TYPE:- case CONTENT_LENGTH:- case CONTENT_ENCODING:- case CONTENT_LANGUAGE:- case CONTENT_RANGE:- case CONTENT_MD5:- case CONTENT_LOCATION:- case TRANSFER_ENCODING:- case CACHE_CONTROL:- case LAST_MODIFIED:- case EXPIRES:- case ETAG:- case DATE:- case VARY:- i.remove();- continue;- default:- }- }- }-- public void resetForForward()- {- resetBuffer();- _outputType = OutputType.NONE;- }-- @Override- public void resetBuffer()- {- _out.resetBuffer();- _out.reopen();- }-- public void setTrailers(Supplier<HttpFields> trailers)- {- this._trailers = trailers;- }-- public Supplier<HttpFields> getTrailers()- {- return _trailers;- }-- protected MetaData.Response newResponseMetaData()- {- MetaData.Response info = new MetaData.Response(_channel.getRequest().getHttpVersion(), getStatus(), getReason(), _fields, getLongContentLength());- info.setTrailerSupplier(getTrailers());- return info;- }-- /**- * Get the MetaData.Response committed for this response.- * This may differ from the meta data in this response for- * exceptional responses (eg 4xx and 5xx responses generated- * by the container) and the committedMetaData should be used- * for logging purposes.- *- * @return The committed MetaData or a {@link #newResponseMetaData()}- * if not yet committed.- */- public MetaData.Response getCommittedMetaData()- {- MetaData.Response meta = _channel.getCommittedMetaData();- if (meta == null)- return newResponseMetaData();- return meta;- }-- @Override- public boolean isCommitted()- {- // If we are in sendError state, we pretend to be committed- if (_channel.isSendError())- return true;- return _channel.isCommitted();- }-- @Override- public void setLocale(Locale locale)- {- if (locale == null || isCommitted() || !isMutable())- return;-- _locale = locale;- _fields.put(HttpHeader.CONTENT_LANGUAGE, StringUtil.replace(locale.toString(), '_', '-'));-- if (_outputType != OutputType.NONE)- return;-- if (_channel.getRequest().getContext() == null)- return;-- String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale);-- if (charset != null && charset.length() > 0 && __localeOverride.contains(_encodingFrom))- setCharacterEncoding(charset, EncodingFrom.SET_LOCALE);- }-- @Override- public Locale getLocale()- {- if (_locale == null)- return Locale.getDefault();- return _locale;- }-- @Override- public int getStatus()- {- return _status;- }-- public String getReason()- {- return _reason;- }-- public HttpFields getHttpFields()- {- return _fields;- }-- public long getContentCount()- {- return _out.getWritten();- }-- @Override- public String toString()- {- return String.format("%s %d %s%n%s", _channel.getRequest().getHttpVersion(), _status, _reason == null ? "" : _reason, _fields);- }-- public void putHeaders(HttpContent content, long contentLength, boolean etag)- {- HttpField lm = content.getLastModified();- if (lm != null)- _fields.put(lm);-- if (contentLength == USE_KNOWN_CONTENT_LENGTH)- {- _fields.put(content.getContentLength());- _contentLength = content.getContentLengthValue();- }- else if (contentLength > NO_CONTENT_LENGTH)- {- _fields.putLongField(HttpHeader.CONTENT_LENGTH, contentLength);- _contentLength = contentLength;- }-- HttpField ct = content.getContentType();- if (ct != null)- {- if (_characterEncoding != null &&- content.getCharacterEncoding() == null &&- content.getContentTypeValue() != null &&- __explicitCharset.contains(_encodingFrom))- {- setContentType(MimeTypes.getContentTypeWithoutCharset(content.getContentTypeValue()));- }- else- {- _fields.put(ct);- _contentType = ct.getValue();- _characterEncoding = content.getCharacterEncoding();- _mimeType = content.getMimeType();- }- }-- HttpField ce = content.getContentEncoding();- if (ce != null)- _fields.put(ce);-- if (etag)- {- HttpField et = content.getETag();- if (et != null)- _fields.put(et);- }- }-- public static void putHeaders(HttpServletResponse response, HttpContent content, long contentLength, boolean etag)- {- long lml = content.getResource().lastModified();- if (lml >= 0)- response.setDateHeader(HttpHeader.LAST_MODIFIED.asString(), lml);-- if (contentLength == USE_KNOWN_CONTENT_LENGTH)- contentLength = content.getContentLengthValue();- if (contentLength > NO_CONTENT_LENGTH)- {- if (contentLength < Integer.MAX_VALUE)- response.setContentLength((int)contentLength);- else- response.setHeader(HttpHeader.CONTENT_LENGTH.asString(), Long.toString(contentLength));- }-- String ct = content.getContentTypeValue();- if (ct != null && response.getContentType() == null)- response.setContentType(ct);-- String ce = content.getContentEncodingValue();- if (ce != null)- response.setHeader(HttpHeader.CONTENT_ENCODING.asString(), ce);-- if (etag)- {- String et = content.getETagValue();- if (et != null)- response.setHeader(HttpHeader.ETAG.asString(), et);- }- }-- public static HttpServletResponse unwrap(ServletResponse servletResponse)- {- if (servletResponse instanceof HttpServletResponseWrapper)- {- return (HttpServletResponseWrapper)servletResponse;- }- if (servletResponse instanceof ServletResponseWrapper)- {- return unwrap(((ServletResponseWrapper)servletResponse).getResponse());- }- return (HttpServletResponse)servletResponse;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.javadeleted file mode 100644index 73ae62a23f..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java+++ /dev/null@@ -1,145 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--abstract class AbstractRevQueue extends Generator {- static final AbstractRevQueue EMPTY_QUEUE = new AlwaysEmptyQueue();-- /** Current output flags set for this generator instance. */- int outputType;-- AbstractRevQueue(boolean firstParent) {- super(firstParent);- }-- /**- * Add a commit to the queue.- * <p>- * This method always adds the commit, even if it is already in the queue or- * previously was in the queue but has already been removed. To control- * queue admission use {@link #add(RevCommit, RevFlag)}.- *- * @param c- * commit to add.- */- public abstract void add(RevCommit c);-- /**- * Add a commit if it does not have a flag set yet, then set the flag.- * <p>- * This method permits the application to test if the commit has the given- * flag; if it does not already have the flag than the commit is added to- * the queue and the flag is set. This later will prevent the commit from- * being added twice.- *- * @param c- * commit to add.- * @param queueControl- * flag that controls admission to the queue.- */- public final void add(RevCommit c, RevFlag queueControl) {- if (!c.has(queueControl)) {- c.add(queueControl);- add(c);- }- }-- /**- * Add a commit's parents if one does not have a flag set yet.- * <p>- * This method permits the application to test if the commit has the given- * flag; if it does not already have the flag than the commit is added to- * the queue and the flag is set. This later will prevent the commit from- * being added twice.- *- * @param c- * commit whose parents should be added.- * @param queueControl- * flag that controls admission to the queue.- */- public final void addParents(RevCommit c, RevFlag queueControl) {- final RevCommit[] pList = c.getParents();- if (pList == null) {- return;- }- for (int i = 0; i < pList.length; i++) {- if (firstParent && i > 0) {- break;- }- add(pList[i], queueControl);- }- }-- /**- * Remove the first commit from the queue.- */- @Override- public abstract RevCommit next();-- /**- * Remove all entries from this queue.- */- public abstract void clear();-- abstract boolean everbodyHasFlag(int f);-- abstract boolean anybodyHasFlag(int f);-- @Override- int outputType() {- return outputType;- }-- /**- * Describe this queue- *- * @param s- * a StringBuilder- * @param c- * a {@link org.eclipse.jgit.revwalk.RevCommit}- */- protected static void describe(StringBuilder s, RevCommit c) {- s.append(c.toString());- s.append('\n');- }-- private static class AlwaysEmptyQueue extends AbstractRevQueue {- private AlwaysEmptyQueue() {- super(false);- }-- @Override- public void add(RevCommit c) {- throw new UnsupportedOperationException();- }-- @Override- public RevCommit next() {- return null;- }-- @Override- boolean anybodyHasFlag(int f) {- return false;- }-- @Override- boolean everbodyHasFlag(int f) {- return true;- }-- @Override- public void clear() {- // Nothing to clear, we have no state.- }-- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.javadeleted file mode 100644index 279697b6eb..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java+++ /dev/null@@ -1,37 +0,0 @@-/*- * Copyright (C) 2010, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AsyncOperation;--/**- * Queue to lookup and parse objects asynchronously.- *- * A queue may perform background lookup of objects and supply them (possibly- * out-of-order) to the application.- */-public interface AsyncRevObjectQueue extends AsyncOperation {- /**- * Obtain the next object.- *- * @return the object; null if there are no more objects remaining.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the object does not exist. There may be more objects- * remaining in the iteration, the application should call- * {@link #next()} again.- * @throws java.io.IOException- * the object store cannot be accessed.- */- RevObject next() throws MissingObjectException, IOException;-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/BitmapWalker.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/BitmapWalker.javadeleted file mode 100644index 92b38f0388..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/BitmapWalker.java+++ /dev/null@@ -1,255 +0,0 @@-/*- * Copyright (C) 2012, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.Arrays;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.revwalk.AddToBitmapFilter;-import org.eclipse.jgit.internal.revwalk.AddToBitmapWithCacheFilter;-import org.eclipse.jgit.internal.revwalk.AddUnseenToBitmapFilter;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.BitmapIndex;-import org.eclipse.jgit.lib.BitmapIndex.Bitmap;-import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder;-import org.eclipse.jgit.lib.NullProgressMonitor;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ProgressMonitor;-import org.eclipse.jgit.revwalk.filter.ObjectFilter;--/**- * Helper class to do ObjectWalks with pack index bitmaps.- *- * @since 4.10- */-public final class BitmapWalker {-- private final ObjectWalk walker;-- private final BitmapIndex bitmapIndex;-- private final ProgressMonitor pm;-- private long countOfBitmapIndexMisses;-- // Cached bitmap and commit to save walk time.- private AnyObjectId prevCommit;-- private Bitmap prevBitmap;-- /**- * Create a BitmapWalker.- *- * @param walker- * walker to use when traversing the object graph.- * @param bitmapIndex- * index to obtain bitmaps from.- * @param pm- * progress monitor to report progress on.- */- public BitmapWalker(ObjectWalk walker, BitmapIndex bitmapIndex,- ProgressMonitor pm) {- this.walker = walker;- this.bitmapIndex = bitmapIndex;- this.pm = (pm == null) ? NullProgressMonitor.INSTANCE : pm;- }-- /**- * Set the cached commit for the walker.- *- * @param prevCommit- * the cached commit.- * @since 5.8- */- public void setPrevCommit(AnyObjectId prevCommit) {- this.prevCommit = prevCommit;- }-- /**- * Set the bitmap associated with the cached commit for the walker.- *- * @param prevBitmap- * the bitmap associated with the cached commit.- * @since 5.8- */- public void setPrevBitmap(Bitmap prevBitmap) {- this.prevBitmap = prevBitmap;- }-- /**- * Return the number of objects that had to be walked because they were not covered by a- * bitmap.- *- * @return the number of objects that had to be walked because they were not covered by a- * bitmap.- */- public long getCountOfBitmapIndexMisses() {- return countOfBitmapIndexMisses;- }-- /**- * Return, as a bitmap, the objects reachable from the objects in start.- *- * @param start- * the objects to start the object traversal from.- * @param seen- * the objects to skip if encountered during traversal.- * @param ignoreMissing- * true to ignore missing objects, false otherwise.- * @return as a bitmap, the objects reachable from the objects in start.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the object supplied is not available from the object- * database. This usually indicates the supplied object is- * invalid, but the reference was constructed during an earlier- * invocation to- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually the type of the instance- * passed in. This usually indicates the caller used the wrong- * type in a- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}- * call.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public BitmapBuilder findObjects(Iterable<? extends ObjectId> start, BitmapBuilder seen,- boolean ignoreMissing)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- if (!ignoreMissing) {- return findObjectsWalk(start, seen, false);- }-- try {- return findObjectsWalk(start, seen, true);- } catch (MissingObjectException ignore) {- // An object reachable from one of the "start"s is missing.- // Walk from the "start"s one at a time so it can be excluded.- }-- final BitmapBuilder result = bitmapIndex.newBitmapBuilder();- for (ObjectId obj : start) {- Bitmap bitmap = bitmapIndex.getBitmap(obj);- if (bitmap != null) {- result.or(bitmap);- }- }-- for (ObjectId obj : start) {- if (result.contains(obj)) {- continue;- }- try {- result.or(findObjectsWalk(Arrays.asList(obj), result, false));- } catch (MissingObjectException ignore) {- // An object reachable from this "start" is missing.- //- // This can happen when the client specified a "have" line- // pointing to an object that is present but unreachable:- // "git prune" and "git fsck" only guarantee that the object- // database will continue to contain all objects reachable- // from a ref and does not guarantee connectivity for other- // objects in the object database.- //- // In this situation, skip the relevant "start" and move on- // to the next one.- //- // once RevWalk and ObjectWalk support that.- }- }- return result;- }-- private BitmapBuilder findObjectsWalk(Iterable<? extends ObjectId> start, BitmapBuilder seen,- boolean ignoreMissingStart)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- walker.reset();- final BitmapBuilder bitmapResult = bitmapIndex.newBitmapBuilder();-- for (ObjectId obj : start) {- Bitmap bitmap = bitmapIndex.getBitmap(obj);- if (bitmap != null) {- bitmapResult.or(bitmap);- }- }-- boolean marked = false;- for (ObjectId obj : start) {- try {- if (!bitmapResult.contains(obj)) {- walker.markStart(walker.parseAny(obj));- marked = true;- }- } catch (MissingObjectException e) {- if (ignoreMissingStart)- continue;- throw e;- }- }-- if (marked) {- if (prevCommit != null) {- walker.setRevFilter(new AddToBitmapWithCacheFilter(prevCommit,- prevBitmap, bitmapResult));- } else if (seen == null) {- walker.setRevFilter(new AddToBitmapFilter(bitmapResult));- } else {- walker.setRevFilter(- new AddUnseenToBitmapFilter(seen, bitmapResult));- }- walker.setObjectFilter(new BitmapObjectFilter(bitmapResult));-- while (walker.next() != null) {- // Iterate through all of the commits. The BitmapRevFilter does- // the work.- //- // filter.include returns true for commits that do not have- // a bitmap in bitmapIndex and are not reachable from a- // bitmap in bitmapIndex encountered earlier in the walk.- // Thus the number of commits returned by next() measures how- // much history was traversed without being able to make use- // of bitmaps.- pm.update(1);- countOfBitmapIndexMisses++;- }-- RevObject ro;- while ((ro = walker.nextObject()) != null) {- bitmapResult.addObject(ro, ro.getType());- pm.update(1);- }- }-- return bitmapResult;- }-- /**- * Filter that excludes objects already in the given bitmap.- */- static class BitmapObjectFilter extends ObjectFilter {- private final BitmapBuilder bitmap;-- BitmapObjectFilter(BitmapBuilder bitmap) {- this.bitmap = bitmap;- }-- @Override- public final boolean include(ObjectWalk walker, AnyObjectId objid)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return !bitmap.contains(objid);- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.javadeleted file mode 100644index 294ff4de79..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java+++ /dev/null@@ -1,111 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--class BlockObjQueue {- private BlockFreeList free;-- private Block head;-- private Block tail;-- /** Create an empty queue. */- BlockObjQueue() {- free = new BlockFreeList();- }-- void add(RevObject c) {- Block b = tail;- if (b == null) {- b = free.newBlock();- b.add(c);- head = b;- tail = b;- return;- } else if (b.isFull()) {- b = free.newBlock();- tail.next = b;- tail = b;- }- b.add(c);- }-- RevObject next() {- final Block b = head;- if (b == null)- return null;-- final RevObject c = b.pop();- if (b.isEmpty()) {- head = b.next;- if (head == null)- tail = null;- free.freeBlock(b);- }- return c;- }-- static final class BlockFreeList {- private Block next;-- Block newBlock() {- Block b = next;- if (b == null)- return new Block();- next = b.next;- b.clear();- return b;- }-- void freeBlock(Block b) {- b.next = next;- next = b;- }- }-- static final class Block {- private static final int BLOCK_SIZE = 256;-- /** Next block in our chain of blocks; null if we are the last. */- Block next;-- /** Our table of queued objects. */- final RevObject[] objects = new RevObject[BLOCK_SIZE];-- /** Next valid entry in {@link #objects}. */- int headIndex;-- /** Next free entry in {@link #objects} for addition at. */- int tailIndex;-- boolean isFull() {- return tailIndex == BLOCK_SIZE;- }-- boolean isEmpty() {- return headIndex == tailIndex;- }-- void add(RevObject c) {- objects[tailIndex++] = c;- }-- RevObject pop() {- return objects[headIndex++];- }-- void clear() {- next = null;- headIndex = 0;- tailIndex = 0;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.javadeleted file mode 100644index e855d8f700..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java+++ /dev/null@@ -1,147 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--abstract class BlockRevQueue extends AbstractRevQueue {- protected BlockFreeList free;-- /**- * Create an empty revision queue.- *- * @param firstParent- * whether only first-parent links should be followed when- * walking- */- protected BlockRevQueue(boolean firstParent) {- super(firstParent);- free = new BlockFreeList();- }-- BlockRevQueue(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s.firstParent);- free = new BlockFreeList();- outputType = s.outputType();- s.shareFreeList(this);- for (;;) {- final RevCommit c = s.next();- if (c == null)- break;- add(c);- }- }-- /**- * Reconfigure this queue to share the same free list as another.- * <p>- * Multiple revision queues can be connected to the same free list, making- * it less expensive for applications to shuttle commits between them. This- * method arranges for the receiver to take from / return to the same free- * list as the supplied queue.- * <p>- * Free lists are not thread-safe. Applications must ensure that all queues- * sharing the same free list are doing so from only a single thread.- *- * @param q- * another FIFO queue that wants to share our queue's free list.- *- * @see Generator#shareFreeList- */- @Override- public void shareFreeList(BlockRevQueue q) {- free = q.free;- }-- static final class BlockFreeList {- private Block next;-- Block newBlock() {- Block b = next;- if (b == null)- return new Block();- next = b.next;- b.clear();- return b;- }-- void freeBlock(Block b) {- b.next = next;- next = b;- }-- void clear() {- next = null;- }- }-- static final class Block {- static final int BLOCK_SIZE = 256;-- /** Next block in our chain of blocks; null if we are the last. */- Block next;-- /** Our table of queued commits. */- final RevCommit[] commits = new RevCommit[BLOCK_SIZE];-- /** Next valid entry in {@link #commits}. */- int headIndex;-- /** Next free entry in {@link #commits} for addition at. */- int tailIndex;-- boolean isFull() {- return tailIndex == BLOCK_SIZE;- }-- boolean isEmpty() {- return headIndex == tailIndex;- }-- boolean canUnpop() {- return headIndex > 0;- }-- void add(RevCommit c) {- commits[tailIndex++] = c;- }-- void unpop(RevCommit c) {- commits[--headIndex] = c;- }-- RevCommit pop() {- return commits[headIndex++];- }-- RevCommit peek() {- return commits[headIndex];- }-- void clear() {- next = null;- headIndex = 0;- tailIndex = 0;- }-- void resetToMiddle() {- headIndex = tailIndex = BLOCK_SIZE / 2;- }-- void resetToEnd() {- headIndex = tailIndex = BLOCK_SIZE;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.javadeleted file mode 100644index bdf63ff10b..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java+++ /dev/null@@ -1,110 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--class BoundaryGenerator extends Generator {- static final int UNINTERESTING = RevWalk.UNINTERESTING;-- Generator g;-- BoundaryGenerator(RevWalk w, Generator s) {- super(s.firstParent);- g = new InitialGenerator(w, s);- }-- @Override- int outputType() {- return g.outputType() | HAS_UNINTERESTING;- }-- @Override- void shareFreeList(BlockRevQueue q) {- g.shareFreeList(q);- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- return g.next();- }-- private class InitialGenerator extends Generator {- private static final int PARSED = RevWalk.PARSED;-- private static final int DUPLICATE = RevWalk.TEMP_MARK;-- private final RevWalk walk;-- private final FIFORevQueue held;-- private final Generator source;-- InitialGenerator(RevWalk w, Generator s) {- super(s.firstParent);- walk = w;- held = new FIFORevQueue(firstParent);- source = s;- source.shareFreeList(held);- }-- @Override- int outputType() {- return source.outputType();- }-- @Override- void shareFreeList(BlockRevQueue q) {- q.shareFreeList(held);- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevCommit c = source.next();- if (c != null) {- int n = c.getParentCount();- for (int i = 0; i < n; i++) {- if (firstParent && i > 0) {- break;- }- RevCommit p = c.getParent(i);- if ((p.flags & UNINTERESTING) != 0) {- held.add(p);- }- }- return c;- }-- final FIFORevQueue boundary = new FIFORevQueue(firstParent);- boundary.shareFreeList(held);- for (;;) {- c = held.next();- if (c == null)- break;- if ((c.flags & DUPLICATE) != 0)- continue;- if ((c.flags & PARSED) == 0)- c.parseHeaders(walk);- c.flags |= DUPLICATE;- boundary.add(c);- }- boundary.removeFlag(DUPLICATE);- g = boundary;- return boundary.next();- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevPriorityQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevPriorityQueue.javadeleted file mode 100644index 233dd64a3c..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevPriorityQueue.java+++ /dev/null@@ -1,150 +0,0 @@-/*- * Copyright (C) 2023, GerritForge Ltd- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk;--import java.util.concurrent.atomic.AtomicInteger;--import org.eclipse.jgit.annotations.Nullable;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;--import java.io.IOException;-import java.util.Comparator;-import java.util.PriorityQueue;--/**- * A queue of commits sorted by commit time order using a Java PriorityQueue.- * For the commits with the same commit time insertion order will be preserved.- */-class DateRevPriorityQueue extends DateRevQueue {- private PriorityQueue<RevCommitEntry> queue;-- private final AtomicInteger sequence = new AtomicInteger(1);-- /**- * Create an empty queue of commits sorted by commit time order.- */- public DateRevPriorityQueue() {- this(false);- }-- /**- * Create an empty queue of commits sorted by commit time order.- *- * @param firstParent- * treat first element as a parent- */- DateRevPriorityQueue(boolean firstParent) {- super(firstParent);- initPriorityQueue();- }-- private void initPriorityQueue() {- sequence.set(1);- queue = new PriorityQueue<>(Comparator.comparingInt(- (RevCommitEntry ent) -> ent.getEntry().getCommitTime())- .reversed()- .thenComparingInt(RevCommitEntry::getInsertSequenceNumber));- }-- DateRevPriorityQueue(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- this(s.firstParent);- for (;;) {- final RevCommit c = s.next();- if (c == null) {- break;- }- add(c);- }- }-- @Override- public void add(RevCommit c) {- // PriorityQueue does not accept null values. To keep the same behaviour- // do the same check and throw the same exception before creating entry- if (c == null) {- throw new NullPointerException(JGitText.get().nullRevCommit);- }- queue.add(new RevCommitEntry(sequence.getAndIncrement(), c));- }-- @Override- public RevCommit next() {- RevCommitEntry entry = queue.poll();- return entry == null ? null : entry.getEntry();- }-- /**- * Peek at the next commit, without removing it.- *- * @return the next available commit; null if there are no commits left.- */- @Override- public @Nullable RevCommit peek() {- RevCommitEntry entry = queue.peek();- return entry == null ? null : entry.getEntry();- }-- /**- * {@inheritDoc}- */- @Override- public void clear() {- sequence.set(1);- queue.clear();- }-- @Override- boolean everbodyHasFlag(int f) {- return queue.stream().map(RevCommitEntry::getEntry)- .noneMatch(c -> (c.flags & f) == 0);- }-- @Override- boolean anybodyHasFlag(int f) {- return queue.stream().map(RevCommitEntry::getEntry)- .anyMatch(c -> (c.flags & f) != 0);- }-- @Override- int outputType() {- return outputType | SORT_COMMIT_TIME_DESC;- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- for (RevCommitEntry e : queue) {- describe(s, e.getEntry());- }- return s.toString();- }-- private static class RevCommitEntry {- private final int insertSequenceNumber;-- private final RevCommit entry;-- public RevCommitEntry(int insertSequenceNumber, RevCommit entry) {- this.insertSequenceNumber = insertSequenceNumber;- this.entry = entry;- }-- public int getInsertSequenceNumber() {- return insertSequenceNumber;- }-- public RevCommit getEntry() {- return entry;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.javadeleted file mode 100644index 905dcb62ad..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java+++ /dev/null@@ -1,207 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]>,- * Copyright (C) 2013, Gustaf Lundh <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.annotations.Nullable;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * A queue of commits sorted by commit time order.- */-public class DateRevQueue extends AbstractRevQueue {- private static final int REBUILD_INDEX_COUNT = 1000;-- private Entry head;-- private Entry free;-- private int inQueue;-- private int sinceLastIndex;-- private Entry[] index;-- private int first;-- private int last = -1;-- /** Create an empty DateRevQueue. */- public DateRevQueue() {- super(false);- }-- /**- * Create an empty DateRevQueue.- *- * @param firstParent- * treat first element as a parent- */- DateRevQueue(boolean firstParent) {- super(firstParent);- }-- DateRevQueue(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s.firstParent);- for (;;) {- final RevCommit c = s.next();- if (c == null)- break;- add(c);- }- }-- @Override- public void add(RevCommit c) {- sinceLastIndex++;- if (++inQueue > REBUILD_INDEX_COUNT- && sinceLastIndex > REBUILD_INDEX_COUNT)- buildIndex();-- Entry q = head;- final long when = c.commitTime;-- if (first <= last && index[first].commit.commitTime > when) {- int low = first, high = last;- while (low <= high) {- int mid = (low + high) >>> 1;- int t = index[mid].commit.commitTime;- if (t < when)- high = mid - 1;- else if (t > when)- low = mid + 1;- else {- low = mid - 1;- break;- }- }- low = Math.min(low, high);- while (low > first && when == index[low].commit.commitTime)- --low;- q = index[low];- }-- final Entry n = newEntry(c);- if (q == null || (q == head && when > q.commit.commitTime)) {- n.next = q;- head = n;- } else {- Entry p = q.next;- while (p != null && p.commit.commitTime >= when) {- q = p;- p = q.next;- }- n.next = q.next;- q.next = n;- }- }-- @Override- public RevCommit next() {- final Entry q = head;- if (q == null)- return null;-- if (index != null && q == index[first])- index[first++] = null;- inQueue--;-- head = q.next;- freeEntry(q);- return q.commit;- }-- private void buildIndex() {- sinceLastIndex = 0;- first = 0;- index = new Entry[inQueue / 100 + 1];- int qi = 0, ii = 0;- for (Entry q = head; q != null; q = q.next) {- if (++qi % 100 == 0)- index[ii++] = q;- }- last = ii - 1;- }-- /**- * Peek at the next commit, without removing it.- *- * @return the next available commit; null if there are no commits left.- */- public @Nullable RevCommit peek() {- return head != null ? head.commit : null;- }-- @Override- public void clear() {- head = null;- free = null;- index = null;- inQueue = 0;- sinceLastIndex = 0;- last = -1;- }-- @Override- boolean everbodyHasFlag(int f) {- for (Entry q = head; q != null; q = q.next) {- if ((q.commit.flags & f) == 0)- return false;- }- return true;- }-- @Override- boolean anybodyHasFlag(int f) {- for (Entry q = head; q != null; q = q.next) {- if ((q.commit.flags & f) != 0)- return true;- }- return false;- }-- @Override- int outputType() {- return outputType | SORT_COMMIT_TIME_DESC;- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- for (Entry q = head; q != null; q = q.next)- describe(s, q.commit);- return s.toString();- }-- private Entry newEntry(RevCommit c) {- Entry r = free;- if (r == null)- r = new Entry();- else- free = r.next;- r.commit = c;- return r;- }-- private void freeEntry(Entry e) {- e.next = free;- free = e;- }-- static class Entry {- Entry next;-- RevCommit commit;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.javadeleted file mode 100644index 234c74b07f..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java+++ /dev/null@@ -1,67 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * Delays commits to be at least {@link PendingGenerator#OVER_SCAN} late.- * <p>- * This helps to "fix up" weird corner cases resulting from clock skew, by- * slowing down what we produce to the caller we get a better chance to ensure- * PendingGenerator reached back far enough in the graph to correctly mark- * commits {@link RevWalk#UNINTERESTING} if necessary.- * <p>- * This generator should appear before {@link FixUninterestingGenerator} if the- * lower level {@link #pending} isn't already fully buffered.- */-final class DelayRevQueue extends Generator {- private static final int OVER_SCAN = PendingGenerator.OVER_SCAN;-- private final Generator pending;-- private final FIFORevQueue delay;-- private int size;-- DelayRevQueue(Generator g) {- super(g.firstParent);- pending = g;- delay = new FIFORevQueue();- }-- @Override- int outputType() {- return pending.outputType();- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- while (size < OVER_SCAN) {- final RevCommit c = pending.next();- if (c == null)- break;- delay.add(c);- size++;- }-- final RevCommit c = delay.next();- if (c == null)- return null;- size--;- return c;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.javadeleted file mode 100644index c4acab436d..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java+++ /dev/null@@ -1,235 +0,0 @@-/*- * Copyright (C) 2010, Garmin International- * Copyright (C) 2010, Matt Fischer <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.ObjectId;--/**- * Only produce commits which are below a specified depth.- *- * @see DepthWalk- */-class DepthGenerator extends Generator {- private final FIFORevQueue pending;-- private final int depth;-- private final int deepenSince;-- private final RevWalk walk;-- /**- * Commits which used to be shallow in the client, but which are- * being extended as part of this fetch. These commits should be- * returned to the caller as UNINTERESTING so that their blobs/trees- * can be marked appropriately in the pack writer.- */- private final RevFlag UNSHALLOW;-- /**- * Commits which the normal framework has marked as UNINTERESTING,- * but which we now care about again. This happens if a client is- * extending a shallow checkout to become deeper--the new commits at- * the bottom of the graph need to be sent, even though they are- * below other commits which the client already has.- */- private final RevFlag REINTERESTING;-- /**- * Commits reachable from commits that the client specified using --shallow-exclude.- */- private final RevFlag DEEPEN_NOT;-- /**- * @param w- * walk used for depth filtering- * @param s- * Parent generator- * @throws MissingObjectException- * if an object is missing- * @throws IncorrectObjectTypeException- * if an object has an unexpected type- * @throws IOException- * if an IO error occurred- */- DepthGenerator(DepthWalk w, Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s.firstParent);- pending = new FIFORevQueue(firstParent);- walk = (RevWalk)w;-- this.depth = w.getDepth();- this.deepenSince = w.getDeepenSince();- this.UNSHALLOW = w.getUnshallowFlag();- this.REINTERESTING = w.getReinterestingFlag();- this.DEEPEN_NOT = w.getDeepenNotFlag();-- s.shareFreeList(pending);-- // Begin by sucking out all of the source's commits, and- // adding them to the pending queue- FIFORevQueue unshallowCommits = new FIFORevQueue();- for (;;) {- RevCommit c = s.next();- if (c == null)- break;- if (c.has(UNSHALLOW)) {- unshallowCommits.add(c);- } else if (((DepthWalk.Commit) c).getDepth() == 0) {- pending.add(c);- }- }- // Move unshallow commits to the front so that the REINTERESTING flag- // carry over code is executed first.- for (;;) {- RevCommit c = unshallowCommits.next();- if (c == null) {- break;- }- pending.unpop(c);- }-- // Mark DEEPEN_NOT on all deepen-not commits and their ancestors.- // inefficient in that any "deepen-not <ref>" in the request- // results in all commits reachable from that ref being parsed- // and marked, even if the commit topology is such that it is- // not necessary.- for (ObjectId oid : w.getDeepenNots()) {- RevCommit c;- try {- c = walk.parseCommit(oid);- } catch (IncorrectObjectTypeException notCommit) {- // The C Git implementation silently tolerates- // non-commits, so do the same here.- continue;- }-- FIFORevQueue queue = new FIFORevQueue();- queue.add(c);- while ((c = queue.next()) != null) {- if (c.has(DEEPEN_NOT)) {- continue;- }-- walk.parseHeaders(c);- c.add(DEEPEN_NOT);- for (RevCommit p : c.getParents()) {- queue.add(p);- }- }- }- }-- @Override- int outputType() {- return pending.outputType() | HAS_UNINTERESTING;- }-- @Override- void shareFreeList(BlockRevQueue q) {- pending.shareFreeList(q);- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- // Perform a breadth-first descent into the commit graph,- // marking depths as we go. This means that if a commit is- // reachable by more than one route, we are guaranteed to- // arrive by the shortest route first.- for (;;) {- final DepthWalk.Commit c = (DepthWalk.Commit) pending.next();- if (c == null)- return null;-- if ((c.flags & RevWalk.PARSED) == 0)- c.parseHeaders(walk);-- if (c.getCommitTime() < deepenSince) {- continue;- }-- if (c.has(DEEPEN_NOT)) {- continue;- }-- int newDepth = c.depth + 1;-- int n = c.getParentCount();- for (int i = 0; i < n; i++) {- if (firstParent && i > 0) {- break;- }- RevCommit p = c.getParent(i);- DepthWalk.Commit dp = (DepthWalk.Commit) p;-- // If no depth has been assigned to this commit, assign- // it now. Since we arrive by the shortest route first,- // this depth is guaranteed to be the smallest value that- // any path could produce.- if (dp.depth == -1) {- boolean failsDeepenSince = false;- if (deepenSince != 0) {- if ((p.flags & RevWalk.PARSED) == 0) {- p.parseHeaders(walk);- }- failsDeepenSince =- p.getCommitTime() < deepenSince;- }-- dp.depth = newDepth;-- // If the parent is not too deep and was not excluded, add- // it to the queue so that we can produce it later- if (newDepth <= depth && !failsDeepenSince &&- !p.has(DEEPEN_NOT)) {- pending.add(p);- } else {- dp.makesChildBoundary = true;- }- }-- if (dp.makesChildBoundary) {- c.isBoundary = true;- }-- // If the current commit has become unshallowed, everything- // below us is new to the client. Mark its parent as- // re-interesting, and carry that flag downward to all- // of its ancestors.- if(c.has(UNSHALLOW) || c.has(REINTERESTING)) {- p.add(REINTERESTING);- p.flags &= ~RevWalk.UNINTERESTING;- }- }-- boolean produce = true;-- // Unshallow commits are uninteresting, but still need to be sent- // up to the PackWriter so that it will exclude objects correctly.- // All other uninteresting commits should be omitted.- if ((c.flags & RevWalk.UNINTERESTING) != 0 && !c.has(UNSHALLOW))- produce = false;-- if (c.getCommitTime() < deepenSince) {- produce = false;- }-- if (produce)- return c;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.javadeleted file mode 100644index a7ffd34233..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java+++ /dev/null@@ -1,405 +0,0 @@-/*- * Copyright (C) 2010, Garmin International- * Copyright (C) 2010, Matt Fischer <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.Collections;-import java.util.List;-import java.util.Objects;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.Repository;--/**- * Interface for revision walkers that perform depth filtering.- */-public interface DepthWalk {- /**- * Get depth to filter to.- *- * @return Depth to filter to.- */- int getDepth();-- /**- * Get deepen-since value- *- * @return the deepen-since value; if not 0, this walk only returns commits- * whose commit time is at or after this limit- * @since 5.2- */- default int getDeepenSince() {- return 0;- }-- /**- * Get deepen-not values- *- * @return the objects specified by the client using --shallow-exclude- * @since 5.2- */- default List<ObjectId> getDeepenNots() {- return Collections.emptyList();- }-- /**- * Get unshallow flag- *- * @return flag marking commits that should become unshallow.- */- /**- * Get flag marking commits that should become unshallow.- *- * @return flag marking commits that should become unshallow.- */- RevFlag getUnshallowFlag();-- /**- * Get flag marking commits that are interesting again.- *- * @return flag marking commits that are interesting again.- */- RevFlag getReinterestingFlag();-- /**- * Get deepen-not flag- *- * @return flag marking commits that are to be excluded because of- * --shallow-exclude- * @since 5.2- */- RevFlag getDeepenNotFlag();-- /** RevCommit with a depth (in commits) from a root. */- public static class Commit extends RevCommit {- /** Depth of this commit in the graph, via shortest path. */- int depth;-- boolean isBoundary;-- /**- * True if this commit was excluded due to a shallow fetch- * setting. All its children are thus boundary commits.- */- boolean makesChildBoundary;-- /**- * Get depth- *- * @return depth of this commit, as found by the shortest path.- */- public int getDepth() {- return depth;- }-- /**- * Whether at least one commit was excluded due to shallow fetch- *- * @return true if at least one of this commit's parents was excluded- * due to a shallow fetch setting, false otherwise- * @since 5.2- */- public boolean isBoundary() {- return isBoundary;- }-- /**- * Initialize a new commit.- *- * @param id- * object name for the commit.- */- protected Commit(AnyObjectId id) {- super(id);- depth = -1;- }- }-- /** Subclass of RevWalk that performs depth filtering. */- public class RevWalk extends org.eclipse.jgit.revwalk.RevWalk implements DepthWalk {- private final int depth;-- private int deepenSince;-- private List<ObjectId> deepenNots;-- private final RevFlag UNSHALLOW;-- private final RevFlag REINTERESTING;-- private final RevFlag DEEPEN_NOT;-- /**- * Create RevWalk- *- * @param repo- * Repository to walk- * @param depth- * Maximum depth to return- */- public RevWalk(Repository repo, int depth) {- super(repo);-- this.depth = depth;- this.deepenNots = Collections.emptyList();- this.UNSHALLOW = newFlag("UNSHALLOW"); //$NON-NLS-1$- this.REINTERESTING = newFlag("REINTERESTING"); //$NON-NLS-1$- this.DEEPEN_NOT = newFlag("DEEPEN_NOT"); //$NON-NLS-1$- }-- /**- * Create RevWalk- *- * @param or- * ObjectReader to use- * @param depth- * Maximum depth to return- */- public RevWalk(ObjectReader or, int depth) {- super(or);-- this.depth = depth;- this.deepenNots = Collections.emptyList();- this.UNSHALLOW = newFlag("UNSHALLOW"); //$NON-NLS-1$- this.REINTERESTING = newFlag("REINTERESTING"); //$NON-NLS-1$- this.DEEPEN_NOT = newFlag("DEEPEN_NOT"); //$NON-NLS-1$- }-- /**- * Mark a root commit (i.e., one whose depth should be considered 0.)- *- * @param c- * Commit to mark- * @throws IOException- * if an IO error occurred- * @throws IncorrectObjectTypeException- * if object has an unexpected type- * @throws MissingObjectException- * if object is missing- */- public void markRoot(RevCommit c) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (c instanceof Commit)- ((Commit) c).depth = 0;- super.markStart(c);- }-- @Override- protected RevCommit createCommit(AnyObjectId id) {- return new Commit(id);- }-- @Override- public int getDepth() {- return depth;- }-- @Override- public int getDeepenSince() {- return deepenSince;- }-- /**- * Sets the deepen-since value.- *- * @param limit- * new deepen-since value- * @since 5.2- */- public void setDeepenSince(int limit) {- deepenSince = limit;- }-- @Override- public List<ObjectId> getDeepenNots() {- return deepenNots;- }-- /**- * Mark objects that the client specified using- * --shallow-exclude. Objects that are not commits have no- * effect.- *- * @param deepenNots specified objects- * @since 5.2- */- public void setDeepenNots(List<ObjectId> deepenNots) {- this.deepenNots = Objects.requireNonNull(deepenNots);- }-- @Override- public RevFlag getUnshallowFlag() {- return UNSHALLOW;- }-- @Override- public RevFlag getReinterestingFlag() {- return REINTERESTING;- }-- @Override- public RevFlag getDeepenNotFlag() {- return DEEPEN_NOT;- }-- /**- * Convert to ObjectWalk with same objects- *- * @since 4.5- */- @Override- public ObjectWalk toObjectWalkWithSameObjects() {- ObjectWalk ow = new ObjectWalk(reader, depth);- ow.deepenSince = deepenSince;- ow.deepenNots = deepenNots;- ow.objects = objects;- ow.freeFlags = freeFlags;- return ow;- }- }-- /** Subclass of ObjectWalk that performs depth filtering. */- public class ObjectWalk extends org.eclipse.jgit.revwalk.ObjectWalk implements DepthWalk {- private final int depth;-- private int deepenSince;-- private List<ObjectId> deepenNots;-- private final RevFlag UNSHALLOW;-- private final RevFlag REINTERESTING;-- private final RevFlag DEEPEN_NOT;-- /**- * Create ObjectWalk- *- * @param repo- * Repository to walk- * @param depth- * Maximum depth to return- */- public ObjectWalk(Repository repo, int depth) {- super(repo);-- this.depth = depth;- this.deepenNots = Collections.emptyList();- this.UNSHALLOW = newFlag("UNSHALLOW"); //$NON-NLS-1$- this.REINTERESTING = newFlag("REINTERESTING"); //$NON-NLS-1$- this.DEEPEN_NOT = newFlag("DEEPEN_NOT"); //$NON-NLS-1$- }-- /**- * Create ObjectWalk- *- * @param or- * Object Reader- * @param depth- * Maximum depth to return- */- public ObjectWalk(ObjectReader or, int depth) {- super(or);-- this.depth = depth;- this.deepenNots = Collections.emptyList();- this.UNSHALLOW = newFlag("UNSHALLOW"); //$NON-NLS-1$- this.REINTERESTING = newFlag("REINTERESTING"); //$NON-NLS-1$- this.DEEPEN_NOT = newFlag("DEEPEN_NOT"); //$NON-NLS-1$- }-- /**- * Mark a root commit (i.e., one whose depth should be considered 0.)- *- * @param o- * Commit to mark- * @throws IOException- * if an IO error occurred- * @throws IncorrectObjectTypeException- * if object has an unexpected type- * @throws MissingObjectException- * if object is missing- */- public void markRoot(RevObject o) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevObject c = o;- while (c instanceof RevTag) {- c = ((RevTag) c).getObject();- parseHeaders(c);- }- if (c instanceof Commit)- ((Commit) c).depth = 0;- super.markStart(o);- }-- /**- * Mark an element which used to be shallow in the client, but which- * should now be considered a full commit. Any ancestors of this commit- * should be included in the walk, even if they are the ancestor of an- * uninteresting commit.- *- * @param c- * Commit to mark- * @throws MissingObjectException- * if object is missing- * @throws IncorrectObjectTypeException- * if object has an unexpected type- * @throws IOException- * if an IO error occurred- */- public void markUnshallow(RevObject c) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (c instanceof RevCommit)- c.add(UNSHALLOW);- super.markStart(c);- }-- @Override- protected RevCommit createCommit(AnyObjectId id) {- return new Commit(id);- }-- @Override- public int getDepth() {- return depth;- }-- @Override- public int getDeepenSince() {- return deepenSince;- }-- @Override- public List<ObjectId> getDeepenNots() {- return deepenNots;- }-- @Override- public RevFlag getUnshallowFlag() {- return UNSHALLOW;- }-- @Override- public RevFlag getReinterestingFlag() {- return REINTERESTING;- }-- @Override- public RevFlag getDeepenNotFlag() {- return DEEPEN_NOT;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.javadeleted file mode 100644index 4c93c574bd..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java+++ /dev/null@@ -1,29 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--class EndGenerator extends Generator {- static final EndGenerator INSTANCE = new EndGenerator();-- private EndGenerator() {- super(false);- }-- @Override- RevCommit next() {- return null;- }-- @Override- int outputType() {- return 0;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.javadeleted file mode 100644index 996745c158..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java+++ /dev/null@@ -1,144 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * A queue of commits in FIFO order.- */-public class FIFORevQueue extends BlockRevQueue {- private Block head;-- private Block tail;-- /** Create an empty FIFO queue. */- public FIFORevQueue() {- super(false);- }-- FIFORevQueue(boolean firstParent) {- super(firstParent);- }-- FIFORevQueue(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s);- }-- @Override- public void add(RevCommit c) {- Block b = tail;- if (b == null) {- b = free.newBlock();- b.add(c);- head = b;- tail = b;- return;- } else if (b.isFull()) {- b = free.newBlock();- tail.next = b;- tail = b;- }- b.add(c);- }-- /**- * Insert the commit pointer at the front of the queue.- *- * @param c- * the commit to insert into the queue.- */- public void unpop(RevCommit c) {- Block b = head;- if (b == null) {- b = free.newBlock();- b.resetToMiddle();- b.add(c);- head = b;- tail = b;- return;- } else if (b.canUnpop()) {- b.unpop(c);- return;- }-- b = free.newBlock();- b.resetToEnd();- b.unpop(c);- b.next = head;- head = b;- }-- @Override- public RevCommit next() {- final Block b = head;- if (b == null)- return null;-- final RevCommit c = b.pop();- if (b.isEmpty()) {- head = b.next;- if (head == null)- tail = null;- free.freeBlock(b);- }- return c;- }-- @Override- public void clear() {- head = null;- tail = null;- free.clear();- }-- @Override- boolean everbodyHasFlag(int f) {- for (Block b = head; b != null; b = b.next) {- for (int i = b.headIndex; i < b.tailIndex; i++)- if ((b.commits[i].flags & f) == 0)- return false;- }- return true;- }-- @Override- boolean anybodyHasFlag(int f) {- for (Block b = head; b != null; b = b.next) {- for (int i = b.headIndex; i < b.tailIndex; i++)- if ((b.commits[i].flags & f) != 0)- return true;- }- return false;- }-- void removeFlag(int f) {- final int not_f = ~f;- for (Block b = head; b != null; b = b.next) {- for (int i = b.headIndex; i < b.tailIndex; i++)- b.commits[i].flags &= not_f;- }- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- for (Block q = head; q != null; q = q.next) {- for (int i = q.headIndex; i < q.tailIndex; i++)- describe(s, q.commits[i]);- }- return s.toString();- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.javadeleted file mode 100644index ec7db112c8..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java+++ /dev/null@@ -1,52 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * Filters out commits marked {@link RevWalk#UNINTERESTING}.- * <p>- * This generator is only in front of another generator that has fully buffered- * commits, such that we are called only after the {@link PendingGenerator} has- * exhausted its input queue and given up. It skips over any uninteresting- * commits that may have leaked out of the PendingGenerator due to clock skew- * being detected in the commit objects.- */-final class FixUninterestingGenerator extends Generator {- private final Generator pending;-- FixUninterestingGenerator(Generator g) {- super(g.firstParent);- pending = g;- }-- @Override- int outputType() {- return pending.outputType();- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit c = pending.next();- if (c == null)- return null;- if ((c.flags & RevWalk.UNINTERESTING) == 0)- return c;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.javadeleted file mode 100644index f946e32a84..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java+++ /dev/null@@ -1,131 +0,0 @@-/*- * Copyright (C) 2010, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.Optional;-import java.util.Set;--import org.eclipse.jgit.diff.DiffConfig;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.treewalk.filter.PathFilter;-import org.eclipse.jgit.treewalk.filter.TreeFilter;--/**- * Updates the internal path filter to follow copy/renames.- * <p>- * This is a special filter that performs {@code AND(path, ANY_DIFF)}, but also- * triggers rename detection so that the path node is updated to include a prior- * file name as the RevWalk traverses history.- *- * The renames found will be reported to a- * {@link org.eclipse.jgit.revwalk.RenameCallback} if one is set.- * <p>- * Results with this filter are unpredictable if the path being followed is a- * subdirectory.- */-public class FollowFilter extends TreeFilter {- /**- * Create a new tree filter for a user supplied path.- * <p>- * Path strings are relative to the root of the repository. If the user's- * input should be assumed relative to a subdirectory of the repository the- * caller must prepend the subdirectory's path prior to creating the filter.- * <p>- * Path strings use '/' to delimit directories on all platforms.- *- * @param path- * the path to filter on. Must not be the empty string. All- * trailing '/' characters will be trimmed before string's length- * is checked or is used as part of the constructed filter.- * @param cfg- * diff config specifying rename detection options.- * @return a new filter for the requested path.- * @throws java.lang.IllegalArgumentException- * the path supplied was the empty string.- * @since 3.0- */- public static FollowFilter create(String path, DiffConfig cfg) {- return new FollowFilter(PathFilter.create(path), cfg);- }-- private final PathFilter path;- final DiffConfig cfg;-- private RenameCallback renameCallback;-- FollowFilter(PathFilter path, DiffConfig cfg) {- this.path = path;- this.cfg = cfg;- }-- /** @return the path this filter matches. */- /**- * Get the path this filter matches.- *- * @return the path this filter matches.- */- public String getPath() {- return path.getPath();- }-- @Override- public boolean include(TreeWalk walker)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return path.include(walker) && ANY_DIFF.include(walker);- }-- @Override- public boolean shouldBeRecursive() {- return path.shouldBeRecursive() || ANY_DIFF.shouldBeRecursive();- }-- @Override- public Optional<Set<byte[]>> getPathsBestEffort() {- return path.getPathsBestEffort();- }-- /** {@inheritDoc} */- @Override- public TreeFilter clone() {- return new FollowFilter(path.clone(), cfg);- }-- @Override- public String toString() {- return "(FOLLOW(" + path.toString() + ")" //- + " AND " //- + ANY_DIFF.toString() + ")";- }-- /**- * Get the callback to which renames are reported.- *- * @return the callback to which renames are reported, or <code>null</code>- * if none- */- public RenameCallback getRenameCallback() {- return renameCallback;- }-- /**- * Sets the callback to which renames shall be reported.- *- * @param callback- * the callback to use- */- public void setRenameCallback(RenameCallback callback) {- renameCallback = callback;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.javadeleted file mode 100644index d6733ea34b..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java+++ /dev/null@@ -1,58 +0,0 @@-/*- * Copyright (C) 2009, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.util.Locale;--import org.eclipse.jgit.lib.Constants;--/**- * Case insensitive key for a {@link org.eclipse.jgit.revwalk.FooterLine}.- */-public final class FooterKey {- /** Standard {@code Signed-off-by} */- public static final FooterKey SIGNED_OFF_BY = new FooterKey("Signed-off-by"); //$NON-NLS-1$-- /** Standard {@code Acked-by} */- public static final FooterKey ACKED_BY = new FooterKey("Acked-by"); //$NON-NLS-1$-- /** Standard {@code CC} */- public static final FooterKey CC = new FooterKey("CC"); //$NON-NLS-1$-- private final String name;-- final byte[] raw;-- /**- * Create a key for a specific footer line.- *- * @param keyName- * name of the footer line.- */- public FooterKey(String keyName) {- name = keyName;- raw = Constants.encode(keyName.toLowerCase(Locale.ROOT));- }-- /**- * Get name of this footer line.- *- * @return name of this footer line.- */- public String getName() {- return name;- }-- @Override- public String toString() {- return "FooterKey[" + name + "]";- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterLine.javadeleted file mode 100644index fa7fb316c9..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java+++ /dev/null@@ -1,280 +0,0 @@-/*- * Copyright (C) 2009, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.nio.charset.Charset;-import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.eclipse.jgit.util.RawParseUtils;--/**- * Single line at the end of a message, such as a "Signed-off-by: someone".- * <p>- * These footer lines tend to be used to represent additional information about- * a commit, like the path it followed through reviewers before finally being- * accepted into the project's main repository as an immutable commit.- *- * @see RevCommit#getFooterLines()- */-public final class FooterLine {- private final byte[] buffer;-- private final Charset enc;-- private final int keyStart;-- private final int keyEnd;-- private final int valStart;-- private final int valEnd;-- FooterLine(final byte[] b, final Charset e, final int ks, final int ke,- final int vs, final int ve) {- buffer = b;- enc = e;- keyStart = ks;- keyEnd = ke;- valStart = vs;- valEnd = ve;- }-- /**- * Extract the footer lines from the given message.- *- * @param str- * the message to extract footers from.- * @return ordered list of footer lines; empty list if no footers found.- * @see RevCommit#getFooterLines()- * @since 6.7- */- public static List<FooterLine> fromMessage(- String str) {- return fromMessage(str.getBytes());- }-- /**- * Extract the footer lines from the given message.- *- * @param raw- * the raw message to extract footers from.- * @return ordered list of footer lines; empty list if no footers found.- * @see RevCommit#getFooterLines()- * @since 6.7- */- public static List<FooterLine> fromMessage(- byte[] raw) {- // Find the end of the last paragraph.- int parEnd = raw.length;- for (; parEnd > 0 && (raw[parEnd - 1] == '\n'- || raw[parEnd - 1] == ' '); --parEnd) {- // empty- }-- // The first non-header line is never a footer.- int msgB = RawParseUtils.nextLfSkippingSplitLines(raw,- RawParseUtils.hasAnyKnownHeaders(raw)- ? RawParseUtils.commitMessage(raw, 0)- : 0);- ArrayList<FooterLine> r = new ArrayList<>(4);- Charset enc = RawParseUtils.guessEncoding(raw);-- // Search for the beginning of last paragraph- int parStart = parEnd;- for (; parStart > msgB; --parStart) {- if (parStart < 2) {- // Too close to beginning: this is not a raw message- parStart = 0;- break;- }- if (raw[parStart - 1] == '\n' && raw[parStart - 2] == '\n') {- break;- }- }-- for (int ptr = parStart; ptr < parEnd;) {- int keyStart = ptr;- int keyEnd = RawParseUtils.endOfFooterLineKey(raw, ptr);- if (keyEnd < 0) {- // Not a well-formed footer line, skip it.- ptr = RawParseUtils.nextLF(raw, ptr);- continue;- }-- // Skip over the ': *' at the end of the key before the value.- int valStart;- int valEnd;- for (valStart = keyEnd + 1; valStart < raw.length- && raw[valStart] == ' '; ++valStart) {- // empty- }-- for(ptr = valStart;;) {- ptr = RawParseUtils.nextLF(raw, ptr);- // Next line starts with whitespace for a multiline footer.- if (ptr == raw.length || raw[ptr] != ' ') {- valEnd = raw[ptr - 1] == '\n' ? ptr - 1 : ptr;- break;- }- }- if (keyStart == msgB) {- // Fist line cannot be a footer- continue;- }- r.add(new FooterLine(raw, enc, keyStart, keyEnd, valStart, valEnd));- }-- return r;- }-- /**- * Get the values of all footer lines with the given key.- *- * @param footers- * list of footers to find the values in.- * @param keyName- * footer key to find values of, case-insensitive.- * @return values of footers with key of {@code keyName}, ordered by their- * order of appearance. Duplicates may be returned if the same- * footer appeared more than once. Empty list if no footers appear- * with the specified key, or there are no footers at all.- * @see #fromMessage- * @since 6.7- */- public static List<String> getValues(List<FooterLine> footers, String keyName) {- return getValues(footers, new FooterKey(keyName));- }-- /**- * Get the values of all footer lines with the given key.- *- * @param footers- * list of footers to find the values in.- * @param key- * footer key to find values of, case-insensitive.- * @return values of footers with key of {@code keyName}, ordered by their- * order of appearance. Duplicates may be returned if the same- * footer appeared more than once. Empty list if no footers appear- * with the specified key, or there are no footers at all.- * @see #fromMessage- * @since 6.7- */- public static List<String> getValues(List<FooterLine> footers, FooterKey key) {- if (footers.isEmpty())- return Collections.emptyList();- ArrayList<String> r = new ArrayList<>(footers.size());- for (FooterLine f : footers) {- if (f.matches(key))- r.add(f.getValue());- }- return r;- }-- /**- * Whether keys match- *- * @param key- * key to test this line's key name against.- * @return true if {@code key.getName().equalsIgnorecase(getKey())}.- */- public boolean matches(FooterKey key) {- final byte[] kRaw = key.raw;- final int len = kRaw.length;- int bPtr = keyStart;- if (keyEnd - bPtr != len)- return false;- for (int kPtr = 0; kPtr < len;) {- byte b = buffer[bPtr++];- if ('A' <= b && b <= 'Z')- b += (byte) ('a' - 'A');- if (b != kRaw[kPtr++])- return false;- }- return true;- }-- /**- * Get key name of this footer.- *- * @return key name of this footer; that is the text before the ":" on the- * line footer's line. The text is decoded according to the commit's- * specified (or assumed) character encoding.- */- public String getKey() {- return RawParseUtils.decode(enc, buffer, keyStart, keyEnd);- }-- /**- * Get value of this footer.- *- * @return value of this footer; that is the text after the ":" and any- * leading whitespace has been skipped. May be the empty string if- * the footer has no value (line ended with ":"). The text is- * decoded according to the commit's specified (or assumed)- * character encoding.- */- public String getValue() {- return RawParseUtils.decode(enc, buffer, valStart, valEnd).replaceAll("\n +", " "); //$NON-NLS-1$ //$NON-NLS-2$- }-- /**- * Extract the email address (if present) from the footer.- * <p>- * If there is an email address looking string inside of angle brackets- * (e.g. "<a@b>"), the return value is the part extracted from inside the- * brackets. If no brackets are found, then {@link #getValue()} is returned- * if the value contains an '@' sign. Otherwise, null.- *- * @return email address appearing in the value of this footer, or null.- */- public String getEmailAddress() {- final int lt = RawParseUtils.nextLF(buffer, valStart, '<');- if (valEnd <= lt) {- final int at = RawParseUtils.nextLF(buffer, valStart, '@');- if (valStart < at && at < valEnd)- return getValue();- return null;- }- final int gt = RawParseUtils.nextLF(buffer, lt, '>');- if (valEnd < gt)- return null;- return RawParseUtils.decode(enc, buffer, lt, gt - 1);- }-- /**- * @return start offset of the footer relative to the original raw message- * byte buffer- *- * @see #fromMessage(byte[])- * @since 6.9- */- public int getStartOffset() {- return keyStart;- }-- /**- * @return end offset of the footer relative to the original raw message- * byte buffer- *- * @see #fromMessage(byte[])- * @since 6.9- */- public int getEndOffset() {- return valEnd;- }-- @Override- public String toString() {- return getKey() + ": " + getValue(); //$NON-NLS-1$- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/Generator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/Generator.javadeleted file mode 100644index d97812ff45..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/Generator.java+++ /dev/null@@ -1,82 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * Produces commits for RevWalk to return to applications.- * <p>- * Implementations of this basic class provide the real work behind RevWalk.- * Conceptually a Generator is an iterator or a queue, it returns commits until- * there are no more relevant. Generators may be piped/stacked together to- * create a more complex set of operations.- *- * @see PendingGenerator- * @see StartGenerator- */-abstract class Generator {- /** Commits are sorted by commit date and time, descending. */- static final int SORT_COMMIT_TIME_DESC = 1 << 0;-- /** Output may have {@link RevWalk#REWRITE} marked on it. */- static final int HAS_REWRITE = 1 << 1;-- /** Output needs {@link RewriteGenerator}. */- static final int NEEDS_REWRITE = 1 << 2;-- /** Topological ordering is enforced (all children before parents). */- static final int SORT_TOPO = 1 << 3;-- /** Output may have {@link RevWalk#UNINTERESTING} marked on it. */- static final int HAS_UNINTERESTING = 1 << 4;-- protected final boolean firstParent;-- protected Generator(boolean firstParent) {- this.firstParent = firstParent;- }-- /**- * Connect the supplied queue to this generator's own free list (if any).- *- * @param q- * another FIFO queue that wants to share our queue's free list.- */- void shareFreeList(BlockRevQueue q) {- // Do nothing by default.- }-- /**- * Obtain flags describing the output behavior of this generator.- *- * @return one or more of the constants declared in this class, describing- * how this generator produces its results.- */- abstract int outputType();-- /**- * Return the next commit to the application, or the next generator.- *- * @return next available commit; null if no more are to be returned.- * @throws MissingObjectException- * if an object is missing- * @throws IncorrectObjectTypeException- * if an object has an unexpected type- * @throws IOException- * if an IO error occurred- */- abstract RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException;-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.javadeleted file mode 100644index ae67ca7599..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java+++ /dev/null@@ -1,98 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * A queue of commits in LIFO order.- */-public class LIFORevQueue extends BlockRevQueue {- private Block head;-- /**- * Create an empty LIFO queue.- */- public LIFORevQueue() {- super(false);- }-- LIFORevQueue(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s);- }-- @Override- public void add(RevCommit c) {- Block b = head;- if (b == null || !b.canUnpop()) {- b = free.newBlock();- b.resetToEnd();- b.next = head;- head = b;- }- b.unpop(c);- }-- @Override- public RevCommit next() {- final Block b = head;- if (b == null)- return null;-- final RevCommit c = b.pop();- if (b.isEmpty()) {- head = b.next;- free.freeBlock(b);- }- return c;- }-- @Override- public void clear() {- head = null;- free.clear();- }-- @Override- boolean everbodyHasFlag(int f) {- for (Block b = head; b != null; b = b.next) {- for (int i = b.headIndex; i < b.tailIndex; i++)- if ((b.commits[i].flags & f) == 0)- return false;- }- return true;- }-- @Override- boolean anybodyHasFlag(int f) {- for (Block b = head; b != null; b = b.next) {- for (int i = b.headIndex; i < b.tailIndex; i++)- if ((b.commits[i].flags & f) != 0)- return true;- }- return false;- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- for (Block q = head; q != null; q = q.next) {- for (int i = q.headIndex; i < q.tailIndex; i++)- describe(s, q.commits[i]);- }- return s.toString();- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.javadeleted file mode 100644index 31bf114ebd..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java+++ /dev/null@@ -1,409 +0,0 @@-package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.io.Serializable;-import java.nio.charset.StandardCharsets;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Map;-import java.util.Set;-import java.util.concurrent.atomic.AtomicReference;--import org.jspecify.annotations.Nullable;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;-import org.eclipse.jgit.revwalk.filter.RevFilter;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.treewalk.filter.TreeFilter;-import org.eclipse.jgit.util.RawParseUtils;--import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.git.GitUtils;--/**- * This class calculates last commits of children of a git tree.- *- * @author robin- *- */-public final class LastCommitsOfChildren extends HashMap<String, Value> {-- private static final long serialVersionUID = 1L;-- private static final int PARSED = RevWalk.PARSED;-- public LastCommitsOfChildren(Repository repo, AnyObjectId until) {- this(repo, until, null, null);- }-- public LastCommitsOfChildren(Repository repo, AnyObjectId until, @Nullable String treePath) {- this(repo, until, treePath, null);- }-- public LastCommitsOfChildren(Repository repo, AnyObjectId until, @Nullable Cache cache) {- this(repo, until, null, cache);- }-- /**- * Constructs a hashmap with key representing child name under specified tree, and value- * represents last commit info of the child.- *- * @param repo- * repository to get last commits info- * @param until- * get last commits no newer than this commit- * @param treePath- * parent directory to get children commit info under, use- * empty string or <tt>null</tt> to refer to repository root- * @param cache- * optional cache to speed up calculation- */- public LastCommitsOfChildren(final Repository repo, AnyObjectId until,- @Nullable String treePath, @Nullable final Cache cache) {- try (RevWalk revWalk = new RevWalk(repo)) {- treePath = GitUtils.normalizePath(treePath);- if (treePath == null)- treePath = "";-- final byte[] treePathRaw = Constants.encode(treePath);- final Set<String> children = new HashSet<>();- final Set<String> modifiedChildren = new HashSet<>();-- RevCommit untilCommit = revWalk.parseCommit(until);-- /*- * Find out child directory or file names under the tree- */- if (treePath.length() != 0) {- TreeWalk treeWalk = TreeWalk.forPath(repo, treePath, untilCommit.getTree());- if (treeWalk == null || !FileMode.TREE.equals(treeWalk.getFileMode(0)))- throw new IllegalArgumentException("Path '" + treePath + "' does not exist or is not a tree.");- treeWalk.enterSubtree();- treeWalk.setRecursive(false);- while (treeWalk.next())- children.add(treeWalk.getPathString().substring(treePath.length()+1));- } else {- try (TreeWalk treeWalk = new TreeWalk(repo)) {- treeWalk.addTree(untilCommit.getTree());- treeWalk.setRecursive(false);- while (treeWalk.next())- children.add(treeWalk.getPathString().substring(treePath.length()));- }- }-- revWalk.markStart(untilCommit);- revWalk.setRewriteParents(false);-- /*- * Records last commits info of first encountered commit in cache, and we- * will mark this commit and all its ancestor commits with cached flag- */- final AtomicReference<Map<String, Value>> lastCommitsRef = new AtomicReference<>();-- // flag to mark visited commits- final RevFlag visited = revWalk.newFlag("visited");-- // flag to mark cached commits- final RevFlag cached = revWalk.newFlag("cached");-- revWalk.setRevFilter(new RevFilter() {-- @Override- public boolean include(RevWalk revWalker, RevCommit commit)- throws StopWalkException, MissingObjectException, IncorrectObjectTypeException, IOException {- commit.add(visited);-- Map<String, Value> lastCommits = lastCommitsRef.get();- if (lastCommits == null && cache != null) {- lastCommits = cache.getLastCommitsOfChildren(commit.getId());- if (lastCommits != null) {- commit.add(cached);- lastCommitsRef.set(lastCommits);- }- }-- /*- * If a commit is marked as cached, then mark all its parents as- * cached, and when those parents are visited, parents of those- * parents will be marked as cached in turn. This way we can- * mark the whole tree (may leave some part inevitably) rooted- * at the commit whose last commits are already cached.- */- if (commit.has(cached))- cacheParents(commit.parents, cached, visited);-- /*- * Check if current commit and all pending commits in queue- * are all marked as cached, if yes, we will be confident that- * cached last commits info can complement our last commits- * info. Note that if some of the queued commit is not marked- * as cached, then we cannot do the complement as ancestors of- * those non-cached commits in queue affecting some children- * might be newer than last commit being cached- */- DateRevQueue queue = (DateRevQueue) revWalker.queue;- if (commit.has(cached) && queue.everbodyHasFlag(cached.mask)) {- for (Map.Entry<String, Value> entry: lastCommits.entrySet()) {- String child = entry.getKey();- if (children.contains(child) && !containsKey(child))- put(child, entry.getValue());- }- commit.parents = RevCommit.NO_PARENTS;- return true;- }-- try (TreeWalk treeWalker = new TreeWalk(revWalker.reader)) {- treeWalker.setRecursive(true);-- RevCommit[] pList = commit.parents;- int nParents = pList.length;-- ObjectId[] trees = new ObjectId[nParents + 1];- for (int i = 0; i < nParents; i++) {- RevCommit p = commit.parents[i];- if ((p.flags & PARSED) == 0)- p.parseHeaders(revWalker);- trees[i] = p.getTree();- }- trees[nParents] = commit.getTree();- treeWalker.reset(trees);-- final boolean[] changed = new boolean[nParents];- final AtomicReference<String> childRef = new AtomicReference<>();-- treeWalker.setFilter(new TreeFilter() {-- @Override- public boolean include(TreeWalk walker)- throws MissingObjectException, IncorrectObjectTypeException, IOException {- if (treePathRaw.length == 0 || walker.isPathPrefix(treePathRaw, treePathRaw.length) == 0) {- // we will enter into this block if current walking path is either parent of- // tree path, or the same as tree path, or child of tree path-- int walkPathLen = walker.getPathLength();- if (walkPathLen <= treePathRaw.length) {- int n = walker.getTreeCount();- if (n == 1) {- // we are comparing against an empty tree, so current commit- // is the initial commit- walker.setRecursive(true);- return true;- } else {- int m = walker.getRawMode(n-1);- for (int i = 0; i < n-1; i++) {- if (walker.getRawMode(i) != m || !walker.idEqual(i, n-1)) {- // current path has been changed since its parents, and- // we need to walk down to further check the children- walker.setRecursive(true);- return true;- }- }- }- // otherwise this path is not relevant- return false;- } else {- boolean modified = false;- int n = walker.getTreeCount();- if (n == 1) {- modified = true;- } else {- int m = walker.getRawMode(n-1);- for (int i = 0; i < n-1; i++) {- if (walker.getRawMode(i) != m || !walker.idEqual(i, n-1)) {- modified = true;- changed[i] = true;- } else {- changed[i] = false;- }- }- }- if (modified) {- childRef.set(RawParseUtils.decode(- StandardCharsets.UTF_8,- walker.getRawPath(),- treePathRaw.length!=0?treePathRaw.length+1:0,- walkPathLen));- // this child has been modified, and this info is sufficient to- // us and we no longer need to recurse into the sub tree- walker.setRecursive(false);- return true;- } else {- return false;- }- }- } else {- return false;- }- }-- @Override- public boolean shouldBeRecursive() {- throw new UnsupportedOperationException();- }-- @Override- public TreeFilter clone() {- throw new UnsupportedOperationException();- }-- });-- if (nParents <= 1) {- while (treeWalker.next()) {- String child = childRef.get();- if (children.contains(child) && !containsKey(child))- modifiedChildren.add(child);- }- } else {- int[] changes = new int[nParents];- while (treeWalker.next()) {- String child = childRef.get();- if (children.contains(child) && !containsKey(child)) {- boolean same = false;- for (int i = 0; i < nParents; i++) {- if (changed[i])- changes[i] ++;- else- same = true;- }-- // consider child as modified only if it is different- // from all parents; otherwise, postpone checking of- // child to parents of this commit- if (!same)- modifiedChildren.add(child);- }- }-- for (int i = 0; i < nParents; i++) {- /*- * Jump to parent whose children we care about are- * the same as current commit. This will speed up- * the calculation as we no longer need to walk- * unnecessary branches- */- if (changes[i] == 0) {- RevCommit p = pList[i];- commit.parents = new RevCommit[]{p};- return false;- }- }- }- // include current commit only if it is determined as last commit- // of some children- return !modifiedChildren.isEmpty();- }- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public RevFilter clone() {- throw new UnsupportedOperationException();- }-- });-- RevCommit next = revWalk.next();- while (size() < children.size() && next != null) {- Value value = new Value(next);- for (String child: modifiedChildren)- put(child, value);- modifiedChildren.clear();- next = revWalk.next();- }- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }- }-- private void cacheParents(RevCommit[] parents, RevFlag cached, RevFlag visited) {- for (RevCommit p: parents) {- if (!p.has(cached)) {- p.add(cached);-- /*- * Further caches parent of parent if the parent has already been- * visited as otherwise it will not have a chance to get its parents- * cached- */- if (p.has(visited))- cacheParents(p.parents, cached, visited);- }- }- }-- public static class Value implements Serializable {-- private static final long serialVersionUID = 1L;-- private final ObjectId id;-- private final PersonIdent author;-- private final Date commitDate;-- private final String summary;-- public Value(RevCommit commit) {- this.id = commit.copy();- this.author = commit.getAuthorIdent();- this.commitDate = commit.getCommitterIdent().getWhen();- this.summary = StringUtils.substringBefore(commit.getFullMessage(), "\n").trim();- }-- public ObjectId getId() {- return id;- }-- public String getSummary() {- return summary;- }-- public PersonIdent getAuthor() {- return author;- }-- public Date getCommitDate() {- return commitDate;- }-- @Override- public boolean equals(Object obj) {- if (obj instanceof Value) {- Value value = (Value) obj;- return id.equals(value.getId());- } else {- return false;- }- }-- @Override- public String toString() {- return id.name();- }-- }-- public static interface Cache {-- @Nullable- Map<String, Value> getLastCommitsOfChildren(ObjectId commitId);-- }--}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.javadeleted file mode 100644index be29dc3138..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java+++ /dev/null@@ -1,245 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.text.MessageFormat;-import java.util.ArrayDeque;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;--/**- * Computes the merge base(s) of the starting commits.- * <p>- * This generator is selected if the RevFilter is only- * {@link org.eclipse.jgit.revwalk.filter.RevFilter#MERGE_BASE}.- * <p>- * To compute the merge base we assign a temporary flag to each of the starting- * commits. The maximum number of starting commits is bounded by the number of- * free flags available in the RevWalk when the generator is initialized. These- * flags will be automatically released on the next reset of the RevWalk, but- * not until then, as they are assigned to commits throughout the history.- * <p>- * Several internal flags are reused here for a different purpose, but this- * should not have any impact as this generator should be run alone, and without- * any other generators wrapped around it.- */-class MergeBaseGenerator extends Generator {- private static final int PARSED = RevWalk.PARSED;- private static final int IN_PENDING = RevWalk.SEEN;- private static final int POPPED = RevWalk.TEMP_MARK;- private static final int MERGE_BASE = RevWalk.REWRITE;-- private final RevWalk walker;- private final DateRevQueue pending;-- private int branchMask;- private int recarryTest;- private int recarryMask;- private int mergeBaseAncestor = -1;-- private ArrayDeque<RevCommit> ret = new ArrayDeque<>();-- private CarryStack stack;-- MergeBaseGenerator(RevWalk w) {- super(w.isFirstParent());- walker = w;- pending = new DateRevQueue(firstParent);- }-- void init(AbstractRevQueue p) throws IOException {- try {- for (;;) {- final RevCommit c = p.next();- if (c == null)- break;- add(c);- }- // Setup the condition used by carryOntoOne to detect a late- // merge base and produce it on the next round.- //- recarryTest = branchMask | POPPED;- recarryMask = branchMask | POPPED | MERGE_BASE;- mergeBaseAncestor = walker.allocFlag();-- for (;;) {- RevCommit c = _next();- if (c == null) {- break;- }- ret.add(c);- }- } finally {- // Always free the flags immediately. This ensures the flags- // will be available for reuse when the walk resets.- //- walker.freeFlag(branchMask | mergeBaseAncestor);- }- }-- private void add(RevCommit c) {- final int flag = walker.allocFlag();- branchMask |= flag;- if ((c.flags & branchMask) != 0) {- // This should never happen. RevWalk ensures we get a- // commit admitted to the initial queue only once. If- // we see this marks aren't correctly erased.- //- throw new IllegalStateException(MessageFormat.format(JGitText.get().staleRevFlagsOn, c.name()));- }- c.flags |= flag;- pending.add(c);- }-- @Override- int outputType() {- return 0;- }-- private RevCommit _next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit c = pending.next();- if (c == null) {- return null;- }-- for (RevCommit p : c.getParents()) {- if ((p.flags & IN_PENDING) != 0)- continue;- if ((p.flags & PARSED) == 0)- p.parseHeaders(walker);- p.flags |= IN_PENDING;- pending.add(p);- }-- int carry = c.flags & branchMask;- boolean mb = carry == branchMask;- if (mb) {- // If we are a merge base make sure our ancestors are- // also flagged as being popped, so that they do not- // generate to the caller.- //- carry |= MERGE_BASE | mergeBaseAncestor;- }- carryOntoHistory(c, carry);-- if ((c.flags & MERGE_BASE) != 0) {- // This commit is an ancestor of a merge base we already- // popped back to the caller. If everyone in pending is- // that way we are done traversing; if not we just need- // to move to the next available commit and try again.- //- if (pending.everbodyHasFlag(MERGE_BASE))- return null;- continue;- }- c.flags |= POPPED;-- if (mb) {- c.flags |= MERGE_BASE;- return c;- }- }- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- while (!ret.isEmpty()) {- RevCommit commit = ret.remove();- if ((commit.flags & mergeBaseAncestor) == 0) {- return commit;- }- }- return null;- }-- private void carryOntoHistory(RevCommit c, int carry) {- stack = null;- for (;;) {- carryOntoHistoryInnerLoop(c, carry);- if (stack == null) {- break;- }- c = stack.c;- carry = stack.carry;- stack = stack.prev;- }- }-- private void carryOntoHistoryInnerLoop(RevCommit c, int carry) {- for (;;) {- RevCommit[] parents = c.getParents();- if (parents == null || parents.length == 0) {- break;- }-- int e = parents.length - 1;- for (int i = 0; i < e; i++) {- RevCommit p = parents[i];- if (carryOntoOne(p, carry) == CONTINUE) {- // Walking p will be required, buffer p on stack.- stack = new CarryStack(stack, p, carry);- }- // For other results from carryOntoOne:- // HAVE_ALL: p has all bits, do nothing to skip that path.- // CONTINUE_ON_STACK: callee pushed StackElement for p.- }-- c = parents[e];- if (carryOntoOne(c, carry) != CONTINUE) {- break;- }- }- }-- private static final int CONTINUE = 0;- private static final int HAVE_ALL = 1;- private static final int CONTINUE_ON_STACK = 2;-- private int carryOntoOne(RevCommit p, int carry) {- // If we already had all carried flags, our parents do too.- // Return HAVE_ALL to stop caller from running down this leg- // of the revision graph any further.- //- // Otherwise return CONTINUE to ask the caller to walk history.- int rc = (p.flags & carry) == carry ? HAVE_ALL : CONTINUE;- p.flags |= carry;-- if ((p.flags & recarryMask) == recarryTest) {- // We were popped without being a merge base, but we just got- // voted to be one. Inject ourselves back at the front of the- // pending queue and tell all of our ancestors they are within- // the merge base now.- p.flags &= ~POPPED;- pending.add(p);- stack = new CarryStack(stack, p, branchMask | MERGE_BASE);- return CONTINUE_ON_STACK;- }- return rc;- }-- private static class CarryStack {- final CarryStack prev;- final RevCommit c;- final int carry;-- CarryStack(CarryStack prev, RevCommit c, int carry) {- this.prev = prev;- this.c = c;- this.carry = carry;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectReachabilityChecker.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectReachabilityChecker.javadeleted file mode 100644index 48e908e884..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectReachabilityChecker.java+++ /dev/null@@ -1,48 +0,0 @@-/*- * Copyright (C) 2020, Google LLC and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.Collection;-import java.util.Optional;-import java.util.stream.Stream;--/**- * Checks if all objects are reachable from certain starting points.- *- * This is an expensive check that browses commits, trees, blobs and tags. For- * reachability just between commits see {@link ReachabilityChecker}- * implementations.- *- * @since 5.8- */-public interface ObjectReachabilityChecker {-- /**- * Checks that all targets are reachable from the starters.- *- * @implSpec Missing or invalid objects are reported as illegal state.- * Caller should have found them while translating ObjectIds into- * RevObjects. They can only happen here if the caller is mixing- * revwalks.- *- * @param targets- * objects to check for reachability from the starters- * @param starters- * objects known to be reachable to the caller- * @return Optional a single unreachable target if there are any (there- * could be more). Empty optional means all targets are reachable.- * @throws IOException- * Cannot access underlying storage- */- Optional<RevObject> areAllReachable(Collection<RevObject> targets,- Stream<RevObject> starters) throws IOException;--}\ No newline at end of filediff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.javadeleted file mode 100644index 82671d9abb..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java+++ /dev/null@@ -1,898 +0,0 @@-/*- * Copyright (C) 2008, 2022 Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import static java.util.Objects.requireNonNull;-import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;-import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT;-import static org.eclipse.jgit.lib.Constants.OBJ_TREE;--import java.io.IOException;-import java.text.MessageFormat;-import java.util.ArrayList;-import java.util.List;--import org.eclipse.jgit.errors.CorruptObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.LargeObjectException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.filter.ObjectFilter;-import org.eclipse.jgit.util.RawParseUtils;--/**- * Specialized subclass of RevWalk to include trees, blobs and tags.- * <p>- * Unlike RevWalk this subclass is able to remember starting roots that include- * annotated tags, or arbitrary trees or blobs. Once commit generation is- * complete and all commits have been popped by the application, individual- * annotated tag, tree and blob objects can be popped through the additional- * method {@link #nextObject()}.- * <p>- * Tree and blob objects reachable from interesting commits are automatically- * scheduled for inclusion in the results of {@link #nextObject()}, returning- * each object exactly once. Objects are sorted and returned according to the- * the commits that reference them and the order they appear within a tree.- * Ordering can be affected by changing the- * {@link org.eclipse.jgit.revwalk.RevSort} used to order the commits that are- * returned first.- */-public class ObjectWalk extends RevWalk {- private static final int ID_SZ = 20;- private static final int TYPE_SHIFT = 12;- private static final int TYPE_TREE = 0040000 >>> TYPE_SHIFT;- private static final int TYPE_SYMLINK = 0120000 >>> TYPE_SHIFT;- private static final int TYPE_FILE = 0100000 >>> TYPE_SHIFT;- private static final int TYPE_GITLINK = 0160000 >>> TYPE_SHIFT;-- /**- * Indicates a non-RevCommit is in {@link #pendingObjects}.- * <p>- * We can safely reuse {@link RevWalk#REWRITE} here for the same value as it- * is only set on RevCommit and {@link #pendingObjects} never has RevCommit- * instances inserted into it.- */- private static final int IN_PENDING = RevWalk.REWRITE;-- /**- * When walking over a tree and blob graph, objects are usually marked as- * seen as they are visited and this "seen" status is checked upon the next- * visit. If they are already "seen" then they are not processed (returned- * by {@link ObjectWalk#nextObject()}) again. However, this behavior can be- * overridden by supplying a different implementation of this class.- *- * @since 5.4- */- public interface VisitationPolicy {- /**- * Whenever the rev or object walk reaches a Git object, if that object- * already exists as a RevObject, this method is called to determine if- * that object should be visited.- *- * @param o- * the object to check if it should be visited- * @return true if the object should be visited- */- boolean shouldVisit(RevObject o);-- /**- * Called when an object is visited.- *- * @param o- * the object that was visited- */- void visited(RevObject o);- }-- /**- * The default visitation policy: causes all objects to be visited exactly- * once.- *- * @since 5.4- */- public static final VisitationPolicy SIMPLE_VISITATION_POLICY =- new VisitationPolicy() {- @Override- public boolean shouldVisit(RevObject o) {- return (o.flags & SEEN) == 0;- }-- @Override- public void visited(RevObject o) {- o.flags |= SEEN;- }- };-- private List<RevObject> rootObjects;-- private BlockObjQueue pendingObjects;-- private ObjectFilter objectFilter;-- private TreeVisit freeVisit;-- private TreeVisit currVisit;-- private byte[] pathBuf;-- private int pathLen;-- private boolean boundary;-- private VisitationPolicy visitationPolicy = SIMPLE_VISITATION_POLICY;-- /**- * Create a new revision and object walker for a given repository.- *- * @param repo- * the repository the walker will obtain data from.- */- public ObjectWalk(Repository repo) {- this(repo.newObjectReader(), true);- }-- /**- * Create a new revision and object walker for a given repository.- *- * @param or- * the reader the walker will obtain data from. The reader should- * be released by the caller when the walker is no longer- * required.- */- public ObjectWalk(ObjectReader or) {- this(or, false);- }-- private ObjectWalk(ObjectReader or, boolean closeReader) {- super(or, closeReader);- setRetainBody(false);- rootObjects = new ArrayList<>();- pendingObjects = new BlockObjQueue();- objectFilter = ObjectFilter.ALL;- pathBuf = new byte[256];- }-- /**- * Create an object reachability checker that will use bitmaps if possible.- *- * This reachability checker accepts any object as target. For checks- * exclusively between commits, see- * {@link RevWalk#createReachabilityChecker()}.- *- * @return an object reachability checker, using bitmaps if possible.- *- * @throws IOException- * when the index fails to load.- *- * @since 5.8- * @deprecated use- * {@code ObjectReader#createObjectReachabilityChecker(ObjectWalk)}- * instead.- */- @Deprecated- public final ObjectReachabilityChecker createObjectReachabilityChecker()- throws IOException {- return reader.createObjectReachabilityChecker(this);- }-- /**- * Mark an object or commit to start graph traversal from.- * <p>- * Callers are encouraged to use- * {@link org.eclipse.jgit.revwalk.RevWalk#parseAny(AnyObjectId)} instead of- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}, as- * this method requires the object to be parsed before it can be added as a- * root for the traversal.- * <p>- * The method will automatically parse an unparsed object, but error- * handling may be more difficult for the application to explain why a- * RevObject is not actually valid. The object pool of this walker would- * also be 'poisoned' by the invalid RevObject.- * <p>- * This method will automatically call- * {@link org.eclipse.jgit.revwalk.RevWalk#markStart(RevCommit)} if passed- * RevCommit instance, or a RevTag that directly (or indirectly) references- * a RevCommit.- *- * @param o- * the object to start traversing from. The object passed must be- * from this same revision walker.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the object supplied is not available from the object- * database. This usually indicates the supplied object is- * invalid, but the reference was constructed during an earlier- * invocation to- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually the type of the instance- * passed in. This usually indicates the caller used the wrong- * type in a- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}- * call.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void markStart(RevObject o) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- while (o instanceof RevTag) {- addObject(o);- o = ((RevTag) o).getObject();- parseHeaders(o);- }-- if (o instanceof RevCommit)- super.markStart((RevCommit) o);- else- addObject(o);- }-- /**- * Mark an object to not produce in the output.- * <p>- * Uninteresting objects denote not just themselves but also their entire- * reachable chain, back until the merge base of an uninteresting commit and- * an otherwise interesting commit.- * <p>- * Callers are encouraged to use- * {@link org.eclipse.jgit.revwalk.RevWalk#parseAny(AnyObjectId)} instead of- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}, as- * this method requires the object to be parsed before it can be added as a- * root for the traversal.- * <p>- * The method will automatically parse an unparsed object, but error- * handling may be more difficult for the application to explain why a- * RevObject is not actually valid. The object pool of this walker would- * also be 'poisoned' by the invalid RevObject.- * <p>- * This method will automatically call- * {@link org.eclipse.jgit.revwalk.RevWalk#markStart(RevCommit)} if passed- * RevCommit instance, or a RevTag that directly (or indirectly) references- * a RevCommit.- *- * @param o- * the object to start traversing from. The object passed must be- * @throws org.eclipse.jgit.errors.MissingObjectException- * the object supplied is not available from the object- * database. This usually indicates the supplied object is- * invalid, but the reference was constructed during an earlier- * invocation to- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually the type of the instance- * passed in. This usually indicates the caller used the wrong- * type in a- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}- * call.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void markUninteresting(RevObject o) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- while (o instanceof RevTag) {- o.flags |= UNINTERESTING;- if (boundary)- addObject(o);- o = ((RevTag) o).getObject();- parseHeaders(o);- }-- if (o instanceof RevCommit)- super.markUninteresting((RevCommit) o);- else if (o instanceof RevTree)- markTreeUninteresting((RevTree) o);- else- o.flags |= UNINTERESTING;-- if (o.getType() != OBJ_COMMIT && boundary)- addObject(o);- }-- @Override- public void sort(RevSort s) {- super.sort(s);- boundary = hasRevSort(RevSort.BOUNDARY);- }-- @Override- public void sort(RevSort s, boolean use) {- super.sort(s, use);- boundary = hasRevSort(RevSort.BOUNDARY);- }-- /**- * Get the currently configured object filter.- *- * @return the current filter. Never null as a filter is always needed.- * @since 4.0- */- public ObjectFilter getObjectFilter() {- return objectFilter;- }-- /**- * Set the object filter for this walker. This filter affects the objects- * visited by {@link #nextObject()}. It does not affect the commits listed- * by {@link #next()}.- * <p>- * If the filter returns false for an object, then that object is skipped- * and objects reachable from it are not enqueued to be walked recursively.- * This can be used to speed up the object walk by skipping subtrees that- * are known to be uninteresting.- *- * @param newFilter- * the new filter. If null the special- * {@link org.eclipse.jgit.revwalk.filter.ObjectFilter#ALL}- * filter will be used instead, as it matches every object.- * @since 4.0- */- public void setObjectFilter(ObjectFilter newFilter) {- assertNotStarted();- objectFilter = newFilter != null ? newFilter : ObjectFilter.ALL;- }-- /**- * Sets the visitation policy to use during this walk.- *- * @param policy- * the {@code VisitationPolicy} to use- * @since 5.4- */- public void setVisitationPolicy(VisitationPolicy policy) {- assertNotStarted();- visitationPolicy = requireNonNull(policy);- }-- @Override- public RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit r = super.next();- if (r == null) {- return null;- }- final RevTree t = r.getTree();- if ((r.flags & UNINTERESTING) != 0) {- if (objectFilter.include(this, t)) {- markTreeUninteresting(t);- }- if (boundary) {- return r;- }- continue;- }- if (objectFilter.include(this, t)) {- pendingObjects.add(t);- }- return r;- }- }-- /**- * Skips the current tree such that {@link #nextObject()} does not return- * any objects inside it. This should be called right after- * {@link #nextObject()} returns the tree.- *- * @since 5.4- */- public void skipTree() {- if (currVisit != null) {- currVisit.ptr = currVisit.buf.length;- }- }-- /**- * Pop the next most recent object.- *- * @return next most recent object; null if traversal is over.- * @throws org.eclipse.jgit.errors.MissingObjectException- * one or more of the next objects are not available from the- * object database, but were thought to be candidates for- * traversal. This usually indicates a broken link.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * one or more of the objects in a tree do not match the type- * indicated.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public RevObject nextObject() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- pathLen = 0;-- TreeVisit tv = currVisit;- while (tv != null) {- byte[] buf = tv.buf;- for (int ptr = tv.ptr; ptr < buf.length;) {- int startPtr = ptr;- ptr = findObjectId(buf, ptr);- idBuffer.fromRaw(buf, ptr);- ptr += ID_SZ;-- if (!objectFilter.include(this, idBuffer)) {- continue;- }-- RevObject obj = objects.get(idBuffer);- if (obj != null && !visitationPolicy.shouldVisit(obj))- continue;-- int mode = parseMode(buf, startPtr, ptr, tv);- switch (mode >>> TYPE_SHIFT) {- case TYPE_FILE:- case TYPE_SYMLINK:- if (obj == null) {- obj = new RevBlob(idBuffer);- visitationPolicy.visited(obj);- objects.add(obj);- return obj;- }- if (!(obj instanceof RevBlob))- throw new IncorrectObjectTypeException(obj, OBJ_BLOB);- visitationPolicy.visited(obj);- if ((obj.flags & UNINTERESTING) == 0)- return obj;- if (boundary)- return obj;- continue;-- case TYPE_TREE:- if (obj == null) {- obj = new RevTree(idBuffer);- visitationPolicy.visited(obj);- objects.add(obj);- return pushTree(obj);- }- if (!(obj instanceof RevTree))- throw new IncorrectObjectTypeException(obj, OBJ_TREE);- visitationPolicy.visited(obj);- if ((obj.flags & UNINTERESTING) == 0)- return pushTree(obj);- if (boundary)- return pushTree(obj);- continue;-- case TYPE_GITLINK:- continue;-- default:- throw new CorruptObjectException(MessageFormat.format(- JGitText.get().corruptObjectInvalidMode3,- String.format("%o", Integer.valueOf(mode)), //$NON-NLS-1$- idBuffer.name(),- RawParseUtils.decode(buf, tv.namePtr, tv.nameEnd),- tv.obj));- }- }-- currVisit = tv.parent;- releaseTreeVisit(tv);- tv = currVisit;- }-- for (;;) {- RevObject o = pendingObjects.next();- if (o == null) {- return null;- }- if (!visitationPolicy.shouldVisit(o)) {- continue;- }- visitationPolicy.visited(o);- if ((o.flags & UNINTERESTING) == 0 || boundary) {- if (o instanceof RevTree) {- // The previous while loop should have exhausted the stack- // of trees.- assert currVisit == null;-- pushTree(o);- }- return o;- }- }- }-- private static int findObjectId(byte[] buf, int ptr) {- // Skip over the mode and name until the NUL before the ObjectId- // can be located. Skip the NUL as the function returns.- for (;;) {- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;-- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;-- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;-- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- if (buf[++ptr] == 0) return ++ptr;- }- }-- private static int parseMode(byte[] buf, int startPtr, int recEndPtr, TreeVisit tv) {- int mode = buf[startPtr] - '0';- for (;;) {- byte c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';-- c = buf[++startPtr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';- }-- tv.ptr = recEndPtr;- tv.namePtr = startPtr + 1;- tv.nameEnd = recEndPtr - (ID_SZ + 1);- return mode;- }-- /**- * Verify all interesting objects are available, and reachable.- * <p>- * Callers should populate starting points and ending points with- * {@link #markStart(RevObject)} and {@link #markUninteresting(RevObject)}- * and then use this method to verify all objects between those two points- * exist in the repository and are readable.- * <p>- * This method returns successfully if everything is connected; it throws an- * exception if there is a connectivity problem. The exception message- * provides some detail about the connectivity failure.- *- * @throws org.eclipse.jgit.errors.MissingObjectException- * one or more of the next objects are not available from the- * object database, but were thought to be candidates for- * traversal. This usually indicates a broken link.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * one or more of the objects in a tree do not match the type- * indicated.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void checkConnectivity() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit c = next();- if (c == null)- break;- }- for (;;) {- final RevObject o = nextObject();- if (o == null)- break;- if (o instanceof RevBlob && !reader.has(o))- throw new MissingObjectException(o, OBJ_BLOB);- }- }-- /**- * Get the current object's complete path.- * <p>- * This method is not very efficient and is primarily meant for debugging- * and final output generation. Applications should try to avoid calling it,- * and if invoked do so only once per interesting entry, where the name is- * absolutely required for correct function.- *- * @return complete path of the current entry, from the root of the- * repository. If the current entry is in a subtree there will be at- * least one '/' in the returned string. Null if the current entry- * has no path, such as for annotated tags or root level trees.- */- public String getPathString() {- if (pathLen == 0) {- pathLen = updatePathBuf(currVisit);- if (pathLen == 0)- return null;- }- return RawParseUtils.decode(pathBuf, 0, pathLen);- }-- /**- * Get the current traversal depth from the root tree object- *- * @return the current traversal depth from the root tree object- * @since 5.4- */- public int getTreeDepth() {- if (currVisit == null) {- return 0;- }- return currVisit.depth;- }-- /**- * Get the current object's path hash code.- * <p>- * This method computes a hash code on the fly for this path, the hash is- * suitable to cluster objects that may have similar paths together.- *- * @return path hash code; any integer may be returned.- */- public int getPathHashCode() {- TreeVisit tv = currVisit;- if (tv == null)- return 0;-- int nameEnd = tv.nameEnd;- if (nameEnd == 0) {- // When nameEnd == 0 the subtree is itself the current path- // being visited. The name hash must be obtained from its- // parent tree. If there is no parent, this is a root tree with- // a hash code of 0.- tv = tv.parent;- if (tv == null)- return 0;- nameEnd = tv.nameEnd;- }-- byte[] buf;- int ptr;-- if (16 <= (nameEnd - tv.namePtr)) {- buf = tv.buf;- ptr = nameEnd - 16;- } else {- nameEnd = pathLen;- if (nameEnd == 0) {- nameEnd = updatePathBuf(currVisit);- pathLen = nameEnd;- }- buf = pathBuf;- ptr = Math.max(0, nameEnd - 16);- }-- int hash = 0;- for (; ptr < nameEnd; ptr++) {- byte c = buf[ptr];- if (c != ' ')- hash = (hash >>> 2) + (c << 24);- }- return hash;- }-- /**- * Get the internal buffer holding the current path.- *- * @return the internal buffer holding the current path.- */- public byte[] getPathBuffer() {- if (pathLen == 0)- pathLen = updatePathBuf(currVisit);- return pathBuf;- }-- /**- * Get length of the path in {@link #getPathBuffer()}.- *- * @return length of the path in {@link #getPathBuffer()}.- */- public int getPathLength() {- if (pathLen == 0)- pathLen = updatePathBuf(currVisit);- return pathLen;- }-- private int updatePathBuf(TreeVisit tv) {- if (tv == null)- return 0;-- // If nameEnd == 0 this tree has not yet contributed an entry.- // Update only for the parent, which if null will be empty.- int nameEnd = tv.nameEnd;- if (nameEnd == 0)- return updatePathBuf(tv.parent);-- int ptr = tv.pathLen;- if (ptr == 0) {- ptr = updatePathBuf(tv.parent);- if (ptr == pathBuf.length)- growPathBuf(ptr);- if (ptr != 0)- pathBuf[ptr++] = '/';- tv.pathLen = ptr;- }-- int namePtr = tv.namePtr;- int nameLen = nameEnd - namePtr;- int end = ptr + nameLen;- while (pathBuf.length < end)- growPathBuf(ptr);- System.arraycopy(tv.buf, namePtr, pathBuf, ptr, nameLen);- return end;- }-- private void growPathBuf(int ptr) {- byte[] newBuf = new byte[pathBuf.length << 1];- System.arraycopy(pathBuf, 0, newBuf, 0, ptr);- pathBuf = newBuf;- }-- @Override- public void dispose() {- super.dispose();- pendingObjects = new BlockObjQueue();- currVisit = null;- freeVisit = null;- }-- @Override- protected void reset(int retainFlags) {- super.reset(retainFlags);-- for (RevObject obj : rootObjects)- obj.flags &= ~IN_PENDING;-- rootObjects = new ArrayList<>();- pendingObjects = new BlockObjQueue();- currVisit = null;- freeVisit = null;- }-- private void addObject(RevObject o) {- if ((o.flags & IN_PENDING) == 0) {- o.flags |= IN_PENDING;- rootObjects.add(o);- pendingObjects.add(o);- }- }-- private void markTreeUninteresting(RevTree tree)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- if ((tree.flags & UNINTERESTING) != 0)- return;- tree.flags |= UNINTERESTING;-- byte[] raw = reader.open(tree, OBJ_TREE).getCachedBytes();- for (int ptr = 0; ptr < raw.length;) {- byte c = raw[ptr];- int mode = c - '0';- for (;;) {- c = raw[++ptr];- if (' ' == c)- break;- mode <<= 3;- mode += c - '0';- }- while (raw[++ptr] != 0) {- // Skip entry name.- }- ptr++; // Skip NUL after entry name.-- switch (mode >>> TYPE_SHIFT) {- case TYPE_FILE:- case TYPE_SYMLINK:- idBuffer.fromRaw(raw, ptr);- lookupBlob(idBuffer).flags |= UNINTERESTING;- break;-- case TYPE_TREE:- idBuffer.fromRaw(raw, ptr);- markTreeUninteresting(lookupTree(idBuffer));- break;-- case TYPE_GITLINK:- break;-- default:- idBuffer.fromRaw(raw, ptr);- throw new CorruptObjectException(MessageFormat.format(- JGitText.get().corruptObjectInvalidMode3,- String.format("%o", Integer.valueOf(mode)), //$NON-NLS-1$- idBuffer.name(), "", tree)); //$NON-NLS-1$- }- ptr += ID_SZ;- }- }-- private RevObject pushTree(RevObject obj) throws LargeObjectException,- MissingObjectException, IncorrectObjectTypeException, IOException {- TreeVisit tv = freeVisit;- if (tv != null) {- freeVisit = tv.parent;- tv.ptr = 0;- tv.namePtr = 0;- tv.nameEnd = 0;- tv.pathLen = 0;- } else {- tv = new TreeVisit();- }- tv.obj = obj;- tv.buf = reader.open(obj, OBJ_TREE).getCachedBytes();- tv.parent = currVisit;- currVisit = tv;- if (tv.parent == null) {- tv.depth = 1;- } else {- tv.depth = tv.parent.depth + 1;- }-- return obj;- }-- private void releaseTreeVisit(TreeVisit tv) {- tv.buf = null;- tv.parent = freeVisit;- freeVisit = tv;- }-- private static class TreeVisit {- /** Parent tree visit that entered this tree, null if root tree. */- TreeVisit parent;-- /** The RevTree currently being iterated through. */- RevObject obj;-- /** Canonical encoding of the tree named by {@link #obj}. */- byte[] buf;-- /** Index of next entry to parse in {@link #buf}. */- int ptr;-- /** Start of the current name entry in {@link #buf}. */- int namePtr;-- /** One past end of name, {@code nameEnd - namePtr} is the length. */- int nameEnd;-- /** Number of bytes in the path leading up to this tree. */- int pathLen;-- /** Number of levels deep from the root tree. 0 for root tree. */- int depth;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.javadeleted file mode 100644index a49f787316..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java+++ /dev/null@@ -1,158 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.filter.RevFilter;--/**- * Default (and first pass) RevCommit Generator implementation for RevWalk.- * <p>- * This generator starts from a set of one or more commits and process them in- * descending (newest to oldest) commit time order. Commits automatically cause- * their parents to be enqueued for further processing, allowing the entire- * commit graph to be walked. A {@link RevFilter} may be used to select a subset- * of the commits and return them to the caller.- */-class PendingGenerator extends Generator {- private static final int PARSED = RevWalk.PARSED;-- private static final int SEEN = RevWalk.SEEN;-- private static final int UNINTERESTING = RevWalk.UNINTERESTING;-- /**- * Number of additional commits to scan after we think we are done.- * <p>- * This small buffer of commits is scanned to ensure we didn't miss anything- * as a result of clock skew when the commits were made. We need to set our- * constant to 1 additional commit due to the use of a pre-increment- * operator when accessing the value.- */- static final int OVER_SCAN = 5 + 1;-- /** A commit near the end of time, to initialize {@link #last} with. */- private static final RevCommit INIT_LAST;-- static {- INIT_LAST = new RevCommit(ObjectId.zeroId());- INIT_LAST.commitTime = Integer.MAX_VALUE;- }-- private final RevWalk walker;-- private final DateRevQueue pending;-- private final RevFilter filter;-- private final int output;-- /** Last commit produced to the caller from {@link #next()}. */- private RevCommit last = INIT_LAST;-- /**- * Number of commits we have remaining in our over-scan allotment.- * <p>- * Only relevant if there are {@link #UNINTERESTING} commits in the- * {@link #pending} queue.- */- private int overScan = OVER_SCAN;-- boolean canDispose;-- PendingGenerator(final RevWalk w, final DateRevQueue p,- final RevFilter f, final int out) {- super(w.isFirstParent());- walker = w;- pending = p;- filter = f;- output = out;- canDispose = true;- }-- @Override- int outputType() {- return output | SORT_COMMIT_TIME_DESC;- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- try {- for (;;) {- final RevCommit c = pending.next();- if (c == null) {- return null;- }-- final boolean produce;- if ((c.flags & UNINTERESTING) != 0)- produce = false;- else {- if (filter.requiresCommitBody())- c.parseBody(walker);- produce = filter.include(walker, c);- }-- int parentCount = c.getParentCount();- for (int i = 0; i < parentCount; i++) {- RevCommit p = c.getParent(i);- // If the commit is uninteresting, don't try to prune- // parents because we want the maximal uninteresting set.- if (firstParent && i > 0 && (c.flags & UNINTERESTING) == 0) {- continue;- }- if ((p.flags & SEEN) != 0)- continue;- if ((p.flags & PARSED) == 0)- p.parseHeaders(walker);- p.flags |= SEEN;- pending.add(p);- }- walker.carryFlagsImpl(c);-- if ((c.flags & UNINTERESTING) != 0) {- if (pending.everbodyHasFlag(UNINTERESTING)) {- final RevCommit n = pending.peek();- if (n != null && n.commitTime >= last.commitTime) {- // This is too close to call. The next commit we- // would pop is dated after the last one produced.- // We have to keep going to ensure that we carry- // flags as much as necessary.- //- overScan = OVER_SCAN;- } else if (--overScan == 0)- throw StopWalkException.INSTANCE;- } else {- overScan = OVER_SCAN;- }- if (canDispose)- c.disposeBody();- continue;- }-- if (produce)- return last = c;- else if (canDispose)- c.disposeBody();- }- } catch (StopWalkException swe) {- pending.clear();- return null;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/ReachabilityChecker.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/ReachabilityChecker.javadeleted file mode 100644index abebe8be96..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/ReachabilityChecker.java+++ /dev/null@@ -1,92 +0,0 @@-/*- * Copyright (C) 2019, Google LLC. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.Collection;-import java.util.Optional;-import java.util.stream.Stream;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * Check if a commit is reachable from a collection of starting commits.- * <p>- * Note that this checks the reachability of commits (and tags). Trees, blobs or- * any other object will cause IncorrectObjectTypeException exceptions.- *- * @since 5.4- */-public interface ReachabilityChecker {-- /**- * Check if all targets are reachable from the {@code starters} commits.- * <p>- * Caller should parse the objectIds (preferably with- * {@code walk.parseCommit()} and handle missing/incorrect type objects- * before calling this method.- *- * @param targets- * commits to reach.- * @param starters- * known starting points.- * @return An unreachable target if at least one of the targets is- * unreachable. An empty optional if all targets are reachable from- * the starters.- *- * @throws MissingObjectException- * if any of the incoming objects doesn't exist in the- * repository.- * @throws IncorrectObjectTypeException- * if any of the incoming objects is not a commit or a tag.- * @throws IOException- * if any of the underlying indexes or readers cannot be- * opened.- *- * @deprecated see {{@link #areAllReachable(Collection, Stream)}- */- @Deprecated- default Optional<RevCommit> areAllReachable(Collection<RevCommit> targets,- Collection<RevCommit> starters) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- return areAllReachable(targets, starters.stream());- }-- /**- * Check if all targets are reachable from the {@code starters} commits.- * <p>- * Caller should parse the objectIds (preferably with- * {@code walk.parseCommit()} and handle missing/incorrect type objects- * before calling this method.- *- * @param targets- * commits to reach.- * @param starters- * known starting points.- * @return An unreachable target if at least one of the targets is- * unreachable. An empty optional if all targets are reachable from- * the starters.- *- * @throws MissingObjectException- * if any of the incoming objects doesn't exist in the- * repository.- * @throws IncorrectObjectTypeException- * if any of the incoming objects is not a commit or a tag.- * @throws IOException- * if any of the underlying indexes or readers cannot be- * opened.- * @since 5.6- */- Optional<RevCommit> areAllReachable(Collection<RevCommit> targets,- Stream<RevCommit> starters)- throws MissingObjectException, IncorrectObjectTypeException,- IOException;-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.javadeleted file mode 100644index 9856f2c252..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java+++ /dev/null@@ -1,52 +0,0 @@-/*- * Copyright (C) 2011, GEBIT Solutions and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk;--import org.eclipse.jgit.diff.DiffEntry;--/**- * An instance of this class can be used in conjunction with a- * {@link org.eclipse.jgit.revwalk.FollowFilter}. Whenever a rename has been- * detected during a revision walk, it will be reported here.- *- * @see FollowFilter#setRenameCallback(RenameCallback)- */-public abstract class RenameCallback {- /**- * Called whenever a diff was found that is actually a rename or copy of a- * file.- *- * <p>Subclass of this class have to override this to receive diffEntry for- * the rename.- *- * @param entry- * the entry representing the rename/copy- */- public abstract void renamed(DiffEntry entry);-- /**- * Called whenever a diff was found that is actually a rename or copy of a- * file along with the commit that caused it.- *- * <p>Subclass of this class have an option to override this if it wants to- * know what commit generated the diffEntry. Otherwise defaults to the- * {@link RenameCallback#renamed(DiffEntry)} function.- *- * @param entry- * the entry representing the rename/copy- * @param commit- * commit at which callback occurred- *- * @since 6.7- */- public void renamed(DiffEntry entry, RevCommit commit) {- renamed(entry);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevBlob.javadeleted file mode 100644index 1f81b6a922..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java+++ /dev/null@@ -1,56 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Marek Zawirski <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;--/**- * A binary file, or a symbolic link.- */-public class RevBlob extends RevObject {- /**- * Create a new blob reference.- *- * @param id- * object name for the blob.- */- protected RevBlob(AnyObjectId id) {- super(id);- }-- @Override- public final int getType() {- return Constants.OBJ_BLOB;- }-- @Override- void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (walk.reader.has(this))- flags |= PARSED;- else- throw new MissingObjectException(this, getType());- }-- @Override- void parseBody(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if ((flags & PARSED) == 0)- parseHeaders(walk);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.javadeleted file mode 100644index b2eed83c65..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java+++ /dev/null@@ -1,692 +0,0 @@-/*- * Copyright (C) 2008-2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import static org.eclipse.jgit.util.RawParseUtils.guessEncoding;--import java.io.IOException;-import java.nio.charset.Charset;-import java.nio.charset.IllegalCharsetNameException;-import java.nio.charset.UnsupportedCharsetException;-import java.util.List;--import org.eclipse.jgit.annotations.Nullable;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.storage.commitgraph.ChangedPathFilter;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.MutableObjectId;-import org.eclipse.jgit.lib.ObjectInserter;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.util.RawParseUtils;-import org.eclipse.jgit.util.StringUtils;--/**- * A commit reference to a commit in the DAG.- *- * The state of the RevCommit isn't populated until the commit is parsed. The- * newly created RevCommit is unparsed and only has an objectId reference. Other- * states like parents, trees, commit ident, commit message, etc. are- * populated/available when the commit is parsed.- */-@SuppressWarnings("deprecation")-public class RevCommit extends RevObject {- private static final int STACK_DEPTH = 500;-- /**- * Parse a commit from its canonical format.- *- * This method constructs a temporary revision pool, parses the commit as- * supplied, and returns it to the caller. Since the commit was built inside- * of a private revision pool its parent pointers will be initialized, but- * will not have their headers loaded.- *- * Applications are discouraged from using this API. Callers usually need- * more than one commit. Use- * {@link org.eclipse.jgit.revwalk.RevWalk#parseCommit(AnyObjectId)} to- * obtain a RevCommit from an existing repository.- *- * @param raw- * the canonical formatted commit to be parsed.- * @return the parsed commit, in an isolated revision pool that is not- * available to the caller.- */- public static RevCommit parse(byte[] raw) {- try {- return parse(new RevWalk((ObjectReader) null), raw);- } catch (IOException ex) {- throw new RuntimeException(ex);- }- }-- /**- * Parse a commit from its canonical format.- * <p>- * This method inserts the commit directly into the caller supplied revision- * pool, making it appear as though the commit exists in the repository,- * even if it doesn't. The repository under the pool is not affected.- * <p>- * The body of the commit (message, author, committer) is always retained in- * the returned {@code RevCommit}, even if the supplied {@code RevWalk} has- * been configured with {@code setRetainBody(false)}.- *- * @param rw- * the revision pool to allocate the commit within. The commit's- * tree and parent pointers will be obtained from this pool.- * @param raw- * the canonical formatted commit to be parsed. This buffer will- * be retained by the returned {@code RevCommit} and must not be- * modified by the caller.- * @return the parsed commit, in an isolated revision pool that is not- * available to the caller.- * @throws java.io.IOException- * in case of RevWalk initialization fails- */- public static RevCommit parse(RevWalk rw, byte[] raw) throws IOException {- try (ObjectInserter.Formatter fmt = new ObjectInserter.Formatter()) {- RevCommit r = rw.lookupCommit(fmt.idFor(Constants.OBJ_COMMIT, raw));- r.parseCanonical(rw, raw);- r.buffer = raw;- return r;- }- }-- static final RevCommit[] NO_PARENTS = {};-- /**- * Tree reference of the commit.- *- * @since 6.5- */- protected RevTree tree;-- /**- * Avoid accessing this field directly. Use method- * {@link RevCommit#getParents()} instead. RevCommit does not allow parents- * to be overridden and altering parent(s) is not supported.- *- * @since 6.3- */- protected RevCommit[] parents;-- int commitTime; // An int here for performance, overflows in 2038-- int inDegree;-- /**- * Raw unparsed commit body of the commit. Populated only- * after {@link #parseCanonical(RevWalk, byte[])} with- * {@link RevWalk#isRetainBody()} enable or after- * {@link #parseBody(RevWalk)} and {@link #parse(RevWalk, byte[])}.- *- * @since 6.5.1- */- protected byte[] buffer;-- /**- * Create a new commit reference.- *- * @param id- * object name for the commit.- */- protected RevCommit(AnyObjectId id) {- super(id);- }-- @Override- void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- parseCanonical(walk, walk.getCachedBytes(this));- }-- @Override- void parseBody(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (buffer == null) {- buffer = walk.getCachedBytes(this);- if ((flags & PARSED) == 0)- parseCanonical(walk, buffer);- }- }-- void parseCanonical(RevWalk walk, byte[] raw) throws IOException {- if (!walk.shallowCommitsInitialized) {- walk.initializeShallowCommits(this);- }-- final MutableObjectId idBuffer = walk.idBuffer;- idBuffer.fromString(raw, 5);- tree = walk.lookupTree(idBuffer);-- int ptr = 46;- if (getParents() == null) {- RevCommit[] pList = new RevCommit[1];- int nParents = 0;- for (;;) {- if (raw[ptr] != 'p') {- break;- }- idBuffer.fromString(raw, ptr + 7);- final RevCommit p = walk.lookupCommit(idBuffer);- switch (nParents) {- case 0:- pList[nParents++] = p;- break;- case 1:- pList = new RevCommit[] { pList[0], p };- nParents = 2;- break;- default:- if (pList.length <= nParents) {- RevCommit[] old = pList;- pList = new RevCommit[pList.length + 32];- System.arraycopy(old, 0, pList, 0, nParents);- }- pList[nParents++] = p;- break;- }- ptr += 48;- }- if (nParents != pList.length) {- RevCommit[] old = pList;- pList = new RevCommit[nParents];- System.arraycopy(old, 0, pList, 0, nParents);- }- parents = pList;- }-- // extract time from "committer "- ptr = RawParseUtils.committer(raw, ptr);- if (ptr > 0) {- ptr = RawParseUtils.nextLF(raw, ptr, '>');-- // In 2038 commitTime will overflow unless it is changed to long.- commitTime = RawParseUtils.parseBase10(raw, ptr, null);- }-- if (walk.isRetainBody()) {- buffer = raw;- }- flags |= PARSED;- }-- @Override- public final int getType() {- return Constants.OBJ_COMMIT;- }-- static void carryFlags(RevCommit c, int carry) {- FIFORevQueue q = carryFlags1(c, carry, 0);- if (q != null)- slowCarryFlags(q, carry);- }-- private static FIFORevQueue carryFlags1(RevCommit c, int carry, int depth) {- for (;;) {- RevCommit[] pList = c.getParents();- if (pList == null || pList.length == 0)- return null;- if (pList.length != 1) {- if (depth == STACK_DEPTH)- return defer(c);- for (int i = 1; i < pList.length; i++) {- RevCommit p = pList[i];- if ((p.flags & carry) == carry)- continue;- p.flags |= carry;- FIFORevQueue q = carryFlags1(p, carry, depth + 1);- if (q != null)- return defer(q, carry, pList, i + 1);- }- }-- c = pList[0];- if ((c.flags & carry) == carry)- return null;- c.flags |= carry;- }- }-- private static FIFORevQueue defer(RevCommit c) {- FIFORevQueue q = new FIFORevQueue();- q.add(c);- return q;- }-- private static FIFORevQueue defer(FIFORevQueue q, int carry,- RevCommit[] pList, int i) {- // In normal case the caller will run pList[0] in a tail recursive- // fashion by updating the variable. However the caller is unwinding- // the stack and will skip that pList[0] execution step.- carryOneStep(q, carry, pList[0]);-- // Remaining parents (if any) need to have flags checked and be- // enqueued if they have ancestors.- for (; i < pList.length; i++)- carryOneStep(q, carry, pList[i]);- return q;- }-- private static void slowCarryFlags(FIFORevQueue q, int carry) {- // Commits in q have non-null parent arrays and have set all- // flags in carry. This loop finishes copying over the graph.- for (RevCommit c; (c = q.next()) != null;) {- for (RevCommit p : c.getParents())- carryOneStep(q, carry, p);- }- }-- private static void carryOneStep(FIFORevQueue q, int carry, RevCommit c) {- if ((c.flags & carry) != carry) {- c.flags |= carry;- if (c.getParents() != null)- q.add(c);- }- }-- /**- * Carry a RevFlag set on this commit to its parents.- * <p>- * If this commit is parsed, has parents, and has the supplied flag set on- * it we automatically add it to the parents, grand-parents, and so on until- * an unparsed commit or a commit with no parents is discovered. This- * permits applications to force a flag through the history chain when- * necessary.- *- * @param flag- * the single flag value to carry back onto parents.- */- public void carry(RevFlag flag) {- final int carry = flags & flag.mask;- if (carry != 0)- carryFlags(this, carry);- }-- /**- * Time from the "committer " line of the buffer.- *- * @return commit time- */- public final int getCommitTime() {- return commitTime;- }-- /**- * Get a reference to this commit's tree.- *- * @return tree of this commit.- */- public final RevTree getTree() {- return tree;- }-- /**- * Get the number of parent commits listed in this commit.- *- * @return number of parents; always a positive value but can be 0.- */- public int getParentCount() {- return parents == null ? 0 : parents.length;- }-- /**- * Get the nth parent from this commit's parent list.- *- * @param nth- * parent index to obtain. Must be in the range 0 through- * {@link #getParentCount()}-1.- * @return the specified parent.- * @throws java.lang.ArrayIndexOutOfBoundsException- * an invalid parent index was specified.- */- public RevCommit getParent(int nth) {- return parents[nth];- }-- /**- * Obtain an array of all parents (<b>NOTE - THIS IS NOT A COPY</b>).- * <p>- * This method is exposed only to provide very fast, efficient access to- * this commit's parent list. Applications relying on this list should be- * very careful to ensure they do not modify its contents during their use- * of it.- *- * @return the array of parents.- */- public RevCommit[] getParents() {- return parents;- }-- /**- * Obtain the raw unparsed commit body (<b>NOTE - THIS IS NOT A COPY</b>).- * <p>- * This method is exposed only to provide very fast, efficient access to- * this commit's message buffer within a RevFilter. Applications relying on- * this buffer should be very careful to ensure they do not modify its- * contents during their use of it.- *- * @return the raw unparsed commit body. This is <b>NOT A COPY</b>. Altering- * the contents of this buffer may alter the walker's knowledge of- * this commit, and the results it produces.- */- public final byte[] getRawBuffer() {- return buffer;- }-- /**- * Parse the gpg signature from the raw buffer.- * <p>- * This method parses and returns the raw content of the gpgsig lines. This- * method is fairly expensive and produces a new byte[] instance on each- * invocation. Callers should invoke this method only if they are certain- * they will need, and should cache the return value for as long as- * necessary to use all information from it.- * <p>- * RevFilter implementations should try to use- * {@link org.eclipse.jgit.util.RawParseUtils} to scan the- * {@link #getRawBuffer()} instead, as this will allow faster evaluation of- * commits.- *- * @return contents of the gpg signature; null if the commit was not signed.- * @since 5.1- */- public final byte[] getRawGpgSignature() {- final byte[] raw = buffer;- final byte[] header = { 'g', 'p', 'g', 's', 'i', 'g' };- final int start = RawParseUtils.headerStart(header, raw, 0);- if (start < 0) {- return null;- }- final int end = RawParseUtils.headerEnd(raw, start);- return RawParseUtils.headerValue(raw, start, end);- }-- /**- * Parse the author identity from the raw buffer.- * <p>- * This method parses and returns the content of the author line, after- * taking the commit's character set into account and decoding the author- * name and email address. This method is fairly expensive and produces a- * new PersonIdent instance on each invocation. Callers should invoke this- * method only if they are certain they will be outputting the result, and- * should cache the return value for as long as necessary to use all- * information from it.- * <p>- * RevFilter implementations should try to use- * {@link org.eclipse.jgit.util.RawParseUtils} to scan the- * {@link #getRawBuffer()} instead, as this will allow faster evaluation of- * commits.- *- * @return identity of the author (name, email) and the time the commit was- * made by the author; null if no author line was found.- */- public final PersonIdent getAuthorIdent() {- final byte[] raw = buffer;- final int nameB = RawParseUtils.author(raw, 0);- if (nameB < 0)- return null;- return RawParseUtils.parsePersonIdent(raw, nameB);- }-- /**- * Parse the committer identity from the raw buffer.- * <p>- * This method parses and returns the content of the committer line, after- * taking the commit's character set into account and decoding the committer- * name and email address. This method is fairly expensive and produces a- * new PersonIdent instance on each invocation. Callers should invoke this- * method only if they are certain they will be outputting the result, and- * should cache the return value for as long as necessary to use all- * information from it.- * <p>- * RevFilter implementations should try to use- * {@link org.eclipse.jgit.util.RawParseUtils} to scan the- * {@link #getRawBuffer()} instead, as this will allow faster evaluation of- * commits.- *- * @return identity of the committer (name, email) and the time the commit- * was made by the committer; null if no committer line was found.- */- public final PersonIdent getCommitterIdent() {- final byte[] raw = buffer;- final int nameB = RawParseUtils.committer(raw, 0);- if (nameB < 0)- return null;- return RawParseUtils.parsePersonIdent(raw, nameB);- }-- /**- * Parse the complete commit message and decode it to a string.- * <p>- * This method parses and returns the message portion of the commit buffer,- * after taking the commit's character set into account and decoding the- * buffer using that character set. This method is a fairly expensive- * operation and produces a new string on each invocation.- *- * @return decoded commit message as a string. Never null.- */- public final String getFullMessage() {- byte[] raw = buffer;- int msgB = RawParseUtils.commitMessage(raw, 0);- if (msgB < 0) {- return ""; //$NON-NLS-1$- }- return RawParseUtils.decode(guessEncoding(buffer), raw, msgB,- raw.length);- }-- /**- * Parse the commit message and return the first "line" of it.- * <p>- * The first line is everything up to the first pair of LFs. This is the- * "oneline" format, suitable for output in a single line display.- * <p>- * This method parses and returns the message portion of the commit buffer,- * after taking the commit's character set into account and decoding the- * buffer using that character set. This method is a fairly expensive- * operation and produces a new string on each invocation.- *- * @return decoded commit message as a string. Never null. The returned- * string does not contain any LFs, even if the first paragraph- * spanned multiple lines. Embedded LFs are converted to spaces.- */- public final String getShortMessage() {- byte[] raw = buffer;- int msgB = RawParseUtils.commitMessage(raw, 0);- if (msgB < 0) {- return ""; //$NON-NLS-1$- }-- int msgE = RawParseUtils.endOfParagraph(raw, msgB);- String str = RawParseUtils.decode(guessEncoding(buffer), raw, msgB,- msgE);- if (hasLF(raw, msgB, msgE)) {- str = StringUtils.replaceLineBreaksWithSpace(str);- }- return str;- }-- static boolean hasLF(byte[] r, int b, int e) {- while (b < e)- if (r[b++] == '\n')- return true;- return false;- }-- /**- * Determine the encoding of the commit message buffer.- * <p>- * Locates the "encoding" header (if present) and returns its value. Due to- * corruption in the wild this may be an invalid encoding name that is not- * recognized by any character encoding library.- * <p>- * If no encoding header is present, null.- *- * @return the preferred encoding of {@link #getRawBuffer()}; or null.- * @since 4.2- */- @Nullable- public final String getEncodingName() {- return RawParseUtils.parseEncodingName(buffer);- }-- /**- * Determine the encoding of the commit message buffer.- * <p>- * Locates the "encoding" header (if present) and then returns the proper- * character set to apply to this buffer to evaluate its contents as- * character data.- * <p>- * If no encoding header is present {@code UTF-8} is assumed.- *- * @return the preferred encoding of {@link #getRawBuffer()}.- * @throws IllegalCharsetNameException- * if the character set requested by the encoding header is- * malformed and unsupportable.- * @throws UnsupportedCharsetException- * if the JRE does not support the character set requested by- * the encoding header.- */- public final Charset getEncoding() {- return RawParseUtils.parseEncoding(buffer);- }-- /**- * Parse the footer lines (e.g. "Signed-off-by") for machine processing.- * <p>- * This method splits all of the footer lines out of the last paragraph of- * the commit message, providing each line as a key-value pair, ordered by- * the order of the line's appearance in the commit message itself.- * <p>- * A footer line's key must match the pattern {@code ^[A-Za-z0-9-]+:}, while- * the value is free-form. The Value may be split over multiple lines with- * each subsequent line starting with at least one whitespace. Very common- * keys seen in the wild are:- * <ul>- * <li>{@code Signed-off-by} (agrees to Developer Certificate of Origin)- * <li>{@code Acked-by} (thinks change looks sane in context)- * <li>{@code Reported-by} (originally found the issue this change fixes)- * <li>{@code Tested-by} (validated change fixes the issue for them)- * <li>{@code CC}, {@code Cc} (copy on all email related to this change)- * <li>{@code Bug} (link to project's bug tracking system)- * </ul>- *- * @return ordered list of footer lines; empty list if no footers found.- */- public final List<FooterLine> getFooterLines() {- return FooterLine.fromMessage(buffer);- }-- /**- * Get the values of all footer lines with the given key.- *- * @param keyName- * footer key to find values of, case-insensitive.- * @return values of footers with key of {@code keyName}, ordered by their- * order of appearance. Duplicates may be returned if the same- * footer appeared more than once. Empty list if no footers appear- * with the specified key, or there are no footers at all.- * @see #getFooterLines()- */- public final List<String> getFooterLines(String keyName) {- return FooterLine.getValues(getFooterLines(), keyName);- }-- /**- * Get the values of all footer lines with the given key.- *- * @param key- * footer key to find values of, case-insensitive.- * @return values of footers with key of {@code keyName}, ordered by their- * order of appearance. Duplicates may be returned if the same- * footer appeared more than once. Empty list if no footers appear- * with the specified key, or there are no footers at all.- * @see #getFooterLines()- */- public final List<String> getFooterLines(FooterKey key) {- return FooterLine.getValues(getFooterLines(), key);- }-- /**- * Get the distance of the commit from the root, as defined in- * {@link org.eclipse.jgit.internal.storage.commitgraph.CommitGraph}- * <p>- * Generation number is- * {@link org.eclipse.jgit.lib.Constants#COMMIT_GENERATION_UNKNOWN} when the- * commit is not in the commit-graph. If a commit-graph file was written by- * a version of Git that did not compute generation numbers, then those- * commits in commit-graph will have generation number represented by- * {@link org.eclipse.jgit.lib.Constants#COMMIT_GENERATION_NOT_COMPUTED}.- *- * @return the generation number- * @since 6.5- */- int getGeneration() {- return Constants.COMMIT_GENERATION_UNKNOWN;- }-- /**- * Get the changed path filter of the commit.- * <p>- * This is null when there is no commit graph file, the commit is not in the- * commit graph file, or the commit graph file was generated without changed- * path filters.- *- * @param rw A revwalk to load the commit graph (if available)- * @return the changed path filter- * @since 6.7- */- public ChangedPathFilter getChangedPathFilter(RevWalk rw) {- return null;- }-- /**- * Reset this commit to allow another RevWalk with the same instances.- * <p>- * Subclasses <b>must</b> call <code>super.reset()</code> to ensure the- * basic information can be correctly cleared out.- */- public void reset() {- inDegree = 0;- }-- /**- * Discard the message buffer to reduce memory usage.- * <p>- * After discarding the memory usage of the {@code RevCommit} is reduced to- * only the {@link #getTree()} and {@link #getParents()} pointers and the- * time in {@link #getCommitTime()}. Accessing other properties such as- * {@link #getAuthorIdent()}, {@link #getCommitterIdent()} or either message- * function requires reloading the buffer by invoking- * {@link org.eclipse.jgit.revwalk.RevWalk#parseBody(RevObject)}.- *- * @since 4.0- */- public final void disposeBody() {- buffer = null;- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- s.append(Constants.typeString(getType()));- s.append(' ');- s.append(name());- s.append(' ');- s.append(commitTime);- s.append(' ');- appendCoreFlags(s);- return s.toString();- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitCG.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitCG.javadeleted file mode 100644index c7a03992b7..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitCG.java+++ /dev/null@@ -1,110 +0,0 @@-/*- * Copyright (C) 2023, Tencent.- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.storage.commitgraph.ChangedPathFilter;-import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;--/**- * RevCommit parsed from- * {@link org.eclipse.jgit.internal.storage.commitgraph.CommitGraph}.- *- * @since 6.5- */-class RevCommitCG extends RevCommit {-- private final int graphPosition;-- private int generation = Constants.COMMIT_GENERATION_UNKNOWN;-- /**- * Create a new commit reference.- *- * @param id- * object name for the commit.- * @param graphPosition- * the position in the commit-graph of the object.- */- protected RevCommitCG(AnyObjectId id, int graphPosition) {- super(id);- this.graphPosition = graphPosition;- }-- @Override- void parseCanonical(RevWalk walk, byte[] raw) throws IOException {- if (walk.isRetainBody()) {- buffer = raw;- }- parseInGraph(walk);- }-- @Override- void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (walk.isRetainBody()) {- super.parseBody(walk); // This parses header and body- return;- }- parseInGraph(walk);- }-- private void parseInGraph(RevWalk walk) throws IOException {- CommitGraph graph = walk.commitGraph();- CommitGraph.CommitData data = graph.getCommitData(graphPosition);- if (data == null) {- // RevCommitCG was created because we got its graphPosition from- // commit-graph. If now the commit-graph doesn't know about it,- // something went wrong.- throw new IllegalStateException();- }- if (!walk.shallowCommitsInitialized) {- walk.initializeShallowCommits(this);- }-- this.tree = walk.lookupTree(data.getTree());- this.commitTime = (int) data.getCommitTime();- this.generation = data.getGeneration();-- if (getParents() == null) {- int[] pGraphList = data.getParents();- if (pGraphList.length == 0) {- this.parents = RevCommit.NO_PARENTS;- } else {- RevCommit[] pList = new RevCommit[pGraphList.length];- for (int i = 0; i < pList.length; i++) {- int graphPos = pGraphList[i];- ObjectId objId = graph.getObjectId(graphPos);- pList[i] = walk.lookupCommit(objId, graphPos);- }- this.parents = pList;- }- }- flags |= PARSED;- }-- @Override- int getGeneration() {- return generation;- }-- /** {@inheritDoc} */- @Override- public ChangedPathFilter getChangedPathFilter(RevWalk rw) {- return rw.commitGraph().getChangedPathFilter(graphPosition);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.javadeleted file mode 100644index 58f5d425cc..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java+++ /dev/null@@ -1,390 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.revwalk.filter.RevFilter;--/**- * An ordered list of {@link org.eclipse.jgit.revwalk.RevCommit} subclasses.- *- * @param <E>- * type of subclass of RevCommit the list is storing.- */-public class RevCommitList<E extends RevCommit> extends RevObjectList<E> {- private RevWalk walker;-- @Override- public void clear() {- super.clear();- walker = null;- }-- /**- * Apply a flag to all commits matching the specified filter.- * <p>- * Same as <code>applyFlag(matching, flag, 0, size())</code>, but without- * the incremental behavior.- *- * @param matching- * the filter to test commits with. If the filter includes a- * commit it will have the flag set; if the filter does not- * include the commit the flag will be unset.- * @param flag- * the flag to apply (or remove). Applications are responsible- * for allocating this flag from the source RevWalk.- * @throws java.io.IOException- * revision filter needed to read additional objects, but an- * error occurred while reading the pack files or loose objects- * of the repository.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * revision filter needed to read additional objects, but an- * object was not of the correct type. Repository corruption may- * have occurred.- * @throws org.eclipse.jgit.errors.MissingObjectException- * revision filter needed to read additional objects, but an- * object that should be present was not found. Repository- * corruption may have occurred.- */- public void applyFlag(RevFilter matching, RevFlag flag)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- applyFlag(matching, flag, 0, size());- }-- /**- * Apply a flag to all commits matching the specified filter.- * <p>- * This version allows incremental testing and application, such as from a- * background thread that needs to periodically halt processing and send- * updates to the UI.- *- * @param matching- * the filter to test commits with. If the filter includes a- * commit it will have the flag set; if the filter does not- * include the commit the flag will be unset.- * @param flag- * the flag to apply (or remove). Applications are responsible- * for allocating this flag from the source RevWalk.- * @param rangeBegin- * first commit within the list to begin testing at, inclusive.- * Must not be negative, but may be beyond the end of the list.- * @param rangeEnd- * last commit within the list to end testing at, exclusive. If- * smaller than or equal to <code>rangeBegin</code> then no- * commits will be tested.- * @throws java.io.IOException- * revision filter needed to read additional objects, but an- * error occurred while reading the pack files or loose objects- * of the repository.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * revision filter needed to read additional objects, but an- * object was not of the correct type. Repository corruption may- * have occurred.- * @throws org.eclipse.jgit.errors.MissingObjectException- * revision filter needed to read additional objects, but an- * object that should be present was not found. Repository- * corruption may have occurred.- */- public void applyFlag(final RevFilter matching, final RevFlag flag,- int rangeBegin, int rangeEnd) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- final RevWalk w = flag.getRevWalk();- rangeEnd = Math.min(rangeEnd, size());- while (rangeBegin < rangeEnd) {- int index = rangeBegin;- Block s = contents;- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- s = (Block) s.contents[i];- }-- while (rangeBegin++ < rangeEnd && index < BLOCK_SIZE) {- final RevCommit c = (RevCommit) s.contents[index++];- if (matching.include(w, c))- c.add(flag);- else- c.remove(flag);- }- }- }-- /**- * Remove the given flag from all commits.- * <p>- * Same as <code>clearFlag(flag, 0, size())</code>, but without the- * incremental behavior.- *- * @param flag- * the flag to remove. Applications are responsible for- * allocating this flag from the source RevWalk.- */- public void clearFlag(RevFlag flag) {- clearFlag(flag, 0, size());- }-- /**- * Remove the given flag from all commits.- * <p>- * This method is actually implemented in terms of:- * <code>applyFlag(RevFilter.NONE, flag, rangeBegin, rangeEnd)</code>.- *- * @param flag- * the flag to remove. Applications are responsible for- * allocating this flag from the source RevWalk.- * @param rangeBegin- * first commit within the list to begin testing at, inclusive.- * Must not be negative, but may be beyond the end of the list.- * @param rangeEnd- * last commit within the list to end testing at, exclusive. If- * smaller than or equal to <code>rangeBegin</code> then no- * commits will be tested.- */- public void clearFlag(final RevFlag flag, final int rangeBegin,- final int rangeEnd) {- try {- applyFlag(RevFilter.NONE, flag, rangeBegin, rangeEnd);- } catch (IOException e) {- // Never happen. The filter we use does not throw any- // exceptions, for any reason.- }- }-- /**- * Find the next commit that has the given flag set.- *- * @param flag- * the flag to test commits against.- * @param begin- * first commit index to test at. Applications may wish to begin- * at 0, to test the first commit in the list.- * @return index of the first commit at or after index <code>begin</code>- * that has the specified flag set on it; -1 if no match is found.- */- public int indexOf(RevFlag flag, int begin) {- while (begin < size()) {- int index = begin;- Block s = contents;- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- s = (Block) s.contents[i];- }-- while (begin++ < size() && index < BLOCK_SIZE) {- final RevCommit c = (RevCommit) s.contents[index++];- if (c.has(flag))- return begin;- }- }- return -1;- }-- /**- * Find the next commit that has the given flag set.- *- * @param flag- * the flag to test commits against.- * @param begin- * first commit index to test at. Applications may wish to begin- * at <code>size()-1</code>, to test the last commit in the- * list.- * @return index of the first commit at or before index <code>begin</code>- * that has the specified flag set on it; -1 if no match is found.- */- public int lastIndexOf(RevFlag flag, int begin) {- begin = Math.min(begin, size() - 1);- while (begin >= 0) {- int index = begin;- Block s = contents;- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- s = (Block) s.contents[i];- }-- while (begin-- >= 0 && index >= 0) {- final RevCommit c = (RevCommit) s.contents[index--];- if (c.has(flag))- return begin;- }- }- return -1;- }-- /**- * Set the revision walker this list populates itself from.- *- * @param w- * the walker to populate from.- * @see #fillTo(int)- */- public void source(RevWalk w) {- walker = w;- }-- /**- * Is this list still pending more items?- *- * @return true if {@link #fillTo(int)} might be able to extend the list- * size when called.- */- public boolean isPending() {- return walker != null;- }-- /**- * Ensure this list contains at least a specified number of commits.- * <p>- * The revision walker specified by {@link #source(RevWalk)} is pumped until- * the given number of commits are contained in this list. If there are- * fewer total commits available from the walk then the method will return- * early. Callers can test the final size of the list by {@link #size()} to- * determine if the high water mark specified was met.- *- * @param highMark- * number of commits the caller wants this list to contain when- * the fill operation is complete.- * @throws java.io.IOException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- * @throws org.eclipse.jgit.errors.MissingObjectException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- */- @SuppressWarnings("unchecked")- public void fillTo(int highMark) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (walker == null || size > highMark)- return;-- RevCommit c = walker.next();- if (c == null) {- walker = null;- return;- }- enter(size, (E) c);- add((E) c);-- while (size <= highMark) {- int index = size;- Block s = contents;- while (index >> s.shift >= BLOCK_SIZE) {- s = new Block(s.shift + BLOCK_SHIFT);- s.contents[0] = contents;- contents = s;- }- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- if (s.contents[i] == null)- s.contents[i] = new Block(s.shift - BLOCK_SHIFT);- s = (Block) s.contents[i];- }-- final Object[] dst = s.contents;- while (size <= highMark && index < BLOCK_SIZE) {- c = walker.next();- if (c == null) {- walker = null;- return;- }- enter(size++, (E) c);- dst[index++] = c;- }- }- }-- /**- * Ensures all commits until the given commit are loaded. The revision- * walker specified by {@link #source(RevWalk)} is pumped until the- * specified commit is loaded. Callers can test the final size of the list- * by {@link #size()} to determine if the high water mark specified was met.- *- * @param commitToLoad- * commit the caller wants this list to contain when the fill- * operation is complete.- * @param highMark- * maximum number of commits the caller wants this list to- * contain when the fill operation is complete. If highMark is 0- * the walk is pumped until the specified commit or the end of- * the walk is reached.- * @throws java.io.IOException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- * @throws org.eclipse.jgit.errors.MissingObjectException- * see {@link org.eclipse.jgit.revwalk.RevWalk#next()}- */- @SuppressWarnings("unchecked")- public void fillTo(RevCommit commitToLoad, int highMark)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- if (walker == null || commitToLoad == null- || (highMark > 0 && size > highMark))- return;-- RevCommit c = walker.next();- if (c == null) {- walker = null;- return;- }- enter(size, (E) c);- add((E) c);-- while ((highMark == 0 || size <= highMark) && !c.equals(commitToLoad)) {- int index = size;- Block s = contents;- while (index >> s.shift >= BLOCK_SIZE) {- s = new Block(s.shift + BLOCK_SHIFT);- s.contents[0] = contents;- contents = s;- }- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- if (s.contents[i] == null)- s.contents[i] = new Block(s.shift - BLOCK_SHIFT);- s = (Block) s.contents[i];- }-- final Object[] dst = s.contents;- while ((highMark == 0 || size <= highMark) && index < BLOCK_SIZE- && !c.equals(commitToLoad)) {- c = walker.next();- if (c == null) {- walker = null;- return;- }- enter(size++, (E) c);- dst[index++] = c;- }- }- }-- /**- * Optional callback invoked when commits enter the list by fillTo.- * <p>- * This method is only called during {@link #fillTo(int)}.- *- * @param index- * the list position this object will appear at.- * @param e- * the object being added (or set) into the list.- */- protected void enter(int index, E e) {- // Do nothing by default.- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.javadeleted file mode 100644index 3221bf6e8f..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java+++ /dev/null@@ -1,86 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.text.MessageFormat;--import org.eclipse.jgit.internal.JGitText;--/**- * Application level mark bit for {@link org.eclipse.jgit.revwalk.RevObject}s.- * <p>- * To create a flag use- * {@link org.eclipse.jgit.revwalk.RevWalk#newFlag(String)}.- */-public class RevFlag {- /**- * Uninteresting by {@link RevWalk#markUninteresting(RevCommit)}.- * <p>- * We flag commits as uninteresting if the caller does not want commits- * reachable from a commit to {@link RevWalk#markUninteresting(RevCommit)}.- * This flag is always carried into the commit's parents and is a key part- * of the "rev-list B --not A" feature; A is marked UNINTERESTING.- * <p>- * This is a static flag. Its RevWalk is not available.- */- public static final RevFlag UNINTERESTING = new StaticRevFlag(- "UNINTERESTING", RevWalk.UNINTERESTING); //$NON-NLS-1$-- /**- * Set on RevCommit instances added to {@link RevWalk#pending} queue.- * <p>- * We use this flag to avoid adding the same commit instance twice to our- * queue, especially if we reached it by more than one path.- * <p>- * This is a static flag. Its RevWalk is not available.- *- * @since 3.0- */- public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN); //$NON-NLS-1$-- final RevWalk walker;-- final String name;-- final int mask;-- RevFlag(RevWalk w, String n, int m) {- walker = w;- name = n;- mask = m;- }-- /**- * Get the revision walk instance this flag was created from.- *- * @return the walker this flag was allocated out of, and belongs to.- */- public RevWalk getRevWalk() {- return walker;- }-- @Override- public String toString() {- return name;- }-- static class StaticRevFlag extends RevFlag {- StaticRevFlag(String n, int m) {- super(null, n, m);- }-- @Override- public RevWalk getRevWalk() {- throw new UnsupportedOperationException(MessageFormat.format(- JGitText.get().isAStaticFlagAndHasNorevWalkInstance, toString()));- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.javadeleted file mode 100644index 6a98249892..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java+++ /dev/null@@ -1,133 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.util.AbstractSet;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Iterator;-import java.util.List;--/**- * Multiple application level mark bits for- * {@link org.eclipse.jgit.revwalk.RevObject}s.- *- * @see RevFlag- */-public class RevFlagSet extends AbstractSet<RevFlag> {- int mask;-- private final List<RevFlag> active;-- /**- * Create an empty set of flags.- */- public RevFlagSet() {- active = new ArrayList<>();- }-- /**- * Create a set of flags, copied from an existing set.- *- * @param s- * the set to copy flags from.- */- public RevFlagSet(RevFlagSet s) {- mask = s.mask;- active = new ArrayList<>(s.active);- }-- /**- * Create a set of flags, copied from an existing collection.- *- * @param s- * the collection to copy flags from.- */- public RevFlagSet(Collection<RevFlag> s) {- this();- addAll(s);- }-- /** {@inheritDoc} */- @Override- public boolean contains(Object o) {- if (o instanceof RevFlag)- return (mask & ((RevFlag) o).mask) != 0;- return false;- }-- /** {@inheritDoc} */- @Override- public boolean containsAll(Collection<?> c) {- if (c instanceof RevFlagSet) {- final int cMask = ((RevFlagSet) c).mask;- return (mask & cMask) == cMask;- }- return super.containsAll(c);- }-- /** {@inheritDoc} */- @Override- public boolean add(RevFlag flag) {- if ((mask & flag.mask) != 0)- return false;- mask |= flag.mask;- int p = 0;- while (p < active.size() && active.get(p).mask < flag.mask)- p++;- active.add(p, flag);- return true;- }-- /** {@inheritDoc} */- @Override- public boolean remove(Object o) {- final RevFlag flag = (RevFlag) o;- if ((mask & flag.mask) == 0)- return false;- mask &= ~flag.mask;- for (int i = 0; i < active.size(); i++)- if (active.get(i).mask == flag.mask)- active.remove(i);- return true;- }-- /** {@inheritDoc} */- @Override- public Iterator<RevFlag> iterator() {- final Iterator<RevFlag> i = active.iterator();- return new Iterator<>() {- private RevFlag current;-- @Override- public boolean hasNext() {- return i.hasNext();- }-- @Override- public RevFlag next() {- return current = i.next();- }-- @Override- public void remove() {- mask &= ~current.mask;- i.remove();- }- };- }-- /** {@inheritDoc} */- @Override- public int size() {- return active.size();- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObject.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObject.javadeleted file mode 100644index 55ea30d24b..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObject.java+++ /dev/null@@ -1,161 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectIdOwnerMap;--/**- * Base object type accessed during revision walking.- */-public abstract class RevObject extends ObjectIdOwnerMap.Entry {- static final int PARSED = 1;-- int flags;-- RevObject(AnyObjectId name) {- super(name);- }-- abstract void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException;-- abstract void parseBody(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException;-- /**- * Get Git object type. See {@link org.eclipse.jgit.lib.Constants}.- *- * @return object type- */- public abstract int getType();-- /**- * Get the name of this object.- *- * @return unique hash of this object.- */- public final ObjectId getId() {- return this;- }-- /**- * Test to see if the flag has been set on this object.- *- * @param flag- * the flag to test.- * @return true if the flag has been added to this object; false if not.- */- public final boolean has(RevFlag flag) {- return (flags & flag.mask) != 0;- }-- /**- * Test to see if any flag in the set has been set on this object.- *- * @param set- * the flags to test.- * @return true if any flag in the set has been added to this object; false- * if not.- */- public final boolean hasAny(RevFlagSet set) {- return (flags & set.mask) != 0;- }-- /**- * Test to see if all flags in the set have been set on this object.- *- * @param set- * the flags to test.- * @return true if all flags of the set have been added to this object;- * false if some or none have been added.- */- public final boolean hasAll(RevFlagSet set) {- return (flags & set.mask) == set.mask;- }-- /**- * Add a flag to this object.- * <p>- * If the flag is already set on this object then the method has no effect.- *- * @param flag- * the flag to mark on this object, for later testing.- */- public final void add(RevFlag flag) {- flags |= flag.mask;- }-- /**- * Add a set of flags to this object.- *- * @param set- * the set of flags to mark on this object, for later testing.- */- public final void add(RevFlagSet set) {- flags |= set.mask;- }-- /**- * Remove a flag from this object.- * <p>- * If the flag is not set on this object then the method has no effect.- *- * @param flag- * the flag to remove from this object.- */- public final void remove(RevFlag flag) {- flags &= ~flag.mask;- }-- /**- * Remove a set of flags from this object.- *- * @param set- * the flag to remove from this object.- */- public final void remove(RevFlagSet set) {- flags &= ~set.mask;- }-- @Override- public String toString() {- final StringBuilder s = new StringBuilder();- s.append(Constants.typeString(getType()));- s.append(' ');- s.append(name());- s.append(' ');- appendCoreFlags(s);- return s.toString();- }-- /**- * Append a debug description of core RevFlags to a buffer.- *- * @param s- * buffer to append a debug description of core RevFlags onto.- */- protected void appendCoreFlags(StringBuilder s) {- s.append((flags & RevWalk.TOPO_DELAY) != 0 ? 'o' : '-');- s.append((flags & RevWalk.TOPO_QUEUED) != 0 ? 'q' : '-');- s.append((flags & RevWalk.TEMP_MARK) != 0 ? 't' : '-');- s.append((flags & RevWalk.REWRITE) != 0 ? 'r' : '-');- s.append((flags & RevWalk.UNINTERESTING) != 0 ? 'u' : '-');- s.append((flags & RevWalk.SEEN) != 0 ? 's' : '-');- s.append((flags & RevWalk.PARSED) != 0 ? 'p' : '-');- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.javadeleted file mode 100644index ad8aeedeb9..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java+++ /dev/null@@ -1,116 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2009, Jonas Fonseca <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.text.MessageFormat;-import java.util.AbstractList;--import org.eclipse.jgit.internal.JGitText;--/**- * An ordered list of {@link org.eclipse.jgit.revwalk.RevObject} subclasses.- *- * @param <E>- * type of subclass of RevObject the list is storing.- */-public class RevObjectList<E extends RevObject> extends AbstractList<E> {- static final int BLOCK_SHIFT = 8;-- static final int BLOCK_SIZE = 1 << BLOCK_SHIFT;-- /**- * Items stored in this list.- * <p>- * If {@link Block#shift} = 0 this block holds the list elements; otherwise- * it holds pointers to other {@link Block} instances which use a shift that- * is {@link #BLOCK_SHIFT} smaller.- */- protected Block contents = new Block(0);-- /** Current number of elements in the list. */- protected int size = 0;-- /**- * Create an empty object list.- */- public RevObjectList() {- // Initialized above.- }-- @Override- public void add(int index, E element) {- if (index != size)- throw new UnsupportedOperationException(MessageFormat.format(- JGitText.get().unsupportedOperationNotAddAtEnd,- Integer.valueOf(index)));- set(index, element);- size++;- }-- @Override- @SuppressWarnings("unchecked")- public E set(int index, E element) {- Block s = contents;- while (index >> s.shift >= BLOCK_SIZE) {- s = new Block(s.shift + BLOCK_SHIFT);- s.contents[0] = contents;- contents = s;- }- while (s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- if (s.contents[i] == null)- s.contents[i] = new Block(s.shift - BLOCK_SHIFT);- s = (Block) s.contents[i];- }- final Object old = s.contents[index];- s.contents[index] = element;- return (E) old;- }-- @Override- @SuppressWarnings("unchecked")- public E get(int index) {- Block s = contents;- if (index >> s.shift >= 1024)- return null;- while (s != null && s.shift > 0) {- final int i = index >> s.shift;- index -= i << s.shift;- s = (Block) s.contents[i];- }- return s != null ? (E) s.contents[index] : null;- }-- @Override- public int size() {- return size;- }-- @Override- public void clear() {- contents = new Block(0);- size = 0;- }-- /** One level of contents, either an intermediate level or a leaf level. */- protected static class Block {- final Object[] contents = new Object[BLOCK_SIZE];-- final int shift;-- Block(int s) {- shift = s;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevSort.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevSort.javadeleted file mode 100644index 08396a8061..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevSort.java+++ /dev/null@@ -1,72 +0,0 @@-/*- * Copyright (C) 2008, Marek Zawirski <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--/**- * Sorting strategies supported by {@link org.eclipse.jgit.revwalk.RevWalk} and- * {@link org.eclipse.jgit.revwalk.ObjectWalk}.- */-public enum RevSort {- /**- * No specific sorting is requested.- * <p>- * Applications should not rely upon the ordering produced by this strategy.- * Any ordering in the output is caused by low level implementation details- * and may change without notice.- */- NONE,-- /**- * Sort by commit time, descending (newest first, oldest last).- * <p>- * This strategy can be combined with {@link #TOPO}.- */- COMMIT_TIME_DESC,-- /**- * Topological sorting (all children before parents).- * <p>- * This strategy can be combined with {@link #COMMIT_TIME_DESC}.- */- TOPO,-- /**- * Topological sorting (all children before parents) without intermixing- * lines of history.- * <p>- * This behavior more closely resembles C Git's git-log --topo-order than- * {@link #TOPO}. See C Git's topo-order <a href=- * "https://git-scm.com/docs/git-log#Documentation/git-log.txt---topo-order">description</a>.- *- * @since 5.8- */- TOPO_KEEP_BRANCH_TOGETHER,-- /**- * Flip the output into the reverse ordering.- * <p>- * This strategy can be combined with the others described by this type as- * it is usually performed at the very end.- */- REVERSE,-- /**- * Include {@link RevFlag#UNINTERESTING} boundary commits after all others.- * In {@link ObjectWalk}, objects associated with such commits (trees,- * blobs), and all other objects marked explicitly as UNINTERESTING are also- * included.- * <p>- * A boundary commit is a UNINTERESTING parent of an interesting commit that- * was previously output.- */- BOUNDARY;-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTag.javadeleted file mode 100644index 75dbd57740..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java+++ /dev/null@@ -1,375 +0,0 @@-/*- * Copyright (C) 2008, 2009, Google Inc.- * Copyright (C) 2008, Marek Zawirski <[email protected]>- * Copyright (C) 2008, 2021, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import static java.nio.charset.StandardCharsets.UTF_8;--import java.io.IOException;-import java.nio.charset.Charset;-import java.nio.charset.IllegalCharsetNameException;-import java.nio.charset.UnsupportedCharsetException;-import java.util.Arrays;--import org.eclipse.jgit.annotations.Nullable;-import org.eclipse.jgit.errors.CorruptObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectInserter;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.util.MutableInteger;-import org.eclipse.jgit.util.RawParseUtils;-import org.eclipse.jgit.util.StringUtils;--/**- * An annotated tag.- */-public class RevTag extends RevObject {-- private static final byte[] hSignature = Constants- .encodeASCII("-----BEGIN PGP SIGNATURE-----"); //$NON-NLS-1$-- /**- * Parse an annotated tag from its canonical format.- *- * This method constructs a temporary revision pool, parses the tag as- * supplied, and returns it to the caller. Since the tag was built inside of- * a private revision pool its object pointer will be initialized, but will- * not have its headers loaded.- *- * Applications are discouraged from using this API. Callers usually need- * more than one object. Use- * {@link org.eclipse.jgit.revwalk.RevWalk#parseTag(AnyObjectId)} to obtain- * a RevTag from an existing repository.- *- * @param raw- * the canonical formatted tag to be parsed.- * @return the parsed tag, in an isolated revision pool that is not- * available to the caller.- * @throws org.eclipse.jgit.errors.CorruptObjectException- * the tag contains a malformed header that cannot be handled.- */- public static RevTag parse(byte[] raw) throws CorruptObjectException {- return parse(new RevWalk((ObjectReader) null), raw);- }-- /**- * Parse an annotated tag from its canonical format.- * <p>- * This method inserts the tag directly into the caller supplied revision- * pool, making it appear as though the tag exists in the repository, even- * if it doesn't. The repository under the pool is not affected.- * <p>- * The body of the tag (message, tagger, signature) is always retained in- * the returned {@code RevTag}, even if the supplied {@code RevWalk} has- * been configured with {@code setRetainBody(false)}.- *- * @param rw- * the revision pool to allocate the tag within. The tag's object- * pointer will be obtained from this pool.- * @param raw- * the canonical formatted tag to be parsed. This buffer will be- * retained by the returned {@code RevTag} and must not be- * modified by the caller.- * @return the parsed tag, in an isolated revision pool that is not- * available to the caller.- * @throws org.eclipse.jgit.errors.CorruptObjectException- * the tag contains a malformed header that cannot be handled.- */- public static RevTag parse(RevWalk rw, byte[] raw)- throws CorruptObjectException {- try (ObjectInserter.Formatter fmt = new ObjectInserter.Formatter()) {- RevTag r = rw.lookupTag(fmt.idFor(Constants.OBJ_TAG, raw));- r.parseCanonical(rw, raw);- r.buffer = raw;- return r;- }- }-- private RevObject object;-- private byte[] buffer;-- private String tagName;-- /**- * Create a new tag reference.- *- * @param id- * object name for the tag.- */- protected RevTag(AnyObjectId id) {- super(id);- }-- @Override- void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- parseCanonical(walk, walk.getCachedBytes(this));- }-- @Override- void parseBody(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (buffer == null) {- buffer = walk.getCachedBytes(this);- if ((flags & PARSED) == 0)- parseCanonical(walk, buffer);- }- }-- void parseCanonical(RevWalk walk, byte[] rawTag)- throws CorruptObjectException {- final MutableInteger pos = new MutableInteger();- final int oType;-- pos.value = 53; // "object $sha1\ntype "- oType = Constants.decodeTypeString(this, rawTag, (byte) '\n', pos);- walk.idBuffer.fromString(rawTag, 7);- object = walk.lookupAny(walk.idBuffer, oType);-- int p = pos.value += 4; // "tag "- final int nameEnd = RawParseUtils.nextLF(rawTag, p) - 1;- tagName = RawParseUtils.decode(UTF_8, rawTag, p, nameEnd);-- if (walk.isRetainBody())- buffer = rawTag;- flags |= PARSED;- }-- @Override- public final int getType() {- return Constants.OBJ_TAG;- }-- /**- * Parse the tagger identity from the raw buffer.- * <p>- * This method parses and returns the content of the tagger line, after- * taking the tag's character set into account and decoding the tagger- * name and email address. This method is fairly expensive and produces a- * new PersonIdent instance on each invocation. Callers should invoke this- * method only if they are certain they will be outputting the result, and- * should cache the return value for as long as necessary to use all- * information from it.- *- * @return identity of the tagger (name, email) and the time the tag- * was made by the tagger; null if no tagger line was found.- */- public final PersonIdent getTaggerIdent() {- final byte[] raw = buffer;- final int nameB = RawParseUtils.tagger(raw, 0);- if (nameB < 0)- return null;- return RawParseUtils.parsePersonIdent(raw, nameB);- }-- private static int nextStart(byte[] prefix, byte[] buffer, int from) {- int stop = buffer.length - prefix.length + 1;- int ptr = from;- if (ptr > 0) {- ptr = RawParseUtils.nextLF(buffer, ptr - 1);- }- while (ptr < stop) {- int lineStart = ptr;- boolean found = true;- for (byte element : prefix) {- if (element != buffer[ptr++]) {- found = false;- break;- }- }- if (found) {- return lineStart;- }- do {- ptr = RawParseUtils.nextLF(buffer, ptr);- } while (ptr < stop && buffer[ptr] == '\n');- }- return -1;- }-- private int getSignatureStart() {- byte[] raw = buffer;- int msgB = RawParseUtils.tagMessage(raw, 0);- if (msgB < 0) {- return msgB;- }- // Find the last signature start and return the rest- int start = nextStart(hSignature, raw, msgB);- if (start < 0) {- return start;- }- int next = RawParseUtils.nextLF(raw, start);- while (next < raw.length) {- int newStart = nextStart(hSignature, raw, next);- if (newStart < 0) {- break;- }- start = newStart;- next = RawParseUtils.nextLF(raw, start);- }- return start;- }-- /**- * Parse the GPG signature from the raw buffer.- *- * @return contents of the GPG signature; {@code null} if the tag was not- * signed.- * @since 5.11- */- @Nullable- public final byte[] getRawGpgSignature() {- byte[] raw = buffer;- int start = getSignatureStart();- if (start < 0) {- return null;- }- return Arrays.copyOfRange(raw, start, raw.length);- }-- /**- * Parse the complete tag message and decode it to a string.- * <p>- * This method parses and returns the message portion of the tag buffer,- * after taking the tag's character set into account and decoding the buffer- * using that character set. This method is a fairly expensive operation and- * produces a new string on each invocation.- *- * @return decoded tag message as a string. Never null.- */- public final String getFullMessage() {- byte[] raw = buffer;- int msgB = RawParseUtils.tagMessage(raw, 0);- if (msgB < 0) {- return ""; //$NON-NLS-1$- }- int signatureStart = getSignatureStart();- int end = signatureStart < 0 ? raw.length : signatureStart;- if (end == msgB) {- return ""; //$NON-NLS-1$- }- return RawParseUtils.decode(guessEncoding(), raw, msgB, end);- }-- /**- * Parse the tag message and return the first "line" of it.- * <p>- * The first line is everything up to the first pair of LFs. This is the- * "oneline" format, suitable for output in a single line display.- * <p>- * This method parses and returns the message portion of the tag buffer,- * after taking the tag's character set into account and decoding the buffer- * using that character set. This method is a fairly expensive operation and- * produces a new string on each invocation.- *- * @return decoded tag message as a string. Never null. The returned string- * does not contain any LFs, even if the first paragraph spanned- * multiple lines. Embedded LFs are converted to spaces.- */- public final String getShortMessage() {- byte[] raw = buffer;- int msgB = RawParseUtils.tagMessage(raw, 0);- if (msgB < 0) {- return ""; //$NON-NLS-1$- }-- int msgE = RawParseUtils.endOfParagraph(raw, msgB);- int signatureStart = getSignatureStart();- if (signatureStart >= msgB && msgE > signatureStart) {- msgE = signatureStart;- if (msgE > msgB) {- msgE--;- }- if (msgB == msgE) {- return ""; //$NON-NLS-1$- }- }- String str = RawParseUtils.decode(guessEncoding(), raw, msgB, msgE);- if (RevCommit.hasLF(raw, msgB, msgE)) {- str = StringUtils.replaceLineBreaksWithSpace(str);- }- return str;- }-- private Charset guessEncoding() {- try {- return RawParseUtils.parseEncoding(buffer);- } catch (IllegalCharsetNameException | UnsupportedCharsetException e) {- return UTF_8;- }- }-- /**- * Get a reference to the object this tag was placed on.- * <p>- * Note that the returned object has only been looked up (see- * {@link org.eclipse.jgit.revwalk.RevWalk#lookupAny(AnyObjectId, int)}. To- * access the contents it needs to be parsed, see- * {@link org.eclipse.jgit.revwalk.RevWalk#parseHeaders(RevObject)} and- * {@link org.eclipse.jgit.revwalk.RevWalk#parseBody(RevObject)}.- * <p>- * As an alternative, use- * {@link org.eclipse.jgit.revwalk.RevWalk#peel(RevObject)} and pass this- * {@link org.eclipse.jgit.revwalk.RevTag} to peel it until the first- * non-tag object.- *- * @return object this tag refers to (only looked up, not parsed)- */- public final RevObject getObject() {- return object;- }-- /**- * Get the name of this tag, from the tag header.- *- * @return name of the tag, according to the tag header.- */- public final String getTagName() {- return tagName;- }-- /**- * Obtain the raw unparsed tag body (<b>NOTE - THIS IS NOT A COPY</b>).- * <p>- * This method is exposed only to provide very fast, efficient access to- * this tag's message buffer. Applications relying on this buffer should be- * very careful to ensure they do not modify its contents during their use- * of it.- *- * @return the raw unparsed tag body. This is <b>NOT A COPY</b>. Do not- * alter the returned array.- * @since 5.11- */- public final byte[] getRawBuffer() {- return buffer;- }-- /**- * Discard the message buffer to reduce memory usage.- * <p>- * After discarding the memory usage of the {@code RevTag} is reduced to- * only the {@link #getObject()} pointer and {@link #getTagName()}.- * Accessing other properties such as {@link #getTaggerIdent()} or either- * message function requires reloading the buffer by invoking- * {@link org.eclipse.jgit.revwalk.RevWalk#parseBody(RevObject)}.- *- * @since 4.0- */- public final void disposeBody() {- buffer = null;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTree.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTree.javadeleted file mode 100644index d81af0c029..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevTree.java+++ /dev/null@@ -1,56 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Marek Zawirski <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;--/**- * A reference to a tree of subtrees/files.- */-public class RevTree extends RevObject {- /**- * Create a new tree reference.- *- * @param id- * object name for the tree.- */- protected RevTree(AnyObjectId id) {- super(id);- }-- @Override- public final int getType() {- return Constants.OBJ_TREE;- }-- @Override- void parseHeaders(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (walk.reader.has(this))- flags |= PARSED;- else- throw new MissingObjectException(this, getType());- }-- @Override- void parseBody(RevWalk walk) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if ((flags & PARSED) == 0)- parseHeaders(walk);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.javadeleted file mode 100644index 666f12460a..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java+++ /dev/null@@ -1,1849 +0,0 @@-/*- * Copyright (C) 2007, Robin Rosenberg <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]>- * Copyright (C) 2014, Gustaf Lundh <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import static org.eclipse.jgit.internal.storage.commitgraph.CommitGraph.EMPTY;--import java.io.IOException;-import java.text.MessageFormat;-import java.util.ArrayList;-import java.util.Collection;-import java.util.EnumSet;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.-Optional;-import java.util.Set;--import org.eclipse.jgit.annotations.NonNull;-import org.eclipse.jgit.annotations.Nullable;-import org.eclipse.jgit.errors.CorruptObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.LargeObjectException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.RevWalkException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.AsyncObjectLoaderQueue;-import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.MutableObjectId;-import org.eclipse.jgit.lib.NullProgressMonitor;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectIdOwnerMap;-import org.eclipse.jgit.lib.ObjectLoader;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.ProgressMonitor;-import org.eclipse.jgit.lib.Ref;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.filter.RevFilter;-import org.eclipse.jgit.treewalk.filter.TreeFilter;-import org.eclipse.jgit.util.References;--/**- * Walks a commit graph and produces the matching commits in order.- * <p>- * A RevWalk instance can only be used once to generate results. Running a- * second time requires creating a new RevWalk instance, or invoking- * {@link #reset()} before starting again. Resetting an existing instance may be- * faster for some applications as commit body parsing can be avoided on the- * later invocations.- * <p>- * RevWalk instances are not thread-safe. Applications must either restrict- * usage of a RevWalk instance to a single thread, or implement their own- * synchronization at a higher level.- * <p>- * Multiple simultaneous RevWalk instances per- * {@link org.eclipse.jgit.lib.Repository} are permitted, even from concurrent- * threads. Equality of {@link org.eclipse.jgit.revwalk.RevCommit}s from two- * different RevWalk instances is never true, even if their- * {@link org.eclipse.jgit.lib.ObjectId}s are equal (and thus they describe the- * same commit).- * <p>- * The offered iterator is over the list of RevCommits described by the- * configuration of this instance. Applications should restrict themselves to- * using either the provided Iterator or {@link #next()}, but never use both on- * the same RevWalk at the same time. The Iterator may buffer RevCommits, while- * {@link #next()} does not.- */-@SuppressWarnings("rawtypes")-public class RevWalk implements Iterable<RevCommit>, AutoCloseable {- private static final int MB = 1 << 20;-- /**- * Set on objects whose important header data has been loaded.- * <p>- * For a RevCommit this indicates we have pulled apart the tree and parent- * references from the raw bytes available in the repository and translated- * those to our own local RevTree and RevCommit instances. The raw buffer is- * also available for message and other header filtering.- * <p>- * For a RevTag this indicates we have pulled part the tag references to- * find out who the tag refers to, and what that object's type is.- */- static final int PARSED = 1 << 0;-- /**- * Set on RevCommit instances added to our {@link #pending} queue.- * <p>- * We use this flag to avoid adding the same commit instance twice to our- * queue, especially if we reached it by more than one path.- */- static final int SEEN = 1 << 1;-- /**- * Set on RevCommit instances the caller does not want output.- * <p>- * We flag commits as uninteresting if the caller does not want commits- * reachable from a commit given to {@link #markUninteresting(RevCommit)}.- * This flag is always carried into the commit's parents and is a key part- * of the "rev-list B --not A" feature; A is marked UNINTERESTING.- */- static final int UNINTERESTING = 1 << 2;-- /**- * Set on a RevCommit that can collapse out of the history.- * <p>- * If the {@link #treeFilter} concluded that this commit matches his- * parents' for all of the paths that the filter is interested in then we- * mark the commit REWRITE. Later we can rewrite the parents of a REWRITE- * child to remove chains of REWRITE commits before we produce the child to- * the application.- *- * @see RewriteGenerator- */- static final int REWRITE = 1 << 3;-- /**- * Temporary mark for use within generators or filters.- * <p>- * This mark is only for local use within a single scope. If someone sets- * the mark they must unset it before any other code can see the mark.- */- static final int TEMP_MARK = 1 << 4;-- /**- * Temporary mark for use within {@link TopoSortGenerator}.- * <p>- * This mark indicates the commit could not produce when it wanted to, as at- * least one child was behind it. Commits with this flag are delayed until- * all children have been output first.- */- static final int TOPO_DELAY = 1 << 5;-- /**- * Temporary mark for use within {@link TopoNonIntermixSortGenerator}.- * <p>- * This mark indicates the commit has been queued for emission in- * {@link TopoSortGenerator} and can be produced. This mark is removed when- * the commit has been produced.- */- static final int TOPO_QUEUED = 1 << 6;-- /**- * Set on a RevCommit when a {@link TreeRevFilter} has been applied.- * <p>- * This flag is processed by the {@link RewriteGenerator} to check if a- * {@link TreeRevFilter} has been applied.- *- * @see TreeRevFilter- * @see RewriteGenerator- */- static final int TREE_REV_FILTER_APPLIED = 1 << 7;-- /**- * Number of flag bits we keep internal for our own use. See above flags.- */- static final int RESERVED_FLAGS = 8;-- private static final int APP_FLAGS = -1 & ~((1 << RESERVED_FLAGS) - 1);-- final ObjectReader reader;-- private final boolean closeReader;-- final MutableObjectId idBuffer;-- ObjectIdOwnerMap<RevObject> objects;-- int freeFlags = APP_FLAGS;-- private int delayFreeFlags;-- private int retainOnReset;-- int carryFlags = UNINTERESTING;-- final ArrayList<RevCommit> roots;-- AbstractRevQueue queue;-- Generator pending;-- private final EnumSet<RevSort> sorting;-- private RevFilter filter;-- private TreeFilter treeFilter;-- private CommitGraph commitGraph;-- private boolean retainBody = true;-- private boolean rewriteParents = true;-- private boolean firstParent;-- boolean shallowCommitsInitialized;-- private enum GetMergedIntoStrategy {- RETURN_ON_FIRST_FOUND, RETURN_ON_FIRST_NOT_FOUND, EVALUATE_ALL- }-- /**- * Create a new revision walker for a given repository.- *- * @param repo- * the repository the walker will obtain data from. An- * ObjectReader will be created by the walker, and will be closed- * when the walker is closed.- */- public RevWalk(Repository repo) {- this(repo.newObjectReader(), true);- }-- /**- * Create a new revision walker for a given repository.- *- * @param or- * the reader the walker will obtain data from. The reader is not- * closed when the walker is closed (but is closed by- * {@link #dispose()}.- */- public RevWalk(ObjectReader or) {- this(or, false);- }-- RevWalk(ObjectReader or, boolean closeReader) {- reader = or;- idBuffer = new MutableObjectId();- objects = new ObjectIdOwnerMap<>();- roots = new ArrayList<>();- queue = newDateRevQueue(false);- pending = new StartGenerator(this);- sorting = EnumSet.of(RevSort.NONE);- filter = RevFilter.ALL;- treeFilter = TreeFilter.ALL;- this.closeReader = closeReader;- commitGraph = null;- }-- static AbstractRevQueue newDateRevQueue(boolean firstParent) {- if(usePriorityQueue()) {- return new DateRevPriorityQueue(firstParent);- }-- return new DateRevQueue(firstParent);- }-- static DateRevQueue newDateRevQueue(Generator g) throws IOException {- if(usePriorityQueue()) {- return new DateRevPriorityQueue(g);- }-- return new DateRevQueue(g);- }-- private static boolean usePriorityQueue() {- return Optional- .ofNullable(System.getProperty("REVWALK_USE_PRIORITY_QUEUE")) //$NON-NLS-1$- .map(Boolean::parseBoolean)- .orElse(false);- }-- /**- * Get the reader this walker is using to load objects.- *- * @return the reader this walker is using to load objects.- */- public ObjectReader getObjectReader() {- return reader;- }-- /**- * Get a reachability checker for commits over this revwalk.- *- * @return the most efficient reachability checker for this repository.- * @throws IOException- * if it cannot open any of the underlying indices.- *- * @since 5.4- * @deprecated use {@code ObjectReader#createReachabilityChecker(RevWalk)}- * instead.- */- @Deprecated- public final ReachabilityChecker createReachabilityChecker()- throws IOException {- return reader.createReachabilityChecker(this);- }-- /**- * {@inheritDoc}- * <p>- * Release any resources used by this walker's reader.- * <p>- * A walker that has been released can be used again, but may need to be- * released after the subsequent usage.- *- * @since 4.0- */- @Override- public void close() {- if (closeReader) {- reader.close();- }- }-- /**- * Mark a commit to start graph traversal from.- * <p>- * Callers are encouraged to use {@link #parseCommit(AnyObjectId)} to obtain- * the commit reference, rather than {@link #lookupCommit(AnyObjectId)}, as- * this method requires the commit to be parsed before it can be added as a- * root for the traversal.- * <p>- * The method will automatically parse an unparsed commit, but error- * handling may be more difficult for the application to explain why a- * RevCommit is not actually a commit. The object pool of this walker would- * also be 'poisoned' by the non-commit RevCommit.- *- * @param c- * the commit to start traversing from. The commit passed must be- * from this same revision walker.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the commit supplied is not available from the object- * database. This usually indicates the supplied commit is- * invalid, but the reference was constructed during an earlier- * invocation to {@link #lookupCommit(AnyObjectId)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually a commit. This usually- * indicates the caller supplied a non-commit SHA-1 to- * {@link #lookupCommit(AnyObjectId)}.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void markStart(RevCommit c) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if ((c.flags & SEEN) != 0)- return;- if ((c.flags & PARSED) == 0)- c.parseHeaders(this);- c.flags |= SEEN;- roots.add(c);- queue.add(c);- }-- /**- * Mark commits to start graph traversal from.- *- * @param list- * commits to start traversing from. The commits passed must be- * from this same revision walker.- * @throws org.eclipse.jgit.errors.MissingObjectException- * one of the commits supplied is not available from the object- * database. This usually indicates the supplied commit is- * invalid, but the reference was constructed during an earlier- * invocation to {@link #lookupCommit(AnyObjectId)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually a commit. This usually- * indicates the caller supplied a non-commit SHA-1 to- * {@link #lookupCommit(AnyObjectId)}.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void markStart(Collection<RevCommit> list)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- for (RevCommit c : list)- markStart(c);- }-- /**- * Mark a commit to not produce in the output.- * <p>- * Uninteresting commits denote not just themselves but also their entire- * ancestry chain, back until the merge base of an uninteresting commit and- * an otherwise interesting commit.- * <p>- * Callers are encouraged to use {@link #parseCommit(AnyObjectId)} to obtain- * the commit reference, rather than {@link #lookupCommit(AnyObjectId)}, as- * this method requires the commit to be parsed before it can be added as a- * root for the traversal.- * <p>- * The method will automatically parse an unparsed commit, but error- * handling may be more difficult for the application to explain why a- * RevCommit is not actually a commit. The object pool of this walker would- * also be 'poisoned' by the non-commit RevCommit.- *- * @param c- * the commit to start traversing from. The commit passed must be- * from this same revision walker.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the commit supplied is not available from the object- * database. This usually indicates the supplied commit is- * invalid, but the reference was constructed during an earlier- * invocation to {@link #lookupCommit(AnyObjectId)}.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the object was not parsed yet and it was discovered during- * parsing that it is not actually a commit. This usually- * indicates the caller supplied a non-commit SHA-1 to- * {@link #lookupCommit(AnyObjectId)}.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void markUninteresting(RevCommit c) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- c.flags |= UNINTERESTING;- carryFlagsImpl(c);- markStart(c);- }-- /**- * Determine if a commit is reachable from another commit.- * <p>- * A commit <code>base</code> is an ancestor of <code>tip</code> if we can- * find a path of commits that leads from <code>tip</code> and ends at- * <code>base</code>.- * <p>- * This utility function resets the walker, inserts the two supplied- * commits, and then executes a walk until an answer can be obtained.- * Currently allocated RevFlags that have been added to RevCommit instances- * will be retained through the reset.- *- * @param base- * commit the caller thinks is reachable from <code>tip</code>.- * @param tip- * commit to start iteration from, and which is most likely a- * descendant (child) of <code>base</code>.- * @return true if there is a path directly from <code>tip</code> to- * <code>base</code> (and thus <code>base</code> is fully merged- * into <code>tip</code>); false otherwise.- * @throws org.eclipse.jgit.errors.MissingObjectException- * one or more of the next commit's parents are not available- * from the object database, but were thought to be candidates- * for traversal. This usually indicates a broken link.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * one or more of the next commit's parents are not actually- * commit objects.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public boolean isMergedInto(RevCommit base, RevCommit tip)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- final RevFilter oldRF = filter;- final TreeFilter oldTF = treeFilter;- try {- finishDelayedFreeFlags();- reset(~freeFlags & APP_FLAGS);- filter = RevFilter.MERGE_BASE;- treeFilter = TreeFilter.ALL;- markStart(tip);- markStart(base);- RevCommit mergeBase;- while ((mergeBase = next()) != null) {- if (References.isSameObject(mergeBase, base)) {- return true;- }- }- return false;- } finally {- filter = oldRF;- treeFilter = oldTF;- }- }-- /**- * Determine the Refs into which a commit is merged.- * <p>- * A commit is merged into a ref if we can find a path of commits that leads- * from that specific ref and ends at <code>commit</code>.- *- * @param commit- * commit the caller thinks is reachable from <code>refs</code>.- * @param refs- * refs to start iteration from, and which is most likely a- * descendant (child) of <code>commit</code>.- * @return list of refs that are reachable from <code>commit</code>.- * @throws java.io.IOException- * a pack file or loose object could not be read.- * @since 5.12- */- public List<Ref> getMergedInto(RevCommit commit, Collection<Ref> refs)- throws IOException {- return getMergedInto(commit, refs, NullProgressMonitor.INSTANCE);- }-- /**- * Determine the Refs into which a commit is merged.- * <p>- * A commit is merged into a ref if we can find a path of commits that leads- * from that specific ref and ends at <code>commit</code>.- *- * @param commit- * commit the caller thinks is reachable from <code>refs</code>.- * @param refs- * refs to start iteration from, and which is most likely a- * descendant (child) of <code>commit</code>.- * @param monitor- * the callback for progress and cancellation- * @return list of refs that are reachable from <code>commit</code>.- * @throws java.io.IOException- * a pack file or loose object could not be read.- * @since 5.12- */- public List<Ref> getMergedInto(RevCommit commit, Collection<Ref> refs,- ProgressMonitor monitor) throws IOException {- return getMergedInto(commit, refs, GetMergedIntoStrategy.EVALUATE_ALL,- monitor);- }-- /**- * Determine if a <code>commit</code> is merged into any of the given- * <code>refs</code>.- *- * @param commit- * commit the caller thinks is reachable from <code>refs</code>.- * @param refs- * refs to start iteration from, and which is most likely a- * descendant (child) of <code>commit</code>.- * @return true if commit is merged into any of the refs; false otherwise.- * @throws java.io.IOException- * a pack file or loose object could not be read.- * @since 5.12- */- public boolean isMergedIntoAny(RevCommit commit, Collection<Ref> refs)- throws IOException {- return getMergedInto(commit, refs,- GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND,- NullProgressMonitor.INSTANCE).size() > 0;- }-- /**- * Determine if a <code>commit</code> is merged into any of the given- * <code>revs</code>.- *- * @param commit- * commit the caller thinks is reachable from <code>revs</code>.- * @param revs- * commits to start iteration from, and which is most likely a- * descendant (child) of <code>commit</code>.- * @return true if commit is merged into any of the revs; false otherwise.- * @throws java.io.IOException- * a pack file or loose object could not be read.- * @since 6.10.1- */- public boolean isMergedIntoAnyCommit(RevCommit commit, Collection<RevCommit> revs)- throws IOException {- return getCommitsMergedInto(commit, revs,- GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND,- NullProgressMonitor.INSTANCE).size() > 0;- }-- /**- * Determine if a <code>commit</code> is merged into all of the given- * <code>refs</code>.- *- * @param commit- * commit the caller thinks is reachable from <code>refs</code>.- * @param refs- * refs to start iteration from, and which is most likely a- * descendant (child) of <code>commit</code>.- * @return true if commit is merged into all of the refs; false otherwise.- * @throws java.io.IOException- * a pack file or loose object could not be read.- * @since 5.12- */- public boolean isMergedIntoAll(RevCommit commit, Collection<Ref> refs)- throws IOException {- return getMergedInto(commit, refs,- GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND,- NullProgressMonitor.INSTANCE).size() == refs.size();- }-- private List<Ref> getMergedInto(RevCommit needle, Collection<Ref> haystacks,- Enum returnStrategy, ProgressMonitor monitor) throws IOException {- Map<RevCommit, List<Ref>> refsByCommit = new HashMap<>();- for (Ref r : haystacks) {- RevObject o = peel(parseAny(r.getObjectId()));- if (!(o instanceof RevCommit)) {- continue;- }- refsByCommit.computeIfAbsent((RevCommit) o, c -> new ArrayList<>()).add(r);- }- monitor.update(1);- List<Ref> result = new ArrayList<>();- for (RevCommit c : getCommitsMergedInto(needle, refsByCommit.keySet(),- returnStrategy, monitor)) {- result.addAll(refsByCommit.get(c));- }- return result;- }-- private Set<RevCommit> getCommitsMergedInto(RevCommit needle, Collection<RevCommit> haystacks,- Enum returnStrategy, ProgressMonitor monitor) throws IOException {- Set<RevCommit> result = new HashSet<>();- List<RevCommit> uninteresting = new ArrayList<>();- List<RevCommit> marked = new ArrayList<>();- RevFilter oldRF = filter;- TreeFilter oldTF = treeFilter;- try {- finishDelayedFreeFlags();- reset(~freeFlags & APP_FLAGS);- filter = RevFilter.ALL;- treeFilter = TreeFilter.ALL;-- // Make sure commit is parsed from commit-graph- if ((needle.flags & PARSED) == 0) {- needle.parseHeaders(this);- }- int cutoff = needle.getGeneration();- for (RevCommit c : haystacks) {- if (monitor.isCancelled()) {- return result;- }- monitor.update(1);- reset(UNINTERESTING | TEMP_MARK);- markStart(c);- boolean commitFound = false;- RevCommit next;- while ((next = next()) != null) {- if (next.getGeneration() < cutoff) {- markUninteresting(next);- uninteresting.add(next);- }- if (References.isSameObject(next, needle)- || (next.flags & TEMP_MARK) != 0) {- result.add(c);- if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND) {- return result;- }- commitFound = true;- c.flags |= TEMP_MARK;- marked.add(c);- break;- }- }- if (!commitFound) {- markUninteresting(c);- uninteresting.add(c);- if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND) {- return result;- }- }- }- } finally {- roots.addAll(uninteresting);- filter = oldRF;- treeFilter = oldTF;- for (RevCommit c : marked) {- c.flags &= ~TEMP_MARK;- }- }- return result;- }-- /**- * Pop the next most recent commit.- *- * @return next most recent commit; null if traversal is over.- * @throws org.eclipse.jgit.errors.MissingObjectException- * one or more of the next commit's parents are not available- * from the object database, but were thought to be candidates- * for traversal. This usually indicates a broken link.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * one or more of the next commit's parents are not actually- * commit objects.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- return pending.next();- }-- /**- * Obtain the sort types applied to the commits returned.- *- * @return the sorting strategies employed. At least one strategy is always- * used, but that strategy may be- * {@link org.eclipse.jgit.revwalk.RevSort#NONE}.- */- public EnumSet<RevSort> getRevSort() {- return sorting.clone();- }-- /**- * Check whether the provided sorting strategy is enabled.- *- * @param sort- * a sorting strategy to look for.- * @return true if this strategy is enabled, false otherwise- */- public boolean hasRevSort(RevSort sort) {- return sorting.contains(sort);- }-- /**- * Select a single sorting strategy for the returned commits.- * <p>- * Disables all sorting strategies, then enables only the single strategy- * supplied by the caller.- *- * @param s- * a sorting strategy to enable.- */- public void sort(RevSort s) {- assertNotStarted();- sorting.clear();- sorting.add(s);- }-- /**- * Add or remove a sorting strategy for the returned commits.- * <p>- * Multiple strategies can be applied at once, in which case some strategies- * may take precedence over others. As an example,- * {@link org.eclipse.jgit.revwalk.RevSort#TOPO} must take precedence over- * {@link org.eclipse.jgit.revwalk.RevSort#COMMIT_TIME_DESC}, otherwise it- * cannot enforce its ordering.- *- * @param s- * a sorting strategy to enable or disable.- * @param use- * true if this strategy should be used, false if it should be- * removed.- */- public void sort(RevSort s, boolean use) {- assertNotStarted();- if (use)- sorting.add(s);- else- sorting.remove(s);-- if (sorting.size() > 1)- sorting.remove(RevSort.NONE);- else if (sorting.isEmpty())- sorting.add(RevSort.NONE);- }-- /**- * Get the currently configured commit filter.- *- * @return the current filter. Never null as a filter is always needed.- */- @NonNull- public RevFilter getRevFilter() {- return filter;- }-- /**- * Set the commit filter for this walker.- * <p>- * Multiple filters may be combined by constructing an arbitrary tree of- * <code>AndRevFilter</code> or <code>OrRevFilter</code> instances to- * describe the boolean expression required by the application. Custom- * filter implementations may also be constructed by applications.- * <p>- * Note that filters are not thread-safe and may not be shared by concurrent- * RevWalk instances. Every RevWalk must be supplied its own unique filter,- * unless the filter implementation specifically states it is (and always- * will be) thread-safe. Callers may use- * {@link org.eclipse.jgit.revwalk.filter.RevFilter#clone()} to create a- * unique filter tree for this RevWalk instance.- *- * @param newFilter- * the new filter. If null the special- * {@link org.eclipse.jgit.revwalk.filter.RevFilter#ALL} filter- * will be used instead, as it matches every commit.- * @see org.eclipse.jgit.revwalk.filter.AndRevFilter- * @see org.eclipse.jgit.revwalk.filter.OrRevFilter- */- public void setRevFilter(RevFilter newFilter) {- assertNotStarted();- filter = newFilter != null ? newFilter : RevFilter.ALL;- }-- /**- * Get the tree filter used to simplify commits by modified paths.- *- * @return the current filter. Never null as a filter is always needed. If- * no filter is being applied- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ALL} is- * returned.- */- @NonNull- public TreeFilter getTreeFilter() {- return treeFilter;- }-- /**- * Set the tree filter used to simplify commits by modified paths.- * <p>- * If null or {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ALL} the- * path limiter is removed. Commits will not be simplified.- * <p>- * If non-null and not- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ALL} then the tree- * filter will be installed. Commits will have their ancestry simplified to- * hide commits that do not contain tree entries matched by the filter,- * unless {@code setRewriteParents(false)} is called.- * <p>- * Usually callers should be inserting a filter graph including- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ANY_DIFF} along with- * one or more {@link org.eclipse.jgit.treewalk.filter.PathFilter}- * instances.- *- * @param newFilter- * new filter. If null the special- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ALL} filter- * will be used instead, as it matches everything.- * @see org.eclipse.jgit.treewalk.filter.PathFilter- */- public void setTreeFilter(TreeFilter newFilter) {- assertNotStarted();- treeFilter = newFilter != null ? newFilter : TreeFilter.ALL;- }-- /**- * Set whether to rewrite parent pointers when filtering by modified paths.- * <p>- * By default, when {@link #setTreeFilter(TreeFilter)} is called with non-- * null and non-{@link org.eclipse.jgit.treewalk.filter.TreeFilter#ALL}- * filter, commits will have their ancestry simplified and parents rewritten- * to hide commits that do not match the filter.- * <p>- * This behavior can be bypassed by passing false to this method.- *- * @param rewrite- * whether to rewrite parents; defaults to true.- * @since 3.4- */- public void setRewriteParents(boolean rewrite) {- rewriteParents = rewrite;- }-- boolean getRewriteParents() {- return rewriteParents;- }-- /**- * Should the body of a commit or tag be retained after parsing its headers?- * <p>- * Usually the body is always retained, but some application code might not- * care and would prefer to discard the body of a commit as early as- * possible, to reduce memory usage.- * <p>- * True by default on {@link org.eclipse.jgit.revwalk.RevWalk} and false by- * default for {@link org.eclipse.jgit.revwalk.ObjectWalk}.- *- * @return true if the body should be retained; false it is discarded.- */- public boolean isRetainBody() {- return retainBody;- }-- /**- * Set whether or not the body of a commit or tag is retained.- * <p>- * If a body of a commit or tag is not retained, the application must call- * {@link #parseBody(RevObject)} before the body can be safely accessed- * through the type specific access methods.- * <p>- * True by default on {@link org.eclipse.jgit.revwalk.RevWalk} and false by- * default for {@link org.eclipse.jgit.revwalk.ObjectWalk}.- *- * @param retain- * true to retain bodies; false to discard them early.- */- public void setRetainBody(boolean retain) {- retainBody = retain;- }-- /**- * Whether only first-parent links should be followed when walking- *- * @return whether only first-parent links should be followed when walking.- *- * @since 5.5- */- public boolean isFirstParent() {- return firstParent;- }-- /**- * Set whether or not only first parent links should be followed.- * <p>- * If set, second- and higher-parent links are not traversed at all.- * <p>- * This must be called prior to {@link #markStart(RevCommit)}.- *- * @param enable- * true to walk only first-parent links.- *- * @since 5.5- */- public void setFirstParent(boolean enable) {- assertNotStarted();- assertNoCommitsMarkedStart();- firstParent = enable;- queue = newDateRevQueue(firstParent);- pending = new StartGenerator(this);- }-- /**- * Locate a reference to a blob without loading it.- * <p>- * The blob may or may not exist in the repository. It is impossible to tell- * from this method's return value.- *- * @param id- * name of the blob object.- * @return reference to the blob object. Never null.- */- @NonNull- public RevBlob lookupBlob(AnyObjectId id) {- RevBlob c = (RevBlob) objects.get(id);- if (c == null) {- c = new RevBlob(id);- objects.add(c);- }- return c;- }-- /**- * Locate a reference to a tree without loading it.- * <p>- * The tree may or may not exist in the repository. It is impossible to tell- * from this method's return value.- *- * @param id- * name of the tree object.- * @return reference to the tree object. Never null.- */- @NonNull- public RevTree lookupTree(AnyObjectId id) {- RevTree c = (RevTree) objects.get(id);- if (c == null) {- c = new RevTree(id);- objects.add(c);- }- return c;- }-- /**- * Locate a reference to a commit without loading it.- * <p>- * The commit may or may not exist in the repository. It is impossible to- * tell from this method's return value.- * <p>- * See {@link #parseHeaders(RevObject)} and {@link #parseBody(RevObject)}- * for loading contents.- *- * @param id- * name of the commit object.- * @return reference to the commit object. Never null.- */- @NonNull- public RevCommit lookupCommit(AnyObjectId id) {- RevCommit c = (RevCommit) objects.get(id);- if (c == null) {- c = createCommit(id);- objects.add(c);- }- return c;- }-- /**- * This method is intended to be invoked only by {@link RevCommitCG}, in- * order to give commit the correct graphPosition before accessing the- * commit-graph. In this way, the headers of the commit can be obtained in- * constant time.- *- * @param id- * name of the commit object.- * @param graphPos- * the position in the commit-graph of the object.- * @return reference to the commit object. Never null.- * @since 6.5- */- @NonNull- protected RevCommit lookupCommit(AnyObjectId id, int graphPos) {- RevCommit c = (RevCommit) objects.get(id);- if (c == null) {- c = createCommit(id, graphPos);- objects.add(c);- }- return c;- }-- /**- * Locate a reference to a tag without loading it.- * <p>- * The tag may or may not exist in the repository. It is impossible to tell- * from this method's return value.- *- * @param id- * name of the tag object.- * @return reference to the tag object. Never null.- */- @NonNull- public RevTag lookupTag(AnyObjectId id) {- RevTag c = (RevTag) objects.get(id);- if (c == null) {- c = new RevTag(id);- objects.add(c);- }- return c;- }-- /**- * Locate a reference to any object without loading it.- * <p>- * The object may or may not exist in the repository. It is impossible to- * tell from this method's return value.- *- * @param id- * name of the object.- * @param type- * type of the object. Must be a valid Git object type.- * @return reference to the object. Never null.- */- @NonNull- public RevObject lookupAny(AnyObjectId id, int type) {- RevObject r = objects.get(id);- if (r == null) {- switch (type) {- case Constants.OBJ_COMMIT:- r = createCommit(id);- break;- case Constants.OBJ_TREE:- r = new RevTree(id);- break;- case Constants.OBJ_BLOB:- r = new RevBlob(id);- break;- case Constants.OBJ_TAG:- r = new RevTag(id);- break;- default:- throw new IllegalArgumentException(MessageFormat.format(- JGitText.get().invalidGitType, Integer.valueOf(type)));- }- objects.add(r);- }- return r;- }-- /**- * Locate an object that was previously allocated in this walk.- *- * @param id- * name of the object.- * @return reference to the object if it has been previously located;- * otherwise null.- */- public RevObject lookupOrNull(AnyObjectId id) {- return objects.get(id);- }-- /**- * Locate a reference to a commit and immediately parse its content.- * <p>- * Unlike {@link #lookupCommit(AnyObjectId)} this method only returns- * successfully if the commit object exists, is verified to be a commit, and- * was parsed without error.- *- * @param id- * name of the commit object.- * @return reference to the commit object. Never null.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied commit does not exist.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the supplied id is not a commit or an annotated tag.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- @NonNull- public RevCommit parseCommit(AnyObjectId id) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevObject c = peel(parseAny(id));- if (!(c instanceof RevCommit))- throw new IncorrectObjectTypeException(id.toObjectId(),- Constants.TYPE_COMMIT);- return (RevCommit) c;- }-- /**- * Locate a reference to a tree.- * <p>- * This method only returns successfully if the tree object exists, is- * verified to be a tree.- *- * @param id- * name of the tree object, or a commit or annotated tag that may- * reference a tree.- * @return reference to the tree object. Never null.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied tree does not exist.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the supplied id is not a tree, a commit or an annotated tag.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- @NonNull- public RevTree parseTree(AnyObjectId id) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevObject c = peel(parseAny(id));-- final RevTree t;- if (c instanceof RevCommit)- t = ((RevCommit) c).getTree();- else if (!(c instanceof RevTree))- throw new IncorrectObjectTypeException(id.toObjectId(),- Constants.TYPE_TREE);- else- t = (RevTree) c;- parseHeaders(t);- return t;- }-- /**- * Locate a reference to an annotated tag and immediately parse its content.- * <p>- * Unlike {@link #lookupTag(AnyObjectId)} this method only returns- * successfully if the tag object exists, is verified to be a tag, and was- * parsed without error.- *- * @param id- * name of the tag object.- * @return reference to the tag object. Never null.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied tag does not exist.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * the supplied id is not a tag or an annotated tag.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- @NonNull- public RevTag parseTag(AnyObjectId id) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevObject c = parseAny(id);- if (!(c instanceof RevTag))- throw new IncorrectObjectTypeException(id.toObjectId(),- Constants.TYPE_TAG);- return (RevTag) c;- }-- /**- * Locate a reference to any object and immediately parse its headers.- * <p>- * This method only returns successfully if the object exists and was parsed- * without error. Parsing an object can be expensive as the type must be- * determined. For blobs this may mean the blob content was unpacked- * unnecessarily, and thrown away.- *- * @param id- * name of the object.- * @return reference to the object. Never null.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied does not exist.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- @NonNull- public RevObject parseAny(AnyObjectId id)- throws MissingObjectException, IOException {- RevObject r = objects.get(id);- if (r == null)- r = parseNew(id, reader.open(id));- else- parseHeaders(r);- return r;- }-- private RevObject parseNew(AnyObjectId id, ObjectLoader ldr)- throws LargeObjectException, CorruptObjectException,- MissingObjectException, IOException {- RevObject r;- int type = ldr.getType();- switch (type) {- case Constants.OBJ_COMMIT: {- final RevCommit c = createCommit(id);- c.parseCanonical(this, getCachedBytes(c, ldr));- r = c;- break;- }- case Constants.OBJ_TREE: {- r = new RevTree(id);- r.flags |= PARSED;- break;- }- case Constants.OBJ_BLOB: {- r = new RevBlob(id);- r.flags |= PARSED;- break;- }- case Constants.OBJ_TAG: {- final RevTag t = new RevTag(id);- t.parseCanonical(this, getCachedBytes(t, ldr));- r = t;- break;- }- default:- throw new IllegalArgumentException(MessageFormat.format(- JGitText.get().badObjectType, Integer.valueOf(type)));- }- objects.add(r);- return r;- }-- byte[] getCachedBytes(RevObject obj) throws LargeObjectException,- MissingObjectException, IncorrectObjectTypeException, IOException {- return getCachedBytes(obj, reader.open(obj, obj.getType()));- }-- byte[] getCachedBytes(RevObject obj, ObjectLoader ldr)- throws LargeObjectException, MissingObjectException, IOException {- try {- return ldr.getCachedBytes(5 * MB);- } catch (LargeObjectException tooBig) {- tooBig.setObjectId(obj);- throw tooBig;- }- }-- /**- * Get the commit-graph.- *- * @return the commit-graph. Never null.- * @since 6.5- */- @NonNull- CommitGraph commitGraph() {- if (commitGraph == null) {- try {- commitGraph = reader != null- ? reader.getCommitGraph().orElse(EMPTY)- : EMPTY;- } catch (IOException e) {- commitGraph = EMPTY;- }- }- return commitGraph;- }-- /**- * Asynchronous object parsing.- *- * @param <T>- * Type of returned {@code ObjectId}- * @param objectIds- * objects to open from the object store. The supplied collection- * must not be modified until the queue has finished.- * @param reportMissing- * if true missing objects are reported by calling failure with a- * MissingObjectException. This may be more expensive for the- * implementation to guarantee. If false the implementation may- * choose to report MissingObjectException, or silently skip over- * the object with no warning.- * @return queue to read the objects from.- */- public <T extends ObjectId> AsyncRevObjectQueue parseAny(- Iterable<T> objectIds, boolean reportMissing) {- List<T> need = new ArrayList<>();- List<RevObject> have = new ArrayList<>();- for (T id : objectIds) {- RevObject r = objects.get(id);- if (r != null && (r.flags & PARSED) != 0)- have.add(r);- else- need.add(id);- }-- final Iterator<RevObject> objItr = have.iterator();- if (need.isEmpty()) {- return new AsyncRevObjectQueue() {- @Override- public RevObject next() {- return objItr.hasNext() ? objItr.next() : null;- }-- @Override- public boolean cancel(boolean mayInterruptIfRunning) {- return true;- }-- @Override- public void release() {- // In-memory only, no action required.- }- };- }-- final AsyncObjectLoaderQueue<T> lItr = reader.open(need, reportMissing);- return new AsyncRevObjectQueue() {- @Override- public RevObject next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- if (objItr.hasNext())- return objItr.next();- if (!lItr.next())- return null;-- ObjectId id = lItr.getObjectId();- ObjectLoader ldr = lItr.open();- RevObject r = objects.get(id);- if (r == null)- r = parseNew(id, ldr);- else if (r instanceof RevCommit) {- byte[] raw = ldr.getCachedBytes();- ((RevCommit) r).parseCanonical(RevWalk.this, raw);- } else if (r instanceof RevTag) {- byte[] raw = ldr.getCachedBytes();- ((RevTag) r).parseCanonical(RevWalk.this, raw);- } else- r.flags |= PARSED;- return r;- }-- @Override- public boolean cancel(boolean mayInterruptIfRunning) {- return lItr.cancel(mayInterruptIfRunning);- }-- @Override- public void release() {- lItr.release();- }- };- }-- /**- * Ensure the object's critical headers have been parsed.- * <p>- * This method only returns successfully if the object exists and was parsed- * without error.- *- * @param obj- * the object the caller needs to be parsed.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied does not exist.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void parseHeaders(RevObject obj)- throws MissingObjectException, IOException {- if ((obj.flags & PARSED) == 0)- obj.parseHeaders(this);- }-- /**- * Ensure the object's full body content is available.- * <p>- * This method only returns successfully if the object exists and was parsed- * without error.- *- * @param obj- * the object the caller needs to be parsed.- * @throws org.eclipse.jgit.errors.MissingObjectException- * the supplied does not exist.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public void parseBody(RevObject obj)- throws MissingObjectException, IOException {- obj.parseBody(this);- }-- /**- * Peel back annotated tags until a non-tag object is found.- *- * @param obj- * the starting object.- * @return If {@code obj} is not an annotated tag, {@code obj}. Otherwise- * the first non-tag object that {@code obj} references. The- * returned object's headers have been parsed.- * @throws org.eclipse.jgit.errors.MissingObjectException- * a referenced object cannot be found.- * @throws java.io.IOException- * a pack file or loose object could not be read.- */- public RevObject peel(RevObject obj)- throws MissingObjectException, IOException {- while (obj instanceof RevTag) {- parseHeaders(obj);- obj = ((RevTag) obj).getObject();- }- parseHeaders(obj);- return obj;- }-- /**- * Create a new flag for application use during walking.- * <p>- * Applications are only assured to be able to create 24 unique flags on any- * given revision walker instance. Any flags beyond 24 are offered only if- * the implementation has extra free space within its internal storage.- *- * @param name- * description of the flag, primarily useful for debugging.- * @return newly constructed flag instance.- * @throws java.lang.IllegalArgumentException- * too many flags have been reserved on this revision walker.- */- public RevFlag newFlag(String name) {- final int m = allocFlag();- return new RevFlag(this, name, m);- }-- int allocFlag() {- if (freeFlags == 0)- throw new IllegalArgumentException(- MessageFormat.format(JGitText.get().flagsAlreadyCreated,- Integer.valueOf(32 - RESERVED_FLAGS)));- final int m = Integer.lowestOneBit(freeFlags);- freeFlags &= ~m;- return m;- }-- /**- * Automatically carry a flag from a child commit to its parents.- * <p>- * A carried flag is copied from the child commit onto its parents when the- * child commit is popped from the lowest level of walk's internal graph.- *- * @param flag- * the flag to carry onto parents, if set on a descendant.- */- public void carry(RevFlag flag) {- if ((freeFlags & flag.mask) != 0)- throw new IllegalArgumentException(MessageFormat- .format(JGitText.get().flagIsDisposed, flag.name));- if (flag.walker != this)- throw new IllegalArgumentException(MessageFormat- .format(JGitText.get().flagNotFromThis, flag.name));- carryFlags |= flag.mask;- }-- /**- * Automatically carry flags from a child commit to its parents.- * <p>- * A carried flag is copied from the child commit onto its parents when the- * child commit is popped from the lowest level of walk's internal graph.- *- * @param set- * the flags to carry onto parents, if set on a descendant.- */- public void carry(Collection<RevFlag> set) {- for (RevFlag flag : set)- carry(flag);- }-- /**- * Preserve a RevFlag during all {@code reset} methods.- * <p>- * Calling {@code retainOnReset(flag)} avoids needing to pass the flag- * during each {@code resetRetain()} invocation on this instance.- * <p>- * Clearing flags marked retainOnReset requires disposing of the flag with- * {@code #disposeFlag(RevFlag)} or disposing of the entire RevWalk by- * {@code #dispose()}.- *- * @param flag- * the flag to retain during all resets.- * @since 3.6- */- public final void retainOnReset(RevFlag flag) {- if ((freeFlags & flag.mask) != 0)- throw new IllegalArgumentException(MessageFormat- .format(JGitText.get().flagIsDisposed, flag.name));- if (flag.walker != this)- throw new IllegalArgumentException(MessageFormat- .format(JGitText.get().flagNotFromThis, flag.name));- retainOnReset |= flag.mask;- }-- /**- * Preserve a set of RevFlags during all {@code reset} methods.- * <p>- * Calling {@code retainOnReset(set)} avoids needing to pass the flags- * during each {@code resetRetain()} invocation on this instance.- * <p>- * Clearing flags marked retainOnReset requires disposing of the flag with- * {@code #disposeFlag(RevFlag)} or disposing of the entire RevWalk by- * {@code #dispose()}.- *- * @param flags- * the flags to retain during all resets.- * @since 3.6- */- public final void retainOnReset(Collection<RevFlag> flags) {- for (RevFlag f : flags)- retainOnReset(f);- }-- /**- * Allow a flag to be recycled for a different use.- * <p>- * Recycled flags always come back as a different Java object instance when- * assigned again by {@link #newFlag(String)}.- * <p>- * If the flag was previously being carried, the carrying request is- * removed. Disposing of a carried flag while a traversal is in progress has- * an undefined behavior.- *- * @param flag- * the to recycle.- */- public void disposeFlag(RevFlag flag) {- freeFlag(flag.mask);- }-- void freeFlag(int mask) {- retainOnReset &= ~mask;- if (isNotStarted()) {- freeFlags |= mask;- carryFlags &= ~mask;- } else {- delayFreeFlags |= mask;- }- }-- private void finishDelayedFreeFlags() {- if (delayFreeFlags != 0) {- freeFlags |= delayFreeFlags;- carryFlags &= ~delayFreeFlags;- delayFreeFlags = 0;- }- }-- /**- * Resets internal state and allows this instance to be used again.- * <p>- * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit)- * instances are not invalidated. RevFlag instances are not invalidated, but- * are removed from all RevObjects.- */- public final void reset() {- reset(0);- }-- /**- * Resets internal state and allows this instance to be used again.- * <p>- * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit)- * instances are not invalidated. RevFlag instances are not invalidated, but- * are removed from all RevObjects.- *- * @param retainFlags- * application flags that should <b>not</b> be cleared from- * existing commit objects.- */- public final void resetRetain(RevFlagSet retainFlags) {- reset(retainFlags.mask);- }-- /**- * Resets internal state and allows this instance to be used again.- * <p>- * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit)- * instances are not invalidated. RevFlag instances are not invalidated, but- * are removed from all RevObjects.- * <p>- * See {@link #retainOnReset(RevFlag)} for an alternative that does not- * require passing the flags during each reset.- *- * @param retainFlags- * application flags that should <b>not</b> be cleared from- * existing commit objects.- */- public final void resetRetain(RevFlag... retainFlags) {- int mask = 0;- for (RevFlag flag : retainFlags)- mask |= flag.mask;- reset(mask);- }-- /**- * Resets internal state and allows this instance to be used again.- * <p>- * Unlike {@link #dispose()} previously acquired RevObject (and RevCommit)- * instances are not invalidated. RevFlag instances are not invalidated, but- * are removed from all RevObjects. The value of {@code firstParent} is- * retained.- *- * @param retainFlags- * application flags that should <b>not</b> be cleared from- * existing commit objects.- */- protected void reset(int retainFlags) {- finishDelayedFreeFlags();- retainFlags |= PARSED | retainOnReset;- final int clearFlags = ~retainFlags;-- final FIFORevQueue q = new FIFORevQueue();- for (RevCommit c : roots) {- if ((c.flags & clearFlags) == 0)- continue;- c.flags &= retainFlags;- c.reset();- q.add(c);- }-- for (;;) {- final RevCommit c = q.next();- if (c == null)- break;- if (c.getParents() == null)- continue;- for (RevCommit p : c.getParents()) {- if ((p.flags & clearFlags) == 0)- continue;- p.flags &= retainFlags;- p.reset();- q.add(p);- }- }-- roots.clear();- queue = newDateRevQueue(firstParent);- pending = new StartGenerator(this);- }-- /**- * Dispose all internal state and invalidate all RevObject instances.- * <p>- * All RevObject (and thus RevCommit, etc.) instances previously acquired- * from this RevWalk are invalidated by a dispose call. Applications must- * not retain or use RevObject instances obtained prior to the dispose call.- * All RevFlag instances are also invalidated, and must not be reused.- */- public void dispose() {- reader.close();- freeFlags = APP_FLAGS;- delayFreeFlags = 0;- retainOnReset = 0;- carryFlags = UNINTERESTING;- firstParent = false;- objects.clear();- roots.clear();- queue = newDateRevQueue(firstParent);- pending = new StartGenerator(this);- shallowCommitsInitialized = false;- }-- /**- * Like {@link #next()}, but if a checked exception is thrown during the- * walk it is rethrown as a {@link RevWalkException}.- *- * @throws RevWalkException- * if an {@link IOException} was thrown.- * @return next most recent commit; null if traversal is over.- */- @Nullable- private RevCommit nextForIterator() {- try {- return next();- } catch (IOException e) {- throw new RevWalkException(e);- }- }-- /**- * {@inheritDoc}- * <p>- * Returns an Iterator over the commits of this walker.- * <p>- * The returned iterator is only useful for one walk. If this RevWalk gets- * reset a new iterator must be obtained to walk over the new results.- * <p>- * Applications must not use both the Iterator and the {@link #next()} API- * at the same time. Pick one API and use that for the entire walk.- * <p>- * If a checked exception is thrown during the walk (see {@link #next()}) it- * is rethrown from the Iterator as a {@link RevWalkException}.- *- * @see RevWalkException- */- @Override- public Iterator<RevCommit> iterator() {- RevCommit first = nextForIterator();-- return new Iterator<>() {- RevCommit next = first;-- @Override- public boolean hasNext() {- return next != null;- }-- @Override- public RevCommit next() {- RevCommit r = next;- next = nextForIterator();- return r;- }-- @Override- public void remove() {- throw new UnsupportedOperationException();- }- };- }-- /**- * Throws an exception if we have started producing output.- */- protected void assertNotStarted() {- if (isNotStarted())- return;- throw new IllegalStateException(- JGitText.get().outputHasAlreadyBeenStarted);- }-- /**- * Throws an exception if any commits have been marked as start.- * <p>- * If {@link #markStart(RevCommit)} has already been called,- * {@link #reset()} can be called to satisfy this condition.- *- * @since 5.5- */- protected void assertNoCommitsMarkedStart() {- if (roots.isEmpty())- return;- throw new IllegalStateException(- JGitText.get().commitsHaveAlreadyBeenMarkedAsStart);- }-- private boolean isNotStarted() {- return pending instanceof StartGenerator;- }-- /**- * Create and return an {@link org.eclipse.jgit.revwalk.ObjectWalk} using- * the same objects.- * <p>- * Prior to using this method, the caller must reset this RevWalk to clean- * any flags that were used during the last traversal.- * <p>- * The returned ObjectWalk uses the same ObjectReader, internal object pool,- * and free RevFlags. Once the ObjectWalk is created, this RevWalk should- * not be used anymore.- *- * @return a new walk, using the exact same object pool.- */- public ObjectWalk toObjectWalkWithSameObjects() {- ObjectWalk ow = new ObjectWalk(reader);- RevWalk rw = ow;- rw.objects = objects;- rw.freeFlags = freeFlags;- return ow;- }-- /**- * Construct a new unparsed commit for the given object.- *- * @param id- * the object this walker requires a commit reference for.- * @return a new unparsed reference for the object.- */- protected RevCommit createCommit(AnyObjectId id) {- return createCommit(id, commitGraph().findGraphPosition(id));- }-- private RevCommit createCommit(AnyObjectId id, int graphPos) {- if (graphPos >= 0) {- return new RevCommitCG(id, graphPos);- }- return new RevCommit(id);- }-- void carryFlagsImpl(RevCommit c) {- final int carry = c.flags & carryFlags;- if (carry != 0)- RevCommit.carryFlags(c, carry);- }-- /**- * Assume additional commits are shallow (have no parents).- * <p>- * This method is a No-op if the collection is empty.- *- * @param ids- * commits that should be treated as shallow commits, in addition- * to any commits already known to be shallow by the repository.- * @since 3.3- */- public void assumeShallow(Collection<? extends ObjectId> ids) {- for (ObjectId id : ids)- lookupCommit(id).parents = RevCommit.NO_PARENTS;- }-- /**- * Reads the "shallow" file and applies it by setting the parents of shallow- * commits to an empty array.- * <p>- * There is a sequencing problem if the first commit being parsed is a- * shallow commit, since {@link RevCommit#parseCanonical(RevWalk, byte[])}- * calls this method before its callers add the new commit to the- * {@link RevWalk#objects} map. That means a call from this method to- * {@link #lookupCommit(AnyObjectId)} fails to find that commit and creates- * a new one, which is promptly discarded.- * <p>- * To avoid that, {@link RevCommit#parseCanonical(RevWalk, byte[])} passes- * its commit to this method, so that this method can apply the shallow- * state to it directly and avoid creating the duplicate commit object.- *- * @param rc- * the initial commit being parsed- * @throws IOException- * if the shallow commits file can't be read- */- void initializeShallowCommits(RevCommit rc) throws IOException {- if (shallowCommitsInitialized) {- throw new IllegalStateException(- JGitText.get().shallowCommitsAlreadyInitialized);- }-- shallowCommitsInitialized = true;-- if (reader == null) {- return;- }-- for (ObjectId id : reader.getShallowCommits()) {- if (id.equals(rc.getId())) {- rc.parents = RevCommit.NO_PARENTS;- } else {- lookupCommit(id).parents = RevCommit.NO_PARENTS;- }- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.javadeleted file mode 100644index 4bfe2fda02..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java+++ /dev/null@@ -1,198 +0,0 @@-/*- * Copyright (C) 2011-2012, Robin Stocker <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.lib.NullProgressMonitor;-import org.eclipse.jgit.lib.ProgressMonitor;-import org.eclipse.jgit.lib.Ref;--/**- * Utility methods for {@link org.eclipse.jgit.revwalk.RevWalk}.- */-public final class RevWalkUtils {-- private RevWalkUtils() {- // Utility class- }-- /**- * Count the number of commits that are reachable from <code>start</code>- * until a commit that is reachable from <code>end</code> is encountered. In- * other words, count the number of commits that are in <code>start</code>,- * but not in <code>end</code>.- * <p>- * Note that this method calls- * {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning. Also- * note that the existing rev filter on the walk is left as-is, so be sure- * to set the right rev filter before calling this method.- *- * @param walk- * the rev walk to use- * @param start- * the commit to start counting from- * @param end- * the commit where counting should end, or null if counting- * should be done until there are no more commits- * @return the number of commits- * @throws org.eclipse.jgit.errors.MissingObjectException- * if object is missing- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * if object has unexpected type- * @throws java.io.IOException- * if an IO error occurred- */- public static int count(final RevWalk walk, final RevCommit start,- final RevCommit end) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- return find(walk, start, end).size();- }-- /**- * Find commits that are reachable from <code>start</code> until a commit- * that is reachable from <code>end</code> is encountered. In other words,- * Find of commits that are in <code>start</code>, but not in- * <code>end</code>.- * <p>- * Note that this method calls- * {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning. Also- * note that the existing rev filter on the walk is left as-is, so be sure- * to set the right rev filter before calling this method.- *- * @param walk- * the rev walk to use- * @param start- * the commit to start counting from- * @param end- * the commit where counting should end, or null if counting- * should be done until there are no more commits- * @return the commits found- * @throws org.eclipse.jgit.errors.MissingObjectException- * if object is missing- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * if object has unexpected type- * @throws java.io.IOException- * if an IO error occurred- */- public static List<RevCommit> find(final RevWalk walk,- final RevCommit start, final RevCommit end)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- walk.reset();- walk.markStart(start);- if (end != null)- walk.markUninteresting(end);-- List<RevCommit> commits = new ArrayList<>();- for (RevCommit c : walk)- commits.add(c);- return commits;- }-- /**- * Find the list of branches a given commit is reachable from when following- * parents.- * <p>- * Note that this method calls- * {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning.- * <p>- * In order to improve performance this method assumes clock skew among- * committers is never larger than 24 hours.- *- * @param commit- * the commit we are looking at- * @param revWalk- * The RevWalk to be used.- * @param refs- * the set of branches we want to see reachability from- * @return the list of branches a given commit is reachable from- * @throws org.eclipse.jgit.errors.MissingObjectException- * if object is missing- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * if object has unexpected type- * @throws java.io.IOException- * if an IO error occurred- */- public static List<Ref> findBranchesReachableFrom(RevCommit commit,- RevWalk revWalk, Collection<Ref> refs)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return findBranchesReachableFrom(commit, revWalk, refs,- NullProgressMonitor.INSTANCE);- }-- /**- * Find the list of branches a given commit is reachable from when following- * parents.- * <p>- * Note that this method calls- * {@link org.eclipse.jgit.revwalk.RevWalk#reset()} at the beginning.- * <p>- * In order to improve performance this method assumes clock skew among- * committers is never larger than 24 hours.- *- * @param commit- * the commit we are looking at- * @param revWalk- * The RevWalk to be used.- * @param refs- * the set of branches we want to see reachability from- * @param monitor- * the callback for progress and cancellation- * @return the list of branches a given commit is reachable from- * @throws org.eclipse.jgit.errors.MissingObjectException- * if object is missing- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * if object has unexpected type- * @throws java.io.IOException- * if an IO error occurred- * @since 5.4- */- public static List<Ref> findBranchesReachableFrom(RevCommit commit,- RevWalk revWalk, Collection<Ref> refs, ProgressMonitor monitor)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {-- // Make sure commit is from the same RevWalk- commit = revWalk.parseCommit(commit.getId());- revWalk.reset();- List<Ref> filteredRefs = new ArrayList<>();- monitor.beginTask(JGitText.get().searchForReachableBranches,- refs.size());- final int SKEW = 24*3600; // one day clock skew-- for (Ref ref : refs) {- RevObject maybehead = revWalk.parseAny(ref.getObjectId());- if (!(maybehead instanceof RevCommit))- continue;- RevCommit headCommit = (RevCommit) maybehead;-- // if commit is in the ref branch, then the tip of ref should be- // newer than the commit we are looking for. Allow for a large- // clock skew.- if (headCommit.getCommitTime() + SKEW < commit.getCommitTime())- continue;-- filteredRefs.add(ref);- }- List<Ref> result = revWalk.getMergedInto(commit, filteredRefs, monitor);- monitor.endTask();- return result;- }--}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.javadeleted file mode 100644index 4a93f4d745..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java+++ /dev/null@@ -1,205 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/**- * Replaces a RevCommit's parents until not colored with REWRITE.- * <p>- * Before a RevCommit is returned to the caller its parents are updated to- * create a dense DAG. Instead of reporting the actual parents as recorded when- * the commit was created the returned commit will reflect the next closest- * commit that matched the revision walker's filters.- * <p>- * This generator is the second phase of a path limited revision walk and- * assumes it is receiving RevCommits from {@link TreeRevFilter}.- *- * @see TreeRevFilter- */-class RewriteGenerator extends Generator {- private static final int REWRITE = RevWalk.REWRITE;-- /** For {@link #cleanup(RevCommit[])} to remove duplicate parents. */- private static final int DUPLICATE = RevWalk.TEMP_MARK;-- private final Generator source;-- private final FIFORevQueue pending;-- RewriteGenerator(Generator s) {- super(s.firstParent);- source = s;- pending = new FIFORevQueue(s.firstParent);- }-- @Override- void shareFreeList(BlockRevQueue q) {- source.shareFreeList(q);- }-- @Override- int outputType() {- return source.outputType() & ~NEEDS_REWRITE;- }-- @SuppressWarnings("ReferenceEquality")- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- RevCommit c = pending.next();-- if (c == null) {- c = source.next();- if (c == null) {- // We are done: Both the source generator and our internal list- // are completely exhausted.- return null;- }- }-- applyFilterToParents(c);-- boolean rewrote = false;- final RevCommit[] pList = c.getParents();- final int nParents = pList.length;- for (int i = 0; i < nParents; i++) {- final RevCommit oldp = pList[i];- final RevCommit newp = rewrite(oldp);- if (firstParent) {- if (newp == null) {- c.parents = RevCommit.NO_PARENTS;- } else {- c.parents = new RevCommit[] { newp };- }- return c;- }- if (oldp != newp) {- pList[i] = newp;- rewrote = true;- }- }- if (rewrote) {- c.parents = cleanup(pList);- }- return c;- }-- /**- * Makes sure that the {@link TreeRevFilter} has been applied to all parents- * of this commit by the previous {@link PendingGenerator}.- *- * @param c- * given commit- * @throws MissingObjectException- * if an object is missing- * @throws IncorrectObjectTypeException- * if an object has an unexpected type- * @throws IOException- * if an IO error occurred- */- private void applyFilterToParents(RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- for (RevCommit parent : c.getParents()) {- while ((parent.flags & RevWalk.TREE_REV_FILTER_APPLIED) == 0) {-- RevCommit n = source.next();-- if (n != null) {- pending.add(n);- } else {- // Source generator is exhausted; filter has been applied to- // all commits- return;- }-- }-- }- }-- private RevCommit rewrite(RevCommit p) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {-- if (p.getParentCount() > 1) {- // This parent is a merge, so keep it.- //- return p;- }-- if ((p.flags & RevWalk.UNINTERESTING) != 0) {- // Retain uninteresting parents. They show where the- // DAG was cut off because it wasn't interesting.- //- return p;- }-- if ((p.flags & REWRITE) == 0) {- // This parent was not eligible for rewriting. We- // need to keep it in the DAG.- //- return p;- }-- if (p.getParentCount() == 0) {- // We can't go back any further, other than to- // just delete the parent entirely.- //- return null;- }-- applyFilterToParents(p.getParent(0));- p = p.getParent(0);-- }- }-- private RevCommit[] cleanup(RevCommit[] oldList) {- // Remove any duplicate parents caused due to rewrites (e.g. a merge- // with two sides that both simplified back into the merge base).- // We also may have deleted a parent by marking it null.- //- int newCnt = 0;- for (int o = 0; o < oldList.length; o++) {- final RevCommit p = oldList[o];- if (p == null)- continue;- if ((p.flags & DUPLICATE) != 0) {- oldList[o] = null;- continue;- }- p.flags |= DUPLICATE;- newCnt++;- }-- if (newCnt == oldList.length) {- for (RevCommit p : oldList)- p.flags &= ~DUPLICATE;- return oldList;- }-- final RevCommit[] newList = new RevCommit[newCnt];- newCnt = 0;- for (RevCommit p : oldList) {- if (p != null) {- newList[newCnt++] = p;- p.flags &= ~DUPLICATE;- }- }-- return newList;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.javadeleted file mode 100644index 6854b6083d..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java+++ /dev/null@@ -1,164 +0,0 @@-/*- * Copyright (C) 2008-2009, Google Inc.- * Copyright (C) 2008, Marek Zawirski <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.text.MessageFormat;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.filter.AndRevFilter;-import org.eclipse.jgit.revwalk.filter.RevFilter;-import org.eclipse.jgit.treewalk.filter.TreeFilter;--/**- * Initial RevWalk generator that bootstraps a new walk.- * <p>- * Initially RevWalk starts with this generator as its chosen implementation.- * The first request for a RevCommit from the RevWalk instance calls to our- * {@link #next()} method, and we replace ourselves with the best Generator- * implementation available based upon the current RevWalk configuration.- */-class StartGenerator extends Generator {- private final RevWalk walker;-- StartGenerator(RevWalk w) {- super(w.isFirstParent());- walker = w;- }-- @Override- int outputType() {- return 0;- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- Generator g;-- final RevWalk w = walker;- RevFilter rf = w.getRevFilter();- final TreeFilter tf = w.getTreeFilter();- AbstractRevQueue q = walker.queue;-- if (rf == RevFilter.MERGE_BASE) {- // Computing for merge bases is a special case and does not- // use the bulk of the generator pipeline.- //- if (tf != TreeFilter.ALL) {- throw new IllegalStateException(MessageFormat.format(- JGitText.get().cannotCombineTreeFilterWithRevFilter, tf, rf));- }- if (w.isFirstParent()) {- throw new IllegalStateException(- JGitText.get().cannotFindMergeBaseUsingFirstParent);- }-- final MergeBaseGenerator mbg = new MergeBaseGenerator(w);- walker.pending = mbg;- walker.queue = AbstractRevQueue.EMPTY_QUEUE;- mbg.init(q);- return mbg.next();- }-- final boolean uninteresting = q.anybodyHasFlag(RevWalk.UNINTERESTING);- boolean boundary = walker.hasRevSort(RevSort.BOUNDARY);-- if (!boundary && walker instanceof ObjectWalk) {- // The object walker requires boundary support to color- // trees and blobs at the boundary uninteresting so it- // does not produce those in the result.- //- boundary = true;- }- if (boundary && !uninteresting) {- // If we were not fed uninteresting commits we will never- // construct a boundary. There is no reason to include the- // extra overhead associated with that in our pipeline.- //- boundary = false;- }-- final DateRevQueue pending;- int pendingOutputType = 0;- if (q instanceof DateRevQueue) {- pending = (DateRevQueue)q;- } else {- pending = RevWalk.newDateRevQueue(q);- }- if (tf != TreeFilter.ALL) {- int rewriteFlag;- if (w.getRewriteParents()) {- pendingOutputType |= HAS_REWRITE | NEEDS_REWRITE;- rewriteFlag = RevWalk.REWRITE;- } else- rewriteFlag = 0;- rf = AndRevFilter.create(new TreeRevFilter(w, tf, rewriteFlag), rf);- }-- walker.queue = q;-- if (walker instanceof DepthWalk) {- DepthWalk dw = (DepthWalk) walker;- g = new DepthGenerator(dw, pending);- } else {- g = new PendingGenerator(w, pending, rf, pendingOutputType);-- if (walker.hasRevSort(RevSort.BOUNDARY)) {- // Because the boundary generator may produce uninteresting- // commits we cannot allow the pending generator to dispose- // of them early.- //- ((PendingGenerator) g).canDispose = false;- }- }-- if ((g.outputType() & NEEDS_REWRITE) != 0) {- g = new RewriteGenerator(g);- }-- if (walker.hasRevSort(RevSort.TOPO)- && walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)) {- throw new IllegalStateException(JGitText- .get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort);- }-- if (walker.hasRevSort(RevSort.TOPO)- && (g.outputType() & SORT_TOPO) == 0) {- g = new TopoSortGenerator(g);- } else if (walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)- && (g.outputType() & SORT_TOPO) == 0) {- g = new TopoNonIntermixSortGenerator(g);- }- if (walker.hasRevSort(RevSort.REVERSE))- g = new LIFORevQueue(g);- if (boundary)- g = new BoundaryGenerator(w, g);- else if (uninteresting) {- // Try to protect ourselves from uninteresting commits producing- // due to clock skew in the commit time stamps. Delay such that- // we have a chance at coloring enough of the graph correctly,- // and then strip any UNINTERESTING nodes that may have leaked- // through early.- //- if (pending.peek() != null)- g = new DelayRevQueue(g);- g = new FixUninterestingGenerator(g);- }-- w.pending = g;- return g.next();- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoNonIntermixSortGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoNonIntermixSortGenerator.javadeleted file mode 100644index c9d8ff90fd..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoNonIntermixSortGenerator.java+++ /dev/null@@ -1,120 +0,0 @@-/*- * Copyright (C) 2020, Google LLC. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/** Sorts commits in topological order without intermixing lines of history. */-class TopoNonIntermixSortGenerator extends Generator {- private static final int TOPO_QUEUED = RevWalk.TOPO_QUEUED;-- private final FIFORevQueue pending;-- private final int outputType;-- /**- * Create a new sorter and completely spin the generator.- * <p>- * When the constructor completes the supplied generator will have no- * commits remaining, as all of the commits will be held inside of this- * generator's internal buffer.- *- * @param s- * generator to pull all commits out of, and into this buffer.- * @throws MissingObjectException- * if an object is missing- * @throws IncorrectObjectTypeException- * if an object has an unexpected type- * @throws IOException- * if an IO error occurred- */- TopoNonIntermixSortGenerator(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s.firstParent);- pending = new FIFORevQueue(firstParent);- outputType = s.outputType() | SORT_TOPO;- s.shareFreeList(pending);- for (;;) {- final RevCommit c = s.next();- if (c == null) {- break;- }- if ((c.flags & TOPO_QUEUED) == 0) {- for (RevCommit p : c.getParents()) {- p.inDegree++;-- if (firstParent) {- break;- }- }- }- c.flags |= TOPO_QUEUED;- pending.add(c);- }- }-- @Override- int outputType() {- return outputType;- }-- @Override- void shareFreeList(BlockRevQueue q) {- q.shareFreeList(pending);- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit c = pending.next();- if (c == null) {- return null;- }-- if (c.inDegree > 0) {- // At least one of our children is missing. We delay- // production until all of our children are output.- //- continue;- }-- if ((c.flags & TOPO_QUEUED) == 0) {- // c is a parent that already produced or a parent that- // was never in the priority queue and should never produce.- //- continue;- }-- for (RevCommit p : c.getParents()) {- if (--p.inDegree == 0 && (p.flags & TOPO_QUEUED) != 0) {- // The parent has no unproduced interesting children. unpop- // the parent so it goes right behind this child. This means- // that this parent commit may appear in "pending" more than- // once, but this is safe since upon the second and- // subsequent iterations with this commit, it will no longer- // have TOPO_QUEUED set, and thus will be skipped.- //- pending.unpop(p);- }- if (firstParent) {- break;- }- }-- c.flags &= ~TOPO_QUEUED;- return c;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.javadeleted file mode 100644index 950b0a45b4..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java+++ /dev/null@@ -1,108 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;--/** Sorts commits in topological order. */-class TopoSortGenerator extends Generator {- private static final int TOPO_DELAY = RevWalk.TOPO_DELAY;-- private final FIFORevQueue pending;-- private final int outputType;-- /**- * Create a new sorter and completely spin the generator.- * <p>- * When the constructor completes the supplied generator will have no- * commits remaining, as all of the commits will be held inside of this- * generator's internal buffer.- *- * @param s- * generator to pull all commits out of, and into this buffer.- * @throws MissingObjectException- * if an object is missing- * @throws IncorrectObjectTypeException- * if an object has an unexpected type- * @throws IOException- * if an IO error occurred- */- TopoSortGenerator(Generator s) throws MissingObjectException,- IncorrectObjectTypeException, IOException {- super(s.firstParent);- pending = new FIFORevQueue(firstParent);- outputType = s.outputType() | SORT_TOPO;- s.shareFreeList(pending);- for (;;) {- final RevCommit c = s.next();- if (c == null) {- break;- }- for (RevCommit p : c.getParents()) {- p.inDegree++;- if (firstParent) {- break;- }- }- pending.add(c);- }- }-- @Override- int outputType() {- return outputType;- }-- @Override- void shareFreeList(BlockRevQueue q) {- q.shareFreeList(pending);- }-- @Override- RevCommit next() throws MissingObjectException,- IncorrectObjectTypeException, IOException {- for (;;) {- final RevCommit c = pending.next();- if (c == null)- return null;-- if (c.inDegree > 0) {- // At least one of our children is missing. We delay- // production until all of our children are output.- //- c.flags |= TOPO_DELAY;- continue;- }-- // All of our children have already produced,- // so it is OK for us to produce now as well.- //- for (RevCommit p : c.getParents()) {- if (--p.inDegree == 0 && (p.flags & TOPO_DELAY) != 0) {- // This parent tried to come before us, but we are- // his last child. unpop the parent so it goes right- // behind this child.- //- p.flags &= ~TOPO_DELAY;- pending.unpop(p);- }- if (firstParent) {- break;- }- }- return c;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.javadeleted file mode 100644index 99943b78e6..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java+++ /dev/null@@ -1,351 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk;--import java.io.IOException;-import java.util.List;-import java.util.Optional;-import java.util.Set;--import org.eclipse.jgit.internal.storage.commitgraph.ChangedPathFilter;-import org.eclipse.jgit.diff.DiffConfig;-import org.eclipse.jgit.diff.DiffEntry;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.diff.RenameDetector;-import org.eclipse.jgit.errors.CorruptObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.filter.RevFilter;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.treewalk.filter.TreeFilter;--/**- * Filter applying a {@link org.eclipse.jgit.treewalk.filter.TreeFilter} against- * changed paths in each commit.- * <p>- * Each commit is differenced concurrently against all of its parents to look- * for tree entries that are interesting to the- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter}.- *- * @since 3.5- */-public class TreeRevFilter extends RevFilter {- private static final int PARSED = RevWalk.PARSED;-- private static final int UNINTERESTING = RevWalk.UNINTERESTING;-- private static final int FILTER_APPLIED = RevWalk.TREE_REV_FILTER_APPLIED;-- private final int rewriteFlag;-- private final TreeWalk pathFilter;-- private long changedPathFilterTruePositive = 0;-- private long changedPathFilterFalsePositive = 0;-- private long changedPathFilterNegative = 0;-- /**- * Create a {@link org.eclipse.jgit.revwalk.filter.RevFilter} from a- * {@link org.eclipse.jgit.treewalk.filter.TreeFilter}.- *- * @param walker- * walker used for reading trees.- * @param t- * filter to compare against any changed paths in each commit. If- * a {@link org.eclipse.jgit.revwalk.FollowFilter}, will be- * replaced with a new filter following new paths after a rename.- * @since 3.5- */- public TreeRevFilter(RevWalk walker, TreeFilter t) {- this(walker, t, 0);- }-- /**- * Create a filter for the first phase of a parent-rewriting limited- * revision walk.- * <p>- * This filter is ANDed to evaluate before all other filters and ties the- * configured {@link TreeFilter} into the revision walking process.- * <p>- * If no interesting tree entries are found the commit is colored with- * {@code rewriteFlag}, allowing a later pass implemented by- * {@link RewriteGenerator} to remove those colored commits from the DAG.- *- * @see RewriteGenerator- *- * @param walker- * walker used for reading trees.- * @param t- * filter to compare against any changed paths in each commit. If- * a {@link FollowFilter}, will be replaced with a new filter- * following new paths after a rename.- * @param rewriteFlag- * flag to color commits to be removed from the simplified DAT.- */- TreeRevFilter(RevWalk walker, TreeFilter t, int rewriteFlag) {- pathFilter = new TreeWalk(walker.reader);- pathFilter.setFilter(t);- pathFilter.setRecursive(t.shouldBeRecursive());- this.rewriteFlag = rewriteFlag;- }-- @Override- public RevFilter clone() {- throw new UnsupportedOperationException();- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- c.flags |= FILTER_APPLIED;- // Reset the tree filter to scan this commit and parents.- //- RevCommit[] pList = c.getParents();- int nParents = pList.length;- TreeWalk tw = pathFilter;- ObjectId[] trees = new ObjectId[nParents + 1];- for (int i = 0; i < nParents; i++) {- RevCommit p = c.getParent(i);- if ((p.flags & PARSED) == 0) {- p.parseHeaders(walker);- }- trees[i] = p.getTree();- }- trees[nParents] = c.getTree();- tw.reset(trees);-- if (nParents == 1) {- // We have exactly one parent. This is a very common case.- //- int chgs = 0, adds = 0;- boolean changedPathFilterUsed = false;- boolean mustCalculateChgs = true;- ChangedPathFilter cpf = c.getChangedPathFilter(walker);- if (cpf != null) {- Optional<Set<byte[]>> paths = pathFilter.getFilter()- .getPathsBestEffort();- if (paths.isPresent()) {- changedPathFilterUsed = true;- if (paths.get().stream().noneMatch(cpf::maybeContains)) {- mustCalculateChgs = false;- }- }- }- if (mustCalculateChgs) {- while (tw.next()) {- chgs++;- if (tw.getRawMode(0) == 0 && tw.getRawMode(1) != 0) {- adds++;- } else {- break; // no point in looking at this further.- }- }- if (changedPathFilterUsed) {- if (chgs > 0) {- changedPathFilterTruePositive++;- } else {- changedPathFilterFalsePositive++;- }- }- } else {- if (changedPathFilterUsed) {- changedPathFilterNegative++;- }- }-- if (chgs == 0) {- // No changes, so our tree is effectively the same as- // our parent tree. We pass the buck to our parent.- //- c.flags |= rewriteFlag;- return false;- }-- // We have interesting items, but neither of the special- // cases denoted above.- //- if (adds > 0 && tw.getFilter() instanceof FollowFilter) {- // One of the paths we care about was added in this- // commit. We need to update our filter to its older- // name, if we can discover it. Find out what that is.- //- updateFollowFilter(trees, ((FollowFilter) tw.getFilter()).cfg,- c);- }- return true;- } else if (nParents == 0) {- // We have no parents to compare against. Consider us to be- // REWRITE only if we have no paths matching our filter.- //- if (tw.next()) {- return true;- }- c.flags |= rewriteFlag;- return false;- }-- // We are a merge commit. We can only be REWRITE if we are same- // to _all_ parents. We may also be able to eliminate a parent if- // it does not contribute changes to us. Such a parent may be an- // uninteresting side branch.- //- int[] chgs = new int[nParents];- int[] adds = new int[nParents];- while (tw.next()) {- int myMode = tw.getRawMode(nParents);- for (int i = 0; i < nParents; i++) {- int pMode = tw.getRawMode(i);- if (myMode == pMode && tw.idEqual(i, nParents)) {- continue;- }- chgs[i]++;- if (pMode == 0 && myMode != 0) {- adds[i]++;- }- }- }-- boolean same = false;- boolean diff = false;- for (int i = 0; i < nParents; i++) {- if (chgs[i] == 0) {- // No changes, so our tree is effectively the same as- // this parent tree. We pass the buck to only this one- // parent commit.- //-- RevCommit p = pList[i];- if ((p.flags & UNINTERESTING) != 0) {- // This parent was marked as not interesting by the- // application. We should look for another parent- // that is interesting.- //- same = true;- continue;- }-- c.flags |= rewriteFlag;- c.parents = new RevCommit[] { p };- return false;- }-- if (chgs[i] == adds[i]) {- // All of the differences from this parent were because we- // added files that they did not have. This parent is our- // "empty tree root" and thus their history is not relevant.- // Cut our grandparents to be an empty list.- //- tw.reset(pList[i].getTree());- if (!tw.next()) {- pList[i].parents = RevCommit.NO_PARENTS;- }- }-- // We have an interesting difference relative to this parent.- //- diff = true;- }-- if (diff && !same) {- // We did not abort above, so we are different in at least one- // way from all of our parents. We have to take the blame for- // that difference.- //- return true;- }-- // We are the same as all of our parents. We must keep them- // as they are and allow those parents to flow into pending- // for further scanning.- //- c.flags |= rewriteFlag;- return false;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- /**- * Return how many times a changed path filter correctly predicted that a- * path was changed in a commit, for statistics gathering purposes.- *- * @return count of true positives- * @since 6.7- */- public long getChangedPathFilterTruePositive() {- return changedPathFilterTruePositive;- }-- /**- * Return how many times a changed path filter wrongly predicted that a path- * was changed in a commit, for statistics gathering purposes.- *- * @return count of false positives- * @since 6.7- */- public long getChangedPathFilterFalsePositive() {- return changedPathFilterFalsePositive;- }-- /**- * Return how many times a changed path filter predicted that a path was not- * changed in a commit (allowing that commit to be skipped), for statistics- * gathering purposes.- *- * @return count of negatives- * @since 6.7- */- public long getChangedPathFilterNegative() {- return changedPathFilterNegative;- }-- private void updateFollowFilter(ObjectId[] trees, DiffConfig cfg,- RevCommit commit)- throws MissingObjectException, IncorrectObjectTypeException,- CorruptObjectException, IOException {- TreeWalk tw = pathFilter;- FollowFilter oldFilter = (FollowFilter) tw.getFilter();- tw.setFilter(TreeFilter.ANY_DIFF);- tw.reset(trees);-- List<DiffEntry> files = DiffEntry.scan(tw);- RenameDetector rd = new RenameDetector(tw.getObjectReader(), cfg);- rd.addAll(files);- files = rd.compute();-- TreeFilter newFilter = oldFilter;- for (DiffEntry ent : files) {- if (isRename(ent) && ent.getNewPath().equals(oldFilter.getPath())) {- newFilter = FollowFilter.create(ent.getOldPath(), cfg);- RenameCallback callback = oldFilter.getRenameCallback();- if (callback != null) {- callback.renamed(ent, commit);- // forward the callback to the new follow filter- ((FollowFilter) newFilter).setRenameCallback(callback);- }- break;- }- }- tw.setFilter(newFilter);- }-- private static boolean isRename(DiffEntry ent) {- return ent.getChangeType() == ChangeType.RENAME- || ent.getChangeType() == ChangeType.COPY;- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.javadeleted file mode 100644index 08804e85b8..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java+++ /dev/null@@ -1,174 +0,0 @@-/*- * Copyright (C) 2007, Robin Rosenberg <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;-import java.util.Collection;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Includes a commit only if all subfilters include the same commit.- * <p>- * Classic shortcut behavior is used, so evaluation of the- * {@link org.eclipse.jgit.revwalk.filter.RevFilter#include(RevWalk, RevCommit)}- * method stops as soon as a false result is obtained. Applications can improve- * filtering performance by placing faster filters that are more likely to- * reject a result earlier in the list.- */-public abstract class AndRevFilter extends RevFilter {- /**- * Create a filter with two filters, both of which must match.- *- * @param a- * first filter to test.- * @param b- * second filter to test.- * @return a filter that must match both input filters.- */- public static RevFilter create(RevFilter a, RevFilter b) {- if (a == ALL)- return b;- if (b == ALL)- return a;- return new Binary(a, b);- }-- /**- * Create a filter around many filters, all of which must match.- *- * @param list- * list of filters to match against. Must contain at least 2- * filters.- * @return a filter that must match all input filters.- */- public static RevFilter create(RevFilter[] list) {- if (list.length == 2)- return create(list[0], list[1]);- if (list.length < 2)- throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);- final RevFilter[] subfilters = new RevFilter[list.length];- System.arraycopy(list, 0, subfilters, 0, list.length);- return new List(subfilters);- }-- /**- * Create a filter around many filters, all of which must match.- *- * @param list- * list of filters to match against. Must contain at least 2- * filters.- * @return a filter that must match all input filters.- */- public static RevFilter create(Collection<RevFilter> list) {- if (list.size() < 2)- throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);- final RevFilter[] subfilters = new RevFilter[list.size()];- list.toArray(subfilters);- if (subfilters.length == 2)- return create(subfilters[0], subfilters[1]);- return new List(subfilters);- }-- private static class Binary extends AndRevFilter {- private final RevFilter a;-- private final RevFilter b;-- private final boolean requiresCommitBody;-- Binary(RevFilter one, RevFilter two) {- a = one;- b = two;- requiresCommitBody = a.requiresCommitBody()- || b.requiresCommitBody();- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return a.include(walker, c) && b.include(walker, c);- }-- @Override- public boolean requiresCommitBody() {- return requiresCommitBody;- }-- @Override- public RevFilter clone() {- return new Binary(a.clone(), b.clone());- }-- @Override- public String toString() {- return "(" + a.toString() + " AND " + b.toString() + ")"; //$NON-NLS-1$- }- }-- private static class List extends AndRevFilter {- private final RevFilter[] subfilters;-- private final boolean requiresCommitBody;-- List(RevFilter[] list) {- subfilters = list;-- boolean rcb = false;- for (RevFilter filter : subfilters)- rcb |= filter.requiresCommitBody();- requiresCommitBody = rcb;- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- for (RevFilter f : subfilters) {- if (!f.include(walker, c))- return false;- }- return true;- }-- @Override- public boolean requiresCommitBody() {- return requiresCommitBody;- }-- @Override- public RevFilter clone() {- final RevFilter[] s = new RevFilter[subfilters.length];- for (int i = 0; i < s.length; i++)- s[i] = subfilters[i].clone();- return new List(s);- }-- @Override- public String toString() {- final StringBuilder r = new StringBuilder();- r.append("(");- for (int i = 0; i < subfilters.length; i++) {- if (i > 0)- r.append(" AND ");- r.append(subfilters[i].toString());- }- r.append(")");- return r.toString();- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.javadeleted file mode 100644index 4fc83ce20e..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java+++ /dev/null@@ -1,86 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.util.regex.Pattern;--import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.util.RawCharSequence;-import org.eclipse.jgit.util.RawParseUtils;--/**- * Matches only commits whose author name matches the pattern.- */-public class AuthorRevFilter {- /**- * Create a new author filter.- * <p>- * An optimized substring search may be automatically selected if the- * pattern does not contain any regular expression meta-characters.- * <p>- * The search is performed using a case-insensitive comparison. The- * character encoding of the commit message itself is not respected. The- * filter matches on raw UTF-8 byte sequences.- *- * @param pattern- * regular expression pattern to match.- * @return a new filter that matches the given expression against the author- * name and address of a commit.- */- public static RevFilter create(String pattern) {- if (pattern.length() == 0)- throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);- if (SubStringRevFilter.safe(pattern))- return new SubStringSearch(pattern);- return new PatternSearch(pattern);- }-- private AuthorRevFilter() {- // Don't permit us to be created.- }-- static RawCharSequence textFor(RevCommit cmit) {- final byte[] raw = cmit.getRawBuffer();- final int b = RawParseUtils.author(raw, 0);- if (b < 0)- return RawCharSequence.EMPTY;- final int e = RawParseUtils.nextLF(raw, b, '>');- return new RawCharSequence(raw, b, e);- }-- private static class PatternSearch extends PatternMatchRevFilter {- PatternSearch(String patternText) {- super(patternText, true, true, Pattern.CASE_INSENSITIVE);- }-- @Override- protected CharSequence text(RevCommit cmit) {- return textFor(cmit);- }-- @Override- public RevFilter clone() {- return new PatternSearch(pattern());- }- }-- private static class SubStringSearch extends SubStringRevFilter {- SubStringSearch(String patternText) {- super(patternText);- }-- @Override- protected RawCharSequence text(RevCommit cmit) {- return textFor(cmit);- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.javadeleted file mode 100644index 7d113bec2e..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java+++ /dev/null@@ -1,176 +0,0 @@-/*- * Copyright (C) 2009, Mark Struberg <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;-import java.util.Date;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Selects commits based upon the commit time field.- */-public abstract class CommitTimeRevFilter extends RevFilter {- /**- * Create a new filter to select commits before a given date/time.- *- * @param ts- * the point in time to cut on.- * @return a new filter to select commits on or before <code>ts</code>.- */- public static final RevFilter before(Date ts) {- return before(ts.getTime());- }-- /**- * Create a new filter to select commits before a given date/time.- *- * @param ts- * the point in time to cut on, in milliseconds- * @return a new filter to select commits on or before <code>ts</code>.- */- public static final RevFilter before(long ts) {- return new Before(ts);- }-- /**- * Create a new filter to select commits after a given date/time.- *- * @param ts- * the point in time to cut on.- * @return a new filter to select commits on or after <code>ts</code>.- */- public static final RevFilter after(Date ts) {- return after(ts.getTime());- }-- /**- * Create a new filter to select commits after a given date/time.- *- * @param ts- * the point in time to cut on, in milliseconds.- * @return a new filter to select commits on or after <code>ts</code>.- */- public static final RevFilter after(long ts) {- return new After(ts);- }-- /**- * Create a new filter to select commits after or equal a given date/time <code>since</code>- * and before or equal a given date/time <code>until</code>.- *- * @param since the point in time to cut on.- * @param until the point in time to cut off.- * @return a new filter to select commits between the given date/times.- */- public static final RevFilter between(Date since, Date until) {- return between(since.getTime(), until.getTime());- }-- /**- * Create a new filter to select commits after or equal a given date/time <code>since</code>- * and before or equal a given date/time <code>until</code>.- *- * @param since the point in time to cut on, in milliseconds.- * @param until the point in time to cut off, in millisconds.- * @return a new filter to select commits between the given date/times.- */- public static final RevFilter between(long since, long until) {- return new Between(since, until);- }-- final int when;-- CommitTimeRevFilter(long ts) {- when = (int) (ts / 1000);- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- private static class Before extends CommitTimeRevFilter {- Before(long ts) {- super(ts);- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- return cmit.getCommitTime() <= when;- }-- @Override- public String toString() {- return super.toString() + "(" + new Date(when * 1000L) + ")";- }- }-- private static class After extends CommitTimeRevFilter {- After(long ts) {- super(ts);- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- // Since the walker sorts commits by commit time we can be- // reasonably certain there is nothing remaining worth our- // scanning if this commit is before the point in question.- //- if (cmit.getCommitTime() < when)- throw StopWalkException.INSTANCE;- return true;- }-- @Override- public String toString() {- return super.toString() + "(" + new Date(when * 1000L) + ")";- }- }-- private static class Between extends CommitTimeRevFilter {- private final int until;-- Between(long since, long until) {- super(since);- this.until = (int) (until / 1000);- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- return cmit.getCommitTime() <= until && cmit.getCommitTime() >= when;- }-- @Override- public String toString() {- return super.toString() + "(" + new Date(when * 1000L) + " - "- + new Date(until * 1000L) + ")";- }-- }--}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.javadeleted file mode 100644index 69155d040b..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java+++ /dev/null@@ -1,86 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.util.regex.Pattern;--import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.util.RawCharSequence;-import org.eclipse.jgit.util.RawParseUtils;--/**- * Matches only commits whose committer name matches the pattern.- */-public class CommitterRevFilter {- /**- * Create a new committer filter.- * <p>- * An optimized substring search may be automatically selected if the- * pattern does not contain any regular expression meta-characters.- * <p>- * The search is performed using a case-insensitive comparison. The- * character encoding of the commit message itself is not respected. The- * filter matches on raw UTF-8 byte sequences.- *- * @param pattern- * regular expression pattern to match.- * @return a new filter that matches the given expression against the author- * name and address of a commit.- */- public static RevFilter create(String pattern) {- if (pattern.length() == 0)- throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);- if (SubStringRevFilter.safe(pattern))- return new SubStringSearch(pattern);- return new PatternSearch(pattern);- }-- private CommitterRevFilter() {- // Don't permit us to be created.- }-- static RawCharSequence textFor(RevCommit cmit) {- final byte[] raw = cmit.getRawBuffer();- final int b = RawParseUtils.committer(raw, 0);- if (b < 0)- return RawCharSequence.EMPTY;- final int e = RawParseUtils.nextLF(raw, b, '>');- return new RawCharSequence(raw, b, e);- }-- private static class PatternSearch extends PatternMatchRevFilter {- PatternSearch(String patternText) {- super(patternText, true, true, Pattern.CASE_INSENSITIVE);- }-- @Override- protected CharSequence text(RevCommit cmit) {- return textFor(cmit);- }-- @Override- public RevFilter clone() {- return new PatternSearch(pattern());- }- }-- private static class SubStringSearch extends SubStringRevFilter {- SubStringSearch(String patternText) {- super(patternText);- }-- @Override- protected RawCharSequence text(RevCommit cmit) {- return textFor(cmit);- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.javadeleted file mode 100644index 09bcb33f2e..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java+++ /dev/null@@ -1,63 +0,0 @@-/*- * Copyright (C) 2011, Tomasz Zarna <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Limits the number of commits output.- */-public class MaxCountRevFilter extends RevFilter {-- private int maxCount;-- private int count;-- /**- * Create a new max count filter.- *- * @param maxCount- * the limit- * @return a new filter- */- public static RevFilter create(int maxCount) {- if (maxCount < 0)- throw new IllegalArgumentException(- JGitText.get().maxCountMustBeNonNegative);- return new MaxCountRevFilter(maxCount);- }-- private MaxCountRevFilter(int maxCount) {- this.count = 0;- this.maxCount = maxCount;- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- count++;- if (count > maxCount)- throw StopWalkException.INSTANCE;- return true;- }-- @Override- public RevFilter clone() {- return new MaxCountRevFilter(maxCount);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.javadeleted file mode 100644index 91f9a07dec..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java+++ /dev/null@@ -1,86 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.util.regex.Pattern;--import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.util.RawCharSequence;-import org.eclipse.jgit.util.RawParseUtils;--/**- * Matches only commits whose message matches the pattern.- */-public class MessageRevFilter {- /**- * Create a message filter.- * <p>- * An optimized substring search may be automatically selected if the- * pattern does not contain any regular expression meta-characters.- * <p>- * The search is performed using a case-insensitive comparison. The- * character encoding of the commit message itself is not respected. The- * filter matches on raw UTF-8 byte sequences.- *- * @param pattern- * regular expression pattern to match.- * @return a new filter that matches the given expression against the- * message body of the commit.- */- public static RevFilter create(String pattern) {- if (pattern.length() == 0)- throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);- if (SubStringRevFilter.safe(pattern))- return new SubStringSearch(pattern);- return new PatternSearch(pattern);- }-- private MessageRevFilter() {- // Don't permit us to be created.- }-- static RawCharSequence textFor(RevCommit cmit) {- final byte[] raw = cmit.getRawBuffer();- final int b = RawParseUtils.commitMessage(raw, 0);- if (b < 0)- return RawCharSequence.EMPTY;- return new RawCharSequence(raw, b, raw.length);- }-- private static class PatternSearch extends PatternMatchRevFilter {- PatternSearch(String patternText) {- super(patternText, true, true, Pattern.CASE_INSENSITIVE- | Pattern.DOTALL);- }-- @Override- protected CharSequence text(RevCommit cmit) {- return textFor(cmit);- }-- @Override- public RevFilter clone() {- return new PatternSearch(pattern());- }- }-- private static class SubStringSearch extends SubStringRevFilter {- SubStringSearch(String patternText) {- super(patternText);- }-- @Override- protected RawCharSequence text(RevCommit cmit) {- return textFor(cmit);- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.javadeleted file mode 100644index 8fcebc9fa1..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java+++ /dev/null@@ -1,67 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Includes a commit only if the subfilter does not include the commit.- */-public class NotRevFilter extends RevFilter {- /**- * Create a filter that negates the result of another filter.- *- * @param a- * filter to negate.- * @return a filter that does the reverse of <code>a</code>.- */- public static RevFilter create(RevFilter a) {- return new NotRevFilter(a);- }-- private final RevFilter a;-- private NotRevFilter(RevFilter one) {- a = one;- }-- @Override- public RevFilter negate() {- return a;- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return !a.include(walker, c);- }-- @Override- public boolean requiresCommitBody() {- return a.requiresCommitBody();- }-- @Override- public RevFilter clone() {- return new NotRevFilter(a.clone());- }-- @Override- public String toString() {- return "NOT " + a.toString(); //$NON-NLS-1$- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.javadeleted file mode 100644index 519b9fb1d7..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java+++ /dev/null@@ -1,61 +0,0 @@-/**- * Copyright (C) 2015, Google Inc. and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.revwalk.ObjectWalk;--/**- * Selects interesting objects when walking.- * <p>- * Applications should install the filter on an ObjectWalk by- * {@link org.eclipse.jgit.revwalk.ObjectWalk#setObjectFilter(ObjectFilter)}- * prior to starting traversal.- *- * @since 4.0- */-public abstract class ObjectFilter {- /** Default filter that always returns true. */- public static final ObjectFilter ALL = new AllFilter();-- private static final class AllFilter extends ObjectFilter {- @Override- public boolean include(ObjectWalk walker, AnyObjectId o) {- return true;- }- }-- /**- * Determine if the named object should be included in the walk.- *- * @param walker- * the active walker this filter is being invoked from within.- * @param objid- * the object currently being tested.- * @return {@code true} if the named object should be included in the walk.- * @throws org.eclipse.jgit.errors.MissingObjectException- * an object the filter needed to consult to determine its- * answer was missing- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * an object the filter needed to consult to determine its- * answer was of the wrong type- * @throws java.io.IOException- * an object the filter needed to consult to determine its- * answer could not be read.- */- public abstract boolean include(ObjectWalk walker, AnyObjectId objid)- throws MissingObjectException, IncorrectObjectTypeException,- IOException;-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.javadeleted file mode 100644index ebf48bd360..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java+++ /dev/null@@ -1,172 +0,0 @@-/*- * Copyright (C) 2007, Robin Rosenberg <[email protected]>- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;-import java.util.Collection;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Includes a commit if any subfilters include the same commit.- * <p>- * Classic shortcut behavior is used, so evaluation of the- * {@link org.eclipse.jgit.revwalk.filter.RevFilter#include(RevWalk, RevCommit)}- * method stops as soon as a true result is obtained. Applications can improve- * filtering performance by placing faster filters that are more likely to- * accept a result earlier in the list.- */-public abstract class OrRevFilter extends RevFilter {- /**- * Create a filter with two filters, one of which must match.- *- * @param a- * first filter to test.- * @param b- * second filter to test.- * @return a filter that must match at least one input filter.- */- public static RevFilter create(RevFilter a, RevFilter b) {- if (a == ALL || b == ALL)- return ALL;- return new Binary(a, b);- }-- /**- * Create a filter around many filters, one of which must match.- *- * @param list- * list of filters to match against. Must contain at least 2- * filters.- * @return a filter that must match at least one input filter.- */- public static RevFilter create(RevFilter[] list) {- if (list.length == 2)- return create(list[0], list[1]);- if (list.length < 2)- throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);- final RevFilter[] subfilters = new RevFilter[list.length];- System.arraycopy(list, 0, subfilters, 0, list.length);- return new List(subfilters);- }-- /**- * Create a filter around many filters, one of which must match.- *- * @param list- * list of filters to match against. Must contain at least 2- * filters.- * @return a filter that must match at least one input filter.- */- public static RevFilter create(Collection<RevFilter> list) {- if (list.size() < 2)- throw new IllegalArgumentException(JGitText.get().atLeastTwoFiltersNeeded);- final RevFilter[] subfilters = new RevFilter[list.size()];- list.toArray(subfilters);- if (subfilters.length == 2)- return create(subfilters[0], subfilters[1]);- return new List(subfilters);- }-- private static class Binary extends OrRevFilter {- private final RevFilter a;-- private final RevFilter b;-- private final boolean requiresCommitBody;-- Binary(RevFilter one, RevFilter two) {- a = one;- b = two;- requiresCommitBody = a.requiresCommitBody()- || b.requiresCommitBody();- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return a.include(walker, c) || b.include(walker, c);- }-- @Override- public boolean requiresCommitBody() {- return requiresCommitBody;- }-- @Override- public RevFilter clone() {- return new Binary(a.clone(), b.clone());- }-- @Override- public String toString() {- return "(" + a.toString() + " OR " + b.toString() + ")";- }- }-- private static class List extends OrRevFilter {- private final RevFilter[] subfilters;-- private final boolean requiresCommitBody;-- List(RevFilter[] list) {- subfilters = list;-- boolean rcb = false;- for (RevFilter filter : subfilters)- rcb |= filter.requiresCommitBody();- requiresCommitBody = rcb;- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- for (RevFilter f : subfilters) {- if (f.include(walker, c))- return true;- }- return false;- }-- @Override- public boolean requiresCommitBody() {- return requiresCommitBody;- }-- @Override- public RevFilter clone() {- final RevFilter[] s = new RevFilter[subfilters.length];- for (int i = 0; i < s.length; i++)- s[i] = subfilters[i].clone();- return new List(s);- }-- @Override- public String toString() {- final StringBuilder r = new StringBuilder();- r.append("("); //$NON-NLS-1$- for (int i = 0; i < subfilters.length; i++) {- if (i > 0)- r.append(" OR "); //$NON-NLS-1$- r.append(subfilters[i].toString());- }- r.append(")"); //$NON-NLS-1$- return r.toString();- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.javadeleted file mode 100644index bd70092faf..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java+++ /dev/null@@ -1,124 +0,0 @@-/*- * Copyright (C) 2009, Google Inc.- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;-import java.util.regex.Matcher;-import java.util.regex.Pattern;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Abstract filter that searches text using extended regular expressions.- */-public abstract class PatternMatchRevFilter extends RevFilter {- /**- * Encode a string pattern for faster matching on byte arrays.- * <p>- * Force the characters to our funny UTF-8 only convention that we use on- * raw buffers. This avoids needing to perform character set decodes on the- * individual commit buffers.- *- * @param patternText- * original pattern string supplied by the user or the- * application.- * @return same pattern, but re-encoded to match our funny raw UTF-8- * character sequence {@link org.eclipse.jgit.util.RawCharSequence}.- */- protected static final String forceToRaw(String patternText) {- final byte[] b = Constants.encode(patternText);- final StringBuilder needle = new StringBuilder(b.length);- for (byte element : b)- needle.append((char) (element & 0xff));- return needle.toString();- }-- private final String patternText;-- private final Matcher compiledPattern;-- /**- * Construct a new pattern matching filter.- *- * @param pattern- * text of the pattern. Callers may want to surround their- * pattern with ".*" on either end to allow matching in the- * middle of the string.- * @param innerString- * should .* be wrapped around the pattern of ^ and $ are- * missing? Most users will want this set.- * @param rawEncoding- * should {@link #forceToRaw(String)} be applied to the pattern- * before compiling it?- * @param flags- * flags from {@link java.util.regex.Pattern} to control how- * matching performs.- */- protected PatternMatchRevFilter(String pattern, final boolean innerString,- final boolean rawEncoding, final int flags) {- if (pattern.length() == 0)- throw new IllegalArgumentException(JGitText.get().cannotMatchOnEmptyString);- patternText = pattern;-- if (innerString) {- if (!pattern.startsWith("^") && !pattern.startsWith(".*")) //$NON-NLS-1$ //$NON-NLS-2$- pattern = ".*" + pattern; //$NON-NLS-1$- if (!pattern.endsWith("$") && !pattern.endsWith(".*")) //$NON-NLS-1$ //$NON-NLS-2$- pattern = pattern + ".*"; //$NON-NLS-1$- }- final String p = rawEncoding ? forceToRaw(pattern) : pattern;- compiledPattern = Pattern.compile(p, flags).matcher(""); //$NON-NLS-1$- }-- /**- * Get the pattern this filter uses.- *- * @return the pattern this filter is applying to candidate strings.- */- public String pattern() {- return patternText;- }-- /** {@inheritDoc} */- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return compiledPattern.reset(text(cmit)).matches();- }-- /** {@inheritDoc} */- @Override- public boolean requiresCommitBody() {- return true;- }-- /**- * Obtain the raw text to match against.- *- * @param cmit- * current commit being evaluated.- * @return sequence for the commit's content that we need to match on.- */- protected abstract CharSequence text(RevCommit cmit);-- /** {@inheritDoc} */- @Override- public String toString() {- return super.toString() + "(\"" + patternText + "\")";- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.javadeleted file mode 100644index 8430646305..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java+++ /dev/null@@ -1,276 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Selects interesting revisions during walking.- * <p>- * This is an abstract interface. Applications may implement a subclass, or use- * one of the predefined implementations already available within this package.- * Filters may be chained together using <code>AndRevFilter</code> and- * <code>OrRevFilter</code> to create complex boolean expressions.- * <p>- * Applications should install the filter on a RevWalk by- * {@link org.eclipse.jgit.revwalk.RevWalk#setRevFilter(RevFilter)} prior to- * starting traversal.- * <p>- * Unless specifically noted otherwise a RevFilter implementation is not thread- * safe and may not be shared by different RevWalk instances at the same time.- * This restriction allows RevFilter implementations to cache state within their- * instances during {@link #include(RevWalk, RevCommit)} if it is beneficial to- * their implementation. Deep clones created by {@link #clone()} may be used to- * construct a thread-safe copy of an existing filter.- *- * <p>- * <b>Message filters:</b>- * <ul>- * <li>Author name/email:- * {@link org.eclipse.jgit.revwalk.filter.AuthorRevFilter}</li>- * <li>Committer name/email:- * {@link org.eclipse.jgit.revwalk.filter.CommitterRevFilter}</li>- * <li>Message body:- * {@link org.eclipse.jgit.revwalk.filter.MessageRevFilter}</li>- * </ul>- *- * <p>- * <b>Merge filters:</b>- * <ul>- * <li>Skip all merges: {@link #NO_MERGES}.</li>- * <li>Skip all non-merges: {@link #ONLY_MERGES}</li>- * </ul>- *- * <p>- * <b>Boolean modifiers:</b>- * <ul>- * <li>AND: {@link org.eclipse.jgit.revwalk.filter.AndRevFilter}</li>- * <li>OR: {@link org.eclipse.jgit.revwalk.filter.OrRevFilter}</li>- * <li>NOT: {@link org.eclipse.jgit.revwalk.filter.NotRevFilter}</li>- * </ul>- */-public abstract class RevFilter {- /** Default filter that always returns true (thread safe). */- public static final RevFilter ALL = new AllFilter();-- private static final class AllFilter extends RevFilter {- @Override- public boolean include(RevWalk walker, RevCommit c) {- return true;- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public String toString() {- return "ALL"; //$NON-NLS-1$- }- }-- /** Default filter that always returns false (thread safe). */- public static final RevFilter NONE = new NoneFilter();-- private static final class NoneFilter extends RevFilter {- @Override- public boolean include(RevWalk walker, RevCommit c) {- return false;- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public String toString() {- return "NONE"; //$NON-NLS-1$- }- }-- /**- * Filter including only merge commits, excluding all commits with less than- * two parents (thread safe).- *- * @since 4.4- */- public static final RevFilter ONLY_MERGES = new OnlyMergesFilter();-- private static final class OnlyMergesFilter extends RevFilter {-- @Override- public boolean include(RevWalk walker, RevCommit c) {- return c.getParentCount() >= 2;- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public String toString() {- return "ONLY_MERGES"; //$NON-NLS-1$- }- }-- /** Excludes commits with more than one parent (thread safe). */- public static final RevFilter NO_MERGES = new NoMergesFilter();-- private static final class NoMergesFilter extends RevFilter {- @Override- public boolean include(RevWalk walker, RevCommit c) {- return c.getParentCount() < 2;- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public String toString() {- return "NO_MERGES"; //$NON-NLS-1$- }- }-- /**- * Selects only merge bases of the starting points (thread safe).- * <p>- * This is a special case filter that cannot be combined with any other- * filter. Its include method always throws an exception as context- * information beyond the arguments is necessary to determine if the- * supplied commit is a merge base.- */- public static final RevFilter MERGE_BASE = new MergeBaseFilter();-- private static final class MergeBaseFilter extends RevFilter {- @Override- public boolean include(RevWalk walker, RevCommit c) {- throw new UnsupportedOperationException(JGitText.get().cannotBeCombined);- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public boolean requiresCommitBody() {- return false;- }-- @Override- public String toString() {- return "MERGE_BASE"; //$NON-NLS-1$- }- }-- /**- * Create a new filter that does the opposite of this filter.- *- * @return a new filter that includes commits this filter rejects.- */- public RevFilter negate() {- return NotRevFilter.create(this);- }-- /**- * Whether the filter needs the commit body to be parsed.- *- * @return true if the filter needs the commit body to be parsed.- */- public boolean requiresCommitBody() {- // Assume true to be backward compatible with prior behavior.- return true;- }-- /**- * Determine if the supplied commit should be included in results.- *- * @param walker- * the active walker this filter is being invoked from within.- * @param cmit- * the commit currently being tested. The commit has been parsed- * and its body is available for inspection only if the filter- * returns true from {@link #requiresCommitBody()}.- * @return true to include this commit in the results; false to have this- * commit be omitted entirely from the results.- * @throws org.eclipse.jgit.errors.StopWalkException- * the filter knows for certain that no additional commits can- * ever match, and the current commit doesn't match either. The- * walk is halted and no more results are provided.- * @throws org.eclipse.jgit.errors.MissingObjectException- * an object the filter needs to consult to determine its answer- * does not exist in the Git repository the walker is operating- * on. Filtering this commit is impossible without the object.- * @throws org.eclipse.jgit.errors.IncorrectObjectTypeException- * an object the filter needed to consult was not of the- * expected object type. This usually indicates a corrupt- * repository, as an object link is referencing the wrong type.- * @throws java.io.IOException- * a loose object or pack file could not be read to obtain data- * necessary for the filter to make its decision.- */- public abstract boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException;-- /**- * {@inheritDoc}- * <p>- * Clone this revision filter, including its parameters.- * <p>- * This is a deep clone. If this filter embeds objects or other filters it- * must also clone those, to ensure the instances do not share mutable data.- */- @Override- public abstract RevFilter clone();-- @Override- public String toString() {- String n = getClass().getName();- int lastDot = n.lastIndexOf('.');- if (lastDot >= 0) {- n = n.substring(lastDot + 1);- }- return n.replace('$', '.');- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.javadeleted file mode 100644index f9ee632b50..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java+++ /dev/null@@ -1,139 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;-import java.util.Arrays;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevFlag;-import org.eclipse.jgit.revwalk.RevFlagSet;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Matches only commits with some/all RevFlags already set.- */-public abstract class RevFlagFilter extends RevFilter {- /**- * Create a new filter that tests for a single flag.- *- * @param a- * the flag to test.- * @return filter that selects only commits with flag <code>a</code>.- */- public static RevFilter has(RevFlag a) {- final RevFlagSet s = new RevFlagSet();- s.add(a);- return new HasAll(s);- }-- /**- * Create a new filter that tests all flags in a set.- *- * @param a- * set of flags to test.- * @return filter that selects only commits with all flags in <code>a</code>.- */- public static RevFilter hasAll(RevFlag... a) {- final RevFlagSet set = new RevFlagSet();- set.addAll(Arrays.asList(a));- return new HasAll(set);- }-- /**- * Create a new filter that tests all flags in a set.- *- * @param a- * set of flags to test.- * @return filter that selects only commits with all flags in <code>a</code>.- */- public static RevFilter hasAll(RevFlagSet a) {- return new HasAll(new RevFlagSet(a));- }-- /**- * Create a new filter that tests for any flag in a set.- *- * @param a- * set of flags to test.- * @return filter that selects only commits with any flag in <code>a</code>.- */- public static RevFilter hasAny(RevFlag... a) {- final RevFlagSet set = new RevFlagSet();- set.addAll(Arrays.asList(a));- return new HasAny(set);- }-- /**- * Create a new filter that tests for any flag in a set.- *- * @param a- * set of flags to test.- * @return filter that selects only commits with any flag in <code>a</code>.- */- public static RevFilter hasAny(RevFlagSet a) {- return new HasAny(new RevFlagSet(a));- }-- final RevFlagSet flags;-- RevFlagFilter(RevFlagSet m) {- flags = m;- }-- @Override- public RevFilter clone() {- return this;- }-- @Override- public String toString() {- return super.toString() + flags;- }-- private static class HasAll extends RevFlagFilter {- HasAll(RevFlagSet m) {- super(m);- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return c.hasAll(flags);- }-- @Override- public boolean requiresCommitBody() {- return false;- }- }-- private static class HasAny extends RevFlagFilter {- HasAny(RevFlagSet m) {- super(m);- }-- @Override- public boolean include(RevWalk walker, RevCommit c)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return c.hasAny(flags);- }-- @Override- public boolean requiresCommitBody() {- return false;- }- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.javadeleted file mode 100644index bf93b7ba3e..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java+++ /dev/null@@ -1,61 +0,0 @@-/*- * Copyright (C) 2011, Tomasz Zarna <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */-package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.StopWalkException;-import org.eclipse.jgit.internal.JGitText;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--/**- * Filter that includes commits after a configured number are skipped.- */-public class SkipRevFilter extends RevFilter {-- private final int skip;-- private int count;-- /**- * Create a new skip filter.- *- * @param skip- * the number of commits to skip- * @return a new filter- */- public static RevFilter create(int skip) {- if (skip < 0)- throw new IllegalArgumentException(- JGitText.get().skipMustBeNonNegative);- return new SkipRevFilter(skip);- }-- private SkipRevFilter(int skip) {- this.skip = skip;- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws StopWalkException, MissingObjectException,- IncorrectObjectTypeException, IOException {- if (skip > count++)- return false;- return true;- }-- @Override- public RevFilter clone() {- return new SkipRevFilter(skip);- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.javadeleted file mode 100644index 296f3f50b4..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java+++ /dev/null@@ -1,100 +0,0 @@-/*- * Copyright (C) 2008, Shawn O. Pearce <[email protected]> and others- *- * This program and the accompanying materials are made available under the- * terms of the Eclipse Distribution License v. 1.0 which is available at- * https://www.eclipse.org/org/documents/edl-v10.php.- *- * SPDX-License-Identifier: BSD-3-Clause- */--package org.eclipse.jgit.revwalk.filter;--import java.io.IOException;--import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.util.RawCharSequence;-import org.eclipse.jgit.util.RawSubStringPattern;--/**- * Abstract filter that searches text using only substring search.- */-public abstract class SubStringRevFilter extends RevFilter {- /**- * Can this string be safely handled by a substring filter?- *- * @param pattern- * the pattern text proposed by the user.- * @return true if a substring filter can perform this pattern match; false- * if {@link org.eclipse.jgit.revwalk.filter.PatternMatchRevFilter}- * must be used instead.- */- public static boolean safe(String pattern) {- for (int i = 0; i < pattern.length(); i++) {- final char c = pattern.charAt(i);- switch (c) {- case '.':- case '?':- case '*':- case '+':- case '{':- case '}':- case '(':- case ')':- case '[':- case ']':- case '\\':- return false;- }- }- return true;- }-- private final RawSubStringPattern pattern;-- /**- * Construct a new matching filter.- *- * @param patternText- * text to locate. This should be a safe string as described by- * the {@link #safe(String)} as regular expression meta- * characters are treated as literals.- */- protected SubStringRevFilter(String patternText) {- pattern = new RawSubStringPattern(patternText);- }-- @Override- public boolean include(RevWalk walker, RevCommit cmit)- throws MissingObjectException, IncorrectObjectTypeException,- IOException {- return pattern.match(text(cmit)) >= 0;- }-- @Override- public boolean requiresCommitBody() {- return true;- }-- /**- * Obtain the raw text to match against.- *- * @param cmit- * current commit being evaluated.- * @return sequence for the commit's content that we need to match on.- */- protected abstract RawCharSequence text(RevCommit cmit);-- @Override- public RevFilter clone() {- return this; // Typically we are actually thread-safe.- }-- @Override- public String toString() {- return super.toString() + "(\"" + pattern.pattern() + "\")";- }-}diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.javadeleted file mode 100644index 135850cba5..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java+++ /dev/null@@ -1,4 +0,0 @@-/**- * Filters for use in revision walking.- */-package org.eclipse.jgit.revwalk.filter;diff --git a/server-core/src/main/java/org/eclipse/jgit/revwalk/package-info.java b/server-core/src/main/java/org/eclipse/jgit/revwalk/package-info.javadeleted file mode 100644index 05ab51e48f..0000000000--- a/server-core/src/main/java/org/eclipse/jgit/revwalk/package-info.java+++ /dev/null@@ -1,4 +0,0 @@-/**- * Walking revision graphs (commit history).- */-package org.eclipse.jgit.revwalk;diff --git a/server-core/src/main/java/org/glassfish/jersey/message/internal/MediaTypeProvider.java b/server-core/src/main/java/org/glassfish/jersey/message/internal/MediaTypeProvider.javaindex 3038508b78..bee24f3691 100644--- a/server-core/src/main/java/org/glassfish/jersey/message/internal/MediaTypeProvider.java+++ b/server-core/src/main/java/org/glassfish/jersey/message/internal/MediaTypeProvider.java@@ -1,5 +1,5 @@/*- * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.+ * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.** This program and the accompanying materials are made available under the* terms of the Eclipse Public License v. 2.0, which is available at@@ -19,9 +19,9 @@ package org.glassfish.jersey.message.internal;import java.text.ParseException;import java.util.Map;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.core.MediaType;-import javax.inject.Singleton;+import jakarta.inject.Singleton;import org.glassfish.jersey.internal.LocalizationMessages;import org.glassfish.jersey.spi.HeaderDelegateProvider;@@ -80,7 +80,7 @@ public class MediaTypeProvider implements HeaderDelegateProvider<MediaType> {}/**- * Create a new {@link javax.ws.rs.core.MediaType} instance from a header reader.+ * Create a new {@link jakarta.ws.rs.core.MediaType} instance from a header reader.** @param reader header reader.* @return new {@code MediaType} instance.diff --git a/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java b/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.javaindex a1fdcefced..ba30c8e5dd 100644--- a/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java+++ b/server-core/src/main/java/org/glassfish/jersey/server/spi/internal/ParameterValueHelper.java@@ -1,5 +1,5 @@/*- * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.+ * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.** This program and the accompanying materials are made available under the* terms of the Eclipse Public License v. 2.0, which is available at@@ -24,9 +24,9 @@ import java.util.List;import java.util.function.Function;import java.util.stream.Collectors;-import javax.ws.rs.NotSupportedException;-import javax.ws.rs.ProcessingException;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.NotSupportedException;+import jakarta.ws.rs.ProcessingException;+import jakarta.ws.rs.WebApplicationException;import io.onedev.server.util.jackson.hibernate.EntityDeserializer;import org.glassfish.jersey.message.internal.MessageBodyProviderNotFoundException;diff --git a/server-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java b/server-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.javaindex fad9c5a56c..a93598775f 100644--- a/server-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java+++ b/server-core/src/main/java/org/hibernate/cache/spi/support/SimpleTimestamper.java@@ -1,8 +1,6 @@/*- * Hibernate, Relational Persistence for Idiomatic Java- *- * License: GNU Lesser General Public License (LGPL), version 2.1 or later- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.cache.spi.support;@@ -12,7 +10,7 @@ import java.util.concurrent.atomic.AtomicLong;/*** Generates increasing identifiers (in a single VM only). Not valid across multiple VMs. Identifiers are not* necessarily strictly increasing, but usually are.- * <p/>+ * <p>* Core while loop implemented by Alex Snaps - EHCache project - under ASL 2.0** @author Hibernate team@@ -25,22 +23,11 @@ public final class SimpleTimestamper {public static final short ONE_MS = 1 << BIN_DIGITS;public static long next() {- // Fix issue #711 - After update to v7.x CPU is loaded on 100%- /*- while ( true ) {- long base = System.currentTimeMillis() << BIN_DIGITS;- long maxValue = base + ONE_MS - 1;-- for ( long current = VALUE.get(), update = Math.max( base, current + 1 ); update < maxValue;- current = VALUE.get(), update = Math.max( base, current + 1 ) ) {- if ( VALUE.compareAndSet( current, update ) ) {- return update;- }- }- }- */- return VALUE.incrementAndGet();- }+ // Preserve wall-clock units and ordering within this JVM without waiting+ // for the wall clock to catch up if it moves backwards (issue #711).+ long now = System.currentTimeMillis() << BIN_DIGITS;+ return VALUE.updateAndGet(previous -> Math.max(now, previous + 1));+ }public static int timeOut() {return (int) TimeUnit.SECONDS.toMillis( 60 ) * ONE_MS;diff --git a/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.javaindex 6ac2887776..6a6311492b 100644--- a/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java+++ b/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java@@ -1,32 +1,27 @@/*- * Hibernate, Relational Persistence for Idiomatic Java- *- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.proxy.pojo;-import java.io.Serializable;+import io.onedev.server.model.AbstractEntity;+import java.lang.reflect.Method;+import org.hibernate.LazyInitializationException;import org.hibernate.engine.spi.SharedSessionContractImplementor;-import org.hibernate.internal.util.MarkerObject;import org.hibernate.proxy.AbstractLazyInitializer;import org.hibernate.type.CompositeType;-import io.onedev.server.model.AbstractEntity;/**- * Lazy initializer for POJOs+ * Lazy initializer for plain Java objects.** @author Gavin King*/-@SuppressWarnings("rawtypes")public abstract class BasicLazyInitializer extends AbstractLazyInitializer {- protected static final Object INVOKE_IMPLEMENTATION = new MarkerObject( "INVOKE_IMPLEMENTATION" );-- protected final Class persistentClass;+ protected final Class<?> persistentClass;protected final Method getIdentifierMethod;protected final Method setIdentifierMethod;protected final boolean overridesEquals;@@ -36,8 +31,8 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {protected BasicLazyInitializer(String entityName,- Class persistentClass,- Serializable id,+ Class<?> persistentClass,+ Object id,Method getIdentifierMethod,Method setIdentifierMethod,CompositeType componentIdType,@@ -53,33 +48,36 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {protected abstract Object serializableProxy();- protected final Object invoke(Method method, Object[] args, Object proxy) throws Throwable {- String methodName = method.getName();- int params = args.length;-- if ( params == 0 ) {- if ( "writeReplace".equals( methodName ) ) {- return getReplacement();- }- else if ("hashCode".equals( methodName ) ) {- return AbstractEntity.hashCode((AbstractEntity) proxy);- }- else if ( isUninitialized() && method.equals( getIdentifierMethod ) ) {- return getIdentifier();- }- else if ( "getHibernateLazyInitializer".equals( methodName ) ) {- return this;- }- }- else if ( params == 1 ) {- if ("equals".equals( methodName ) ) {- return AbstractEntity.equals(proxy, args[0]);- }- else if ( method.equals( setIdentifierMethod ) ) {- initialize();- setIdentifier( (Serializable) args[0] );- return INVOKE_IMPLEMENTATION;- }+ protected abstract Object call(Object proxy, Method method, Object[] args) throws Throwable;++ protected final Object invoke(Method method, Object[] args, Object proxy)+ throws Throwable {+ final String methodName = method.getName();+ switch ( args.length ) {+ case 0:+ if ( "writeReplace".equals( methodName ) ) {+ return getReplacement();+ }+ else if ( "hashCode".equals( methodName ) ) {+ return AbstractEntity.hashCode((AbstractEntity) proxy);+ }+ else if ( isUninitialized() && method.equals( getIdentifierMethod ) ) {+ return getIdentifier();+ }+ else if ( "getHibernateLazyInitializer".equals( methodName ) ) {+ return this;+ }+ break;+ case 1:+ if ( "equals".equals( methodName ) ) {+ return AbstractEntity.equals(proxy, args[0]);+ }+ else if ( method.equals( setIdentifierMethod ) ) {+ initialize();+ setIdentifier( args[0] );+ return call( proxy, method, args );+ }+ break;}//if it is a property of an embedded component, invoke on the "identifier"@@ -88,15 +86,13 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {}// otherwise:- return INVOKE_IMPLEMENTATION;-+ return call( proxy, method, args );}private Object getReplacement() {- /*- * If the target has already been loaded somewhere, just not set on the proxy,- * then use it to initialize the proxy so that we will serialize that instead of the proxy.- */+ // If the target has already been loaded somewhere, just not+ // set on the proxy, then use it to initialize the proxy so+ // that we will serialize that instead of the proxy.initializeWithoutLoadIfPossible();if ( isUninitialized() ) {@@ -109,11 +105,27 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {else {return getTarget();}-}- public final Class getPersistentClass() {+ @Override+ public final Class<?> getPersistentClass() {return persistentClass;}+ @Override+ public Class<?> getImplementationClass() {+ if ( !isUninitialized() ) {+ return getImplementation().getClass();+ }+ else if ( getSession() == null ) {+ throw new LazyInitializationException( "could not retrieve real entity class ["+ + getEntityName() + "#" + getInternalIdentifier() + "] - no Session" );+ }+ else {+ return getEntityDescriptor().hasSubclasses()+ ? getImplementation().getClass()+ : persistentClass;+ }+ }+}diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/MethodValidationConfiguration.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/MethodValidationConfiguration.javaindex b2d5351fc2..dc1d0b6d58 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/MethodValidationConfiguration.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/MethodValidationConfiguration.java@@ -1,8 +1,6 @@/*- * Hibernate Validator, declare and validate application constraints- *- * License: Apache License, Version 2.0- * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.validator.internal.engine;@@ -21,7 +19,7 @@ import org.hibernate.validator.internal.util.CollectionHelper;import org.hibernate.validator.internal.util.stereotypes.Immutable;/**- * These properties modify the behavior of the {@code Validator} with respect to the Jakarta Bean Validation+ * These properties modify the behavior of the {@code Validator} with respect to the Jakarta Validation* specification section 5.6.5. In particular:* <pre>* "Out of the box, a conforming Bean Validation provider must throw a@@ -168,7 +166,7 @@ public class MethodValidationConfiguration {* Define whether overriding methods that override constraints should throw a {@code ConstraintDefinitionException}.* The default value is {@code false}, i.e. do not allow.*- * See Section 5.6.5 of the Jakarta Bean Validation Specification, specifically+ * See Section 5.6.5 of the Jakarta Validation Specification, specifically* <pre>* "In sub types (be it sub classes/interfaces or interface implementations), no parameter constraints may* be declared on overridden or implemented methods, nor may parameters be marked for cascaded validation.@@ -206,7 +204,7 @@ public class MethodValidationConfiguration {* Define whether parallel methods that define constraints should throw a {@code ConstraintDefinitionException}. The* default value is {@code false}, i.e. do not allow.*- * See Section 5.6.5 of the Jakarta Bean Validation Specification, specifically+ * See Section 5.6.5 of the Jakarta Validation Specification, specifically* "If a sub type overrides/implements a method originally defined in several parallel types of the hierarchy* (e.g. two interfaces not extending each other, or a class and an interface not implemented by said class),* no parameter constraints may be declared for that method at all nor parameters be marked for cascaded validation.diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.javaindex 56af0ed8c5..22ac459a20 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java@@ -1,8 +1,6 @@/*- * Hibernate Validator, declare and validate application constraints- *- * License: Apache License, Version 2.0- * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.validator.internal.engine;@@ -10,6 +8,8 @@ import static org.hibernate.validator.internal.util.logging.Messages.MESSAGES;import java.lang.annotation.Annotation;import java.lang.invoke.MethodHandles;+import java.lang.reflect.AnnotatedParameterizedType;+import java.lang.reflect.AnnotatedType;import java.lang.reflect.Constructor;import java.lang.reflect.Executable;import java.lang.reflect.InvocationTargetException;@@ -27,16 +27,16 @@ import java.util.Optional;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorFactory;-import javax.validation.ConstraintViolation;-import javax.validation.ElementKind;-import javax.validation.Path;-import javax.validation.TraversableResolver;-import javax.validation.Validator;-import javax.validation.executable.ExecutableValidator;-import javax.validation.groups.Default;-import javax.validation.metadata.BeanDescriptor;-import javax.validation.valueextraction.ValueExtractor;+import jakarta.validation.ConstraintValidatorFactory;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.ElementKind;+import jakarta.validation.Path;+import jakarta.validation.TraversableResolver;+import jakarta.validation.Validator;+import jakarta.validation.executable.ExecutableValidator;+import jakarta.validation.groups.Default;+import jakarta.validation.metadata.BeanDescriptor;+import jakarta.validation.valueextraction.ValueExtractor;import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;@@ -45,8 +45,8 @@ import org.hibernate.validator.internal.engine.groups.GroupWithInheritance;import org.hibernate.validator.internal.engine.groups.Sequence;import org.hibernate.validator.internal.engine.groups.ValidationOrder;import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;-import org.hibernate.validator.internal.engine.path.NodeImpl;-import org.hibernate.validator.internal.engine.path.PathImpl;+import org.hibernate.validator.internal.engine.path.MutableNode;+import org.hibernate.validator.internal.engine.path.MutablePath;import org.hibernate.validator.internal.engine.resolver.TraversableResolvers;import org.hibernate.validator.internal.engine.validationcontext.BaseBeanValidationContext;import org.hibernate.validator.internal.engine.validationcontext.ExecutableValidationContext;@@ -181,11 +181,11 @@ public class ValidatorImpl implements Validator, ExecutableValidator {BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidate( rootBeanClass, rootBeanMetaData, object );ValidationOrder validationOrder = determineGroupValidationOrder( groups );- BeanValueContext<?, Object> valueContext = ValueContexts.getLocalExecutionContextForBean(+ BeanValueContext<?, Object> valueContext = ValueContexts.getLocalExecutionContextForRootBean(validatorScopedContext.getParameterNameProvider(),object,validationContext.getRootBeanMetaData(),- PathImpl.createRootPath()+ MutablePath.createRootPath());return validateInContext( validationContext, valueContext, validationOrder );@@ -205,7 +205,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return Collections.emptySet();}- PathImpl propertyPath = PathImpl.createPathFromString( propertyName );+ MutablePath propertyPath = MutablePath.createPathFromString( propertyName );BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidateProperty( rootBeanClass, rootBeanMetaData, object,propertyPath );@@ -232,7 +232,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return Collections.emptySet();}- PathImpl propertyPath = PathImpl.createPathFromString( propertyName );+ MutablePath propertyPath = MutablePath.createPathFromString( propertyName );BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidateValue( beanType, rootBeanMetaData, propertyPath );ValidationOrder validationOrder = determineGroupValidationOrder( groups );@@ -498,20 +498,37 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// evaluating the constraints of a bean per class in hierarchy, this is necessary to detect potential default group re-definitionsfor ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );+boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.isDefaultGroupSequenceRedefined();// if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.if ( defaultGroupSequenceIsRedefined ) {Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );- Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getMetaConstraints();++ Set<MetaConstraint<?>> classMetaConstraints = hostingBeanMetaData.getClassMetaConstraints();+ Set<MetaConstraint<?>> propertyMetaConstraints = hostingBeanMetaData.getPropertyMetaConstraints();while ( defaultGroupSequence.hasNext() ) {for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {boolean validationSuccessful = true;for ( Group defaultSequenceMember : groupOfGroups ) {- validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,- metaConstraints, defaultSequenceMember ) && validationSuccessful;+ if ( validationContext.isFailFastOnPropertyViolationModeEnabled() ) {+ boolean propertyValidationResult = propertyMetaConstraints.isEmpty()+ || validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, propertyMetaConstraints,+ defaultSequenceMember );+ validationSuccessful = propertyValidationResult && validationSuccessful;+ if ( propertyValidationResult ) {+ validationSuccessful = ( classMetaConstraints.isEmpty()+ || validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, classMetaConstraints,+ defaultSequenceMember ) )+ && validationSuccessful;+ }+ }+ else {+ validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,+ hostingBeanMetaData.getAllMetaConstraints(), defaultSequenceMember ) && validationSuccessful;+ }}validationContext.markCurrentBeanAsProcessed( valueContext );@@ -524,9 +541,19 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}// fast path in case the default group sequence hasn't been redefinedelse {- Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();- validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,- Group.DEFAULT_GROUP );+ if ( validationContext.isFailFastOnPropertyViolationModeEnabled() ) {+ boolean propertyValidationResult = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,+ hostingBeanMetaData.getDirectPropertyMetaConstraints(), Group.DEFAULT_GROUP );+ if ( !validationContext.isFailFastOnPropertyViolationModeEnabled() || propertyValidationResult ) {+ validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, hostingBeanMetaData.getDirectClassMetaConstraints(),+ Group.DEFAULT_GROUP );+ }++ }+ else {+ validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, hostingBeanMetaData.getAllDirectMetaConstraints(),+ Group.DEFAULT_GROUP );+ }validationContext.markCurrentBeanAsProcessed( valueContext );}@@ -537,12 +564,15 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}}- private <U> boolean validateConstraintsForSingleDefaultGroupElement(BaseBeanValidationContext<?> validationContext, ValueContext<U, Object> valueContext, final Map<Class<?>, Class<?>> validatedInterfaces,- Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints, Group defaultSequenceMember) {+ private <U> boolean validateConstraintsForSingleDefaultGroupElement(BaseBeanValidationContext<?> validationContext, ValueContext<U, Object> valueContext,+ final Map<Class<?>, Class<?>> validatedInterfaces, Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints, Group defaultSequenceMember) {boolean validationSuccessful = true;valueContext.setCurrentGroup( defaultSequenceMember.getDefiningClass() );+ BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();+ valueContext.appendEmptyNode();+for ( MetaConstraint<?> metaConstraint : metaConstraints ) {// HV-466, an interface implemented more than one time in the hierarchy has to be validated only one// time. An interface can define more than one constraint, we have to check the class we are validating.@@ -562,47 +592,51 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validationSuccessful = validationSuccessful && tmp;}++ // reset the value context to the state before this call+ valueContext.resetValueState( originalValueState );+return validationSuccessful;}private void validateConstraintsForNonDefaultGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<?, Object> valueContext) {- validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), valueContext.getCurrentBeanMetaData().getMetaConstraints() );+ if ( validationContext.isFailFastOnPropertyViolationModeEnabled() ) {+ if ( validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), valueContext.getCurrentBeanMetaData().getPropertyMetaConstraints() ) ) {+ validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), valueContext.getCurrentBeanMetaData().getClassMetaConstraints() );+ }+ }+ else {+ validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), valueContext.getCurrentBeanMetaData().getAllMetaConstraints() );+ }+validationContext.markCurrentBeanAsProcessed( valueContext );}- private void validateMetaConstraints(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent,+ private boolean validateMetaConstraints(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent,Iterable<MetaConstraint<?>> constraints) {+ boolean validationSuccessful = true;+ BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();+ valueContext.appendEmptyNode();List<MetaConstraint<?>> sortedConstraints = new ArrayList<>();for ( MetaConstraint<?> metaConstraint : constraints )sortedConstraints.add(metaConstraint);- Collections.sort(sortedConstraints, new Comparator<MetaConstraint<?>> () {-- @Override- public int compare(MetaConstraint<?> o1, MetaConstraint<?> o2) {- if (o1.getDescriptor().getAnnotationType() == ClassValidating.class)- return 1;- else- return -1;- }-- });+ sortedConstraints.sort(Comparator.comparing(it -> it.getDescriptor().getAnnotationType() == ClassValidating.class));for ( MetaConstraint<?> metaConstraint : sortedConstraints ) {- if (metaConstraint.getDescriptor().getAnnotationType() == ClassValidating.class- && !validationContext.getFailingConstraints().isEmpty()) {- continue;- }-- validateMetaConstraint( validationContext, valueContext, parent, metaConstraint );+ validationSuccessful = validateMetaConstraint( validationContext, valueContext, parent, metaConstraint ) && validationSuccessful;if ( shouldFailFast( validationContext ) ) {break;}}++ // reset the value context to the state before this call+ valueContext.resetValueState( originalValueState );++ return validationSuccessful;}private boolean validateMetaConstraint(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent, MetaConstraint<?> metaConstraint) {- BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();- valueContext.appendNode( metaConstraint.getLocation() );+ valueContext.updateNode( metaConstraint.getLocation() );boolean success = true;if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {@@ -613,12 +647,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {success = metaConstraint.validateConstraint( validationContext, valueContext );- validationContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), metaConstraint );+ validationContext.markConstraintProcessed( valueContext, metaConstraint );}- // reset the value context to the state before this call- valueContext.resetValueState( originalValueState );-return success;}@@ -673,8 +704,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Class<?> originalGroup = valueContext.getCurrentGroup();Class<?> currentGroup = cascadingMetaData.convertGroup( originalGroup );- if ( validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext.getPropertyPath() ) ||- shouldFailFast( validationContext ) ) {+ if ( validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext )+ || shouldFailFast( validationContext ) ) {return;}@@ -716,11 +747,31 @@ public class ValidatorImpl implements Validator, ExecutableValidator {private final BaseBeanValidationContext<?> validationContext;private final ValueContext<?, ?> valueContext;private final ContainerCascadingMetaData cascadingMetaData;+ private final BeanValueContext<?, Object> cascadedValueContext;public CascadingValueReceiver(BaseBeanValidationContext<?> validationContext, ValueContext<?, ?> valueContext, ContainerCascadingMetaData cascadingMetaData) {this.validationContext = validationContext;this.valueContext = valueContext;this.cascadingMetaData = cascadingMetaData;+ this.cascadedValueContext = ValueContexts.getLocalExecutionContextForBean(+ valueContext,+ validatorScopedContext.getParameterNameProvider(),+ null,+ null,+ valueContext.getPropertyPath()+ );+ }++ private BeanValueContext<?, Object> resetCascadedValueContext(Object value) {+ Contracts.assertNotNull( value, "value cannot be null" );++ BeanMetaData<?> currentBeanMetaData = cascadedValueContext.getCurrentBeanMetaData();+ if ( currentBeanMetaData == null || currentBeanMetaData.getBeanClass() != value.getClass() ) {+ currentBeanMetaData = beanMetaDataManager.getBeanMetaData( value.getClass() );+ }+ cascadedValueContext.reset( value, valueContext.getPropertyPath(), currentBeanMetaData );+ cascadedValueContext.setCurrentValidatedValue( value );+ return cascadedValueContext;}@Override@@ -752,9 +803,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Class<?> originalGroup = valueContext.getCurrentGroup();Class<?> currentGroup = cascadingMetaData.convertGroup( originalGroup );- if ( value == null ||- validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext.getPropertyPath() ) ||- shouldFailFast( validationContext ) ) {+ if ( value == null+ || validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext )+ || shouldFailFast( validationContext ) ) {return;}@@ -763,7 +814,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// already and need only to pass the current elementValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );- BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );+ BeanValueContext<?, Object> cascadedValueContext = resetCascadedValueContext( value );if ( cascadingMetaData.getDeclaredContainerClass() != null ) {cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );@@ -776,16 +827,13 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// Cascade validation to container elements if we are dealing with a container elementif ( cascadingMetaData.hasContainerElementsMarkedForCascading() ) {- ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );if ( cascadingMetaData.getTypeParameter() != null ) {cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );}- if ( nodeName != null ) {- cascadedTypeArgumentValueContext.appendTypeParameterNode( nodeName );- }+ cascadedValueContext.appendTypeParameterNode( nodeName );- validateCascadedContainerElementsInContext( value, validationContext, cascadedTypeArgumentValueContext, cascadingMetaData, validationOrder );+ validateCascadedContainerElementsInContext( value, validationContext, cascadedValueContext, cascadingMetaData, validationOrder );}}}@@ -830,6 +878,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Contracts.assertNotNull( value, "value cannot be null" );BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( value.getClass() );newValueContext = ValueContexts.getLocalExecutionContextForBean(+ valueContext,validatorScopedContext.getParameterNameProvider(),value,beanMetaData,@@ -840,7 +889,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return newValueContext;}- private <T> Set<ConstraintViolation<T>> validateValueInContext(BaseBeanValidationContext<T> validationContext, Object value, PathImpl propertyPath,+ private <T> Set<ConstraintViolation<T>> validateValueInContext(BaseBeanValidationContext<T> validationContext, Object value, MutablePath propertyPath,ValidationOrder validationOrder) {BeanValueContext<?, Object> valueContext = getValueContextForValueValidation( validationContext.getRootBeanClass(), propertyPath );valueContext.setCurrentValidatedValue( value );@@ -929,7 +978,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validatorScopedContext.getParameterNameProvider(),parameterValues,executableMetaData.getValidatableParametersMetaData(),- PathImpl.createPathForExecutable( executableMetaData )+ MutablePath.createPathForExecutable( executableMetaData ));groupIterator = validationOrder.getGroupIterator();@@ -1002,7 +1051,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}}- private <T> void validateParametersForSingleGroup(ExecutableValidationContext<T> validationContext, Object[] parameterValues, ExecutableMetaData executableMetaData, Class<?> currentValidatedGroup) {+ private <T> void validateParametersForSingleGroup(ExecutableValidationContext<T> validationContext, Object[] parameterValues, ExecutableMetaData executableMetaData,+ Class<?> currentValidatedGroup) {if ( !executableMetaData.getCrossParameterConstraints().isEmpty() ) {ValueContext<T, Object> valueContext = getExecutableValueContext(validationContext.getRootBean(), executableMetaData, executableMetaData.getValidatableParametersMetaData(), currentValidatedGroup@@ -1056,7 +1106,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validatorScopedContext.getParameterNameProvider(),object,validatable,- PathImpl.createPathForExecutable( executableMetaData )+ MutablePath.createPathForExecutable( executableMetaData ));valueContext.setCurrentGroup( group );@@ -1099,7 +1149,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validatorScopedContext.getParameterNameProvider(),value,executableMetaData.getReturnValueMetaData(),- PathImpl.createPathForExecutable( executableMetaData )+ MutablePath.createPathForExecutable( executableMetaData ));groupIterator = validationOrder.getGroupIterator();@@ -1196,9 +1246,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {* @param propertyPath The property path for which constraints have to be collected.** @return Returns an instance of {@code ValueContext} which describes the local validation context associated to- * the given property path.+ * the given property path.*/- private <V> BeanValueContext<?, V> getValueContextForPropertyValidation(BaseBeanValidationContext<?> validationContext, PathImpl propertyPath) {+ private <V> BeanValueContext<?, V> getValueContextForPropertyValidation(BaseBeanValidationContext<?> validationContext, MutablePath propertyPath) {Class<?> clazz = validationContext.getRootBeanClass();BeanMetaData<?> beanMetaData = validationContext.getRootBeanMetaData();Object value = validationContext.getRootBean();@@ -1208,7 +1258,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( propertyPathIter.hasNext() ) {// cast is ok, since we are dealing with engine internal classes- NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();+ MutableNode propertyPathNode = (MutableNode) propertyPathIter.next();propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );// if the property is not the leaf property, we set up the context for the next iteration@@ -1226,7 +1276,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the// element valueif ( propertyPathNode.isIterable() ) {- propertyPathNode = (NodeImpl) propertyPathIter.next();+ propertyPathNode = (MutableNode) propertyPathIter.next();if ( propertyPathNode.getIndex() != null ) {value = ReflectionHelper.getIndexedValue( value, propertyPathNode.getIndex() );@@ -1259,7 +1309,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {propertyPath.removeLeafNode();- return ValueContexts.getLocalExecutionContextForBean( validatorScopedContext.getParameterNameProvider(), value, beanMetaData, propertyPath );+ return ValueContexts.getLocalExecutionContextForRootBean( validatorScopedContext.getParameterNameProvider(), value, beanMetaData, propertyPath );}/**@@ -1270,11 +1320,12 @@ public class ValidatorImpl implements Validator, ExecutableValidator {** @param rootBeanClass The class of the root bean.* @param propertyPath The property path for which constraints have to be collected.+ ** @return Returns an instance of {@code ValueContext} which describes the local validation context associated to* the given property path.*/private <V> BeanValueContext<?, V> getValueContextForValueValidation(Class<?> rootBeanClass,- PathImpl propertyPath) {+ MutablePath propertyPath) {Class<?> clazz = rootBeanClass;BeanMetaData<?> beanMetaData = null;PropertyMetaData propertyMetaData = null;@@ -1283,7 +1334,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( propertyPathIter.hasNext() ) {// cast is ok, since we are dealing with engine internal classes- NodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();+ MutableNode propertyPathNode = (MutableNode) propertyPathIter.next();beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );@@ -1292,7 +1343,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// if we are in the case of an iterable and we want to validate an element of this iterable, we have to get the// type from the parameterized typeif ( propertyPathNode.isIterable() ) {- propertyPathNode = (NodeImpl) propertyPathIter.next();+ propertyPathNode = (MutableNode) propertyPathIter.next();clazz = ReflectionHelper.getClassFromType( ReflectionHelper.getCollectionElementType( propertyMetaData.getType() ) );beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );@@ -1316,7 +1367,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {/*** Check if a constraint comes from a superclass method that has been overridden- * in the current bean class. If so, the constraint should be ignored.+ * in the current bean class. The overriding getter replaces the parent's+ * constraints, including annotations of the same type with different attributes.*/private boolean isConstraintFromOverriddenMethod(ConstraintLocation location, Class<?> beanClass, Class<? extends Annotation> constraintAnnotationType) {if (location instanceof GetterConstraintLocation) {@@ -1324,7 +1376,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {String propertyName = getterLocation.getPropertyName();Method getter = BeanUtils.findGetter(beanClass, propertyName);if (getter != null) {- return getter.getAnnotation(constraintAnnotationType) == null;+ return getter.getDeclaringClass() != getterLocation.getDeclaringClass()+ || getter.getAnnotation(constraintAnnotationType) == null;}}@@ -1334,6 +1387,11 @@ public class ValidatorImpl implements Validator, ExecutableValidator {private boolean isValidationRequired(BaseBeanValidationContext<?> validationContext,ValueContext<?, ?> valueContext,MetaConstraint<?> metaConstraint) {+ // Apply the failure guard to default-group validation as well as explicit groups.+ if (metaConstraint.getDescriptor().getAnnotationType() == ClassValidating.class+ && !validationContext.getFailingConstraints().isEmpty()) {+ return false;+ }var location = metaConstraint.getLocation();if (location instanceof TypeArgumentConstraintLocation) {location = ((TypeArgumentConstraintLocation) location).getOuterDelegate();@@ -1401,8 +1459,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return false;}if ( validationContext.hasMetaConstraintBeenProcessed(- valueContext.getCurrentBean(),- valueContext.getPropertyPath(),+ valueContext,metaConstraint) ) {return false;@@ -1419,13 +1476,13 @@ public class ValidatorImpl implements Validator, ExecutableValidator {);}- private boolean isReachable(BaseBeanValidationContext<?> validationContext, Object traversableObject, PathImpl path,+ private boolean isReachable(BaseBeanValidationContext<?> validationContext, Object traversableObject, MutablePath path,ConstraintLocationKind constraintLocationKind) {if ( needToCallTraversableResolver( path, constraintLocationKind ) ) {return true;}- Path pathToObject = PathImpl.createCopyWithoutLeafNode( path );+ Path pathToObject = MutablePath.createCopyWithoutLeafNode( path );try {return validationContext.getTraversableResolver().isReachable(traversableObject,@@ -1440,7 +1497,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}}- private boolean needToCallTraversableResolver(PathImpl path, ConstraintLocationKind constraintLocationKind) {+ private boolean needToCallTraversableResolver(MutablePath path, ConstraintLocationKind constraintLocationKind) {// as the TraversableResolver interface is designed right now it does not make sense to call it when// there is no traversable object hosting the property to be accessed. For this reason we don't call the resolver// for class level constraints (ElementType.TYPE) or top level method parameters or return values.@@ -1455,12 +1512,23 @@ public class ValidatorImpl implements Validator, ExecutableValidator {if (cascadable.getConstraintLocationKind() == ConstraintLocationKind.GETTER && propertyName != null) {Method getter = BeanUtils.findGetter(beanClass, propertyName);if (getter != null) {- return getter.getAnnotation(javax.validation.Valid.class) == null;+ return getter.getAnnotation(jakarta.validation.Valid.class) == null+ && !hasCascadedTypeArgument(getter.getAnnotatedReturnType());}}return false;}+ private boolean hasCascadedTypeArgument(AnnotatedType type) {+ if (type instanceof AnnotatedParameterizedType parameterizedType) {+ for (AnnotatedType argument : parameterizedType.getAnnotatedActualTypeArguments()) {+ if (argument.isAnnotationPresent(jakarta.validation.Valid.class) || hasCascadedTypeArgument(argument))+ return true;+ }+ }+ return false;+ }+private boolean isCascadeValidationRequired(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Cascadable cascadable) {if (valueContext.getCurrentBean() != null && cascadable.getConstraintLocationKind() == ConstraintLocationKind.GETTER) {var bean = valueContext.getCurrentBean();@@ -1518,7 +1586,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return true;}- private boolean isCascadeRequired(BaseBeanValidationContext<?> validationContext, Object traversableObject, PathImpl path,+ private boolean isCascadeRequired(BaseBeanValidationContext<?> validationContext, Object traversableObject, MutablePath path,ConstraintLocationKind constraintLocationKind) {if ( needToCallTraversableResolver( path, constraintLocationKind ) ) {return true;@@ -1529,7 +1597,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return false;}- Path pathToObject = PathImpl.createCopyWithoutLeafNode( path );+ Path pathToObject = MutablePath.createCopyWithoutLeafNode( path );try {return validationContext.getTraversableResolver().isCascadable(traversableObject,@@ -1548,15 +1616,15 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return ConstraintLocationKind.TYPE.equals( constraintLocationKind );}- private boolean isCrossParameterValidation(PathImpl path) {+ private boolean isCrossParameterValidation(MutablePath path) {return path.getLeafNode().getKind() == ElementKind.CROSS_PARAMETER;}- private boolean isParameterValidation(PathImpl path) {+ private boolean isParameterValidation(MutablePath path) {return path.getLeafNode().getKind() == ElementKind.PARAMETER;}- private boolean isReturnValueValidation(PathImpl path) {+ private boolean isReturnValueValidation(MutablePath path) {return path.getLeafNode().getKind() == ElementKind.RETURN_VALUE;}@@ -1595,13 +1663,13 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}private void validatePropertyConstraintsForNonDefaultGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<?, Object> valueContext) {- Set<MetaConstraint<?>> propertyConstraints = filterPropertyConstraints(valueContext.getCurrentBeanMetaData().getMetaConstraints());+ Set<MetaConstraint<?>> propertyConstraints = filterPropertyConstraints(valueContext.getCurrentBeanMetaData().getAllMetaConstraints());validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), propertyConstraints );validationContext.markCurrentBeanAsProcessed( valueContext );}private void validateClassConstraintsForNonDefaultGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<?, Object> valueContext) {- Set<MetaConstraint<?>> classConstraints = filterClassConstraints(valueContext.getCurrentBeanMetaData().getMetaConstraints());+ Set<MetaConstraint<?>> classConstraints = filterClassConstraints(valueContext.getCurrentBeanMetaData().getAllMetaConstraints());validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), classConstraints );validationContext.markCurrentBeanAsProcessed( valueContext );}@@ -1618,7 +1686,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.if ( defaultGroupSequenceIsRedefined ) {Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );- Set<MetaConstraint<?>> metaConstraints = filterPropertyConstraints(hostingBeanMetaData.getMetaConstraints());+ Set<MetaConstraint<?>> metaConstraints = filterPropertyConstraints(hostingBeanMetaData.getAllMetaConstraints());while ( defaultGroupSequence.hasNext() ) {for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {@@ -1639,7 +1707,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}// fast path in case the default group sequence hasn't been redefinedelse {- Set<MetaConstraint<?>> metaConstraints = filterPropertyConstraints(hostingBeanMetaData.getDirectMetaConstraints());+ Set<MetaConstraint<?>> metaConstraints = filterPropertyConstraints(hostingBeanMetaData.getAllDirectMetaConstraints());validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,Group.DEFAULT_GROUP );validationContext.markCurrentBeanAsProcessed( valueContext );@@ -1663,7 +1731,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.if ( defaultGroupSequenceIsRedefined ) {Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );- Set<MetaConstraint<?>> metaConstraints = filterClassConstraints(hostingBeanMetaData.getMetaConstraints());+ Set<MetaConstraint<?>> metaConstraints = filterClassConstraints(hostingBeanMetaData.getAllMetaConstraints());while ( defaultGroupSequence.hasNext() ) {for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {@@ -1684,7 +1752,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}// fast path in case the default group sequence hasn't been redefinedelse {- Set<MetaConstraint<?>> metaConstraints = filterClassConstraints(hostingBeanMetaData.getDirectMetaConstraints());+ Set<MetaConstraint<?>> metaConstraints = filterClassConstraints(hostingBeanMetaData.getAllDirectMetaConstraints());validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,Group.DEFAULT_GROUP );validationContext.markCurrentBeanAsProcessed( valueContext );diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.javaindex 378c68674c..a6f4dc1a21 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java@@ -1,8 +1,6 @@/*- * Hibernate Validator, declare and validate application constraints- *- * License: Apache License, Version 2.0- * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.validator.internal.engine.constraintvalidation;@@ -11,13 +9,13 @@ import java.lang.invoke.MethodHandles;import java.lang.reflect.Method;import java.lang.reflect.Type;import java.util.ArrayList;-import java.util.Collection;import java.util.List;+import java.util.Collection;import java.util.Optional;-import javax.validation.ConstraintDeclarationException;-import javax.validation.ConstraintValidator;-import javax.validation.ValidationException;+import jakarta.validation.ConstraintDeclarationException;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ValidationException;import org.hibernate.validator.internal.engine.validationcontext.ValidationContext;import org.hibernate.validator.internal.engine.valuecontext.ValueContext;@@ -44,7 +42,7 @@ import io.onedev.server.annotation.Interpolative;* @author Guillaume Smet* @author Marko Bekhta*/-public abstract class ConstraintTree<A extends Annotation> {+public abstract sealed class ConstraintTree<A extends Annotation> permits SimpleConstraintTree, ComposingConstraintTree {private static final Log LOG = LoggerFactory.make( MethodHandles.lookup() );@@ -79,23 +77,10 @@ public abstract class ConstraintTree<A extends Annotation> {}}- public final boolean validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext) {- List<ConstraintValidatorContextImpl> violatedConstraintValidatorContexts = new ArrayList<>( 5 );- validateConstraints( validationContext, valueContext, violatedConstraintValidatorContexts );- if ( !violatedConstraintValidatorContexts.isEmpty() ) {- for ( ConstraintValidatorContextImpl constraintValidatorContext : violatedConstraintValidatorContexts ) {- for ( ConstraintViolationCreationContext constraintViolationCreationContext : constraintValidatorContext.getConstraintViolationCreationContexts() ) {- validationContext.addConstraintFailure(- valueContext, constraintViolationCreationContext, constraintValidatorContext.getConstraintDescriptor()- );- }- }- return false;- }- return true;- }+ public abstract boolean validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext);- protected abstract void validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext, Collection<ConstraintValidatorContextImpl> violatedConstraintValidatorContexts);+ protected abstract void validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext,+ Collection<ConstraintValidatorContextImpl> violatedConstraintValidatorContexts);public final ConstraintDescriptorImpl<A> getDescriptor() {return descriptor;@@ -139,7 +124,7 @@ public abstract class ConstraintTree<A extends Annotation> {validator = defaultInitializedConstraintValidator;if ( validator == null ) {- synchronized ( this ) {+ synchronized (this) {validator = defaultInitializedConstraintValidator;if ( validator == null ) {validator = validationContext.getConstraintValidatorManager().getInitializedValidator(@@ -179,7 +164,7 @@ public abstract class ConstraintTree<A extends Annotation> {* otherwise.*/@SuppressWarnings("unchecked")- protected final <V> Optional<ConstraintValidatorContextImpl> validateSingleConstraint(+ protected final <V> ConstraintValidatorContextImpl validateSingleConstraint(ValueContext<?, ?> valueContext,ConstraintValidatorContextImpl constraintValidatorContext,ConstraintValidator<A, V> validator) {@@ -190,7 +175,7 @@ public abstract class ConstraintTree<A extends Annotation> {try {if (MetaConstraint.get().getLocation() instanceof GetterConstraintLocation) {GetterConstraintLocation location = (GetterConstraintLocation) MetaConstraint.get().getLocation();- Method method = ReflectionUtils.findMethod(location.getDeclaringClass(),+ Method method = ReflectionUtils.findMethod(location.getConstrainable().getDeclaringClass(),location.getConstrainable().getName());Interpolative interpolative = method.getAnnotation(Interpolative.class);if (interpolative != null) {@@ -224,9 +209,9 @@ public abstract class ConstraintTree<A extends Annotation> {if ( !isValid ) {//We do not add these violations yet, since we don't know how they are//going to influence the final boolean evaluation- return Optional.of( constraintValidatorContext );+ return constraintValidatorContext;}- return Optional.empty();+ return null;}@Overridediff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/valuecontext/BeanValueContext.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/valuecontext/BeanValueContext.javanew file mode 100644index 0000000000..d66d4c45c6--- /dev/null+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/valuecontext/BeanValueContext.java@@ -0,0 +1,108 @@+/*+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors+ */+package org.hibernate.validator.internal.engine.valuecontext;++import java.util.HashSet;+import java.util.IdentityHashMap;+import java.util.Map;+import java.util.Set;++import org.hibernate.validator.internal.engine.path.MutablePath;+import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;+import org.hibernate.validator.internal.metadata.core.MetaConstraint;+import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;+import org.hibernate.validator.internal.util.stereotypes.Lazy;++/**+ * @author Marko Bekhta+ */+public final class BeanValueContext<T, V> extends ValueContext<T, V> {++ /**+ * The metadata of the current bean.+ */+ private BeanMetaData<?> currentBeanMetaData;++ /**+ * When we check whether the bean was validated we need to check that it was validated for the requested group.+ * This set tracks the groups we've already processed this bean for.+ */+ @Lazy+ private Set<Class<?>> alreadyProcessedGroups;++ /**+ * To track when the constraint is in multiple groups, and it was already processed for some other group.+ */+ @Lazy+ private final Map<Object, Map<String, Map<MetaConstraint<?>, Boolean>>> processedConstraints;++ private Map<MetaConstraint<?>, Boolean> constraintsForCurrentPath() {+ return processedConstraints.computeIfAbsent(currentBean, bean -> new java.util.HashMap<>())+ .computeIfAbsent(propertyPath.asString(), path -> new IdentityHashMap<>());+ }++ BeanValueContext(ValueContext<?, ?> parentContext, ExecutableParameterNameProvider parameterNameProvider, T currentBean, BeanMetaData<T> currentBeanMetaData, MutablePath propertyPath) {+ super( parentContext, parameterNameProvider, currentBean, currentBeanMetaData, propertyPath );+ this.currentBeanMetaData = currentBeanMetaData;+ // Share only within this validation's context tree, never across calls or threads.+ // OneDev revisits cascaded beans during its property/cascade/class phases.+ this.processedConstraints = parentContext instanceof BeanValueContext<?, ?> parent+ ? parent.processedConstraints : new IdentityHashMap<>();+ }++ @SuppressWarnings("unchecked")+ public BeanMetaData<T> getCurrentBeanMetaData() {+ return (BeanMetaData<T>) currentBeanMetaData;+ }++ public void reset(Object currentBean, MutablePath propertyPath, BeanMetaData<?> currentBeanMetaData) {+ this.currentBeanMetaData = currentBeanMetaData;+ this.currentValidatable = currentBeanMetaData;+ this.currentBean = currentBean;+ this.propertyPath = propertyPath;+ this.alreadyProcessedGroups = null;+ this.currentGroup = null;+ this.previousGroup = null;+ }++ @Override+ public boolean isBeanAlreadyValidated(Object value, Class<?> group) {+ ValueContext<?, ?> curr = this;+ while ( curr != null ) {+ if ( curr.currentBean == value ) {+ return curr.isProcessedForGroup( group );+ }+ curr = curr.parentContext;+ }+ return false;+ }++ @Override+ public void markCurrentGroupAsProcessed() {+ // if we just validate the default/single group it doesn't make sense to track it beyond the "current group" value+ if ( this.previousGroup != null && this.previousGroup != this.currentGroup ) {+ if ( this.alreadyProcessedGroups == null ) {+ this.alreadyProcessedGroups = new HashSet<>();+ this.alreadyProcessedGroups.add( this.previousGroup );+ }+ this.alreadyProcessedGroups.add( this.currentGroup );+ }+ }++ @Override+ protected boolean isProcessedForGroup(Class<?> group) {+ return group == this.currentGroup || ( this.alreadyProcessedGroups != null && alreadyProcessedGroups.contains( group ) );+ }++ @Override+ public void markConstraintProcessed(MetaConstraint<?> metaConstraint) {+ constraintsForCurrentPath().put(metaConstraint, Boolean.TRUE);+ }++ @Override+ public boolean hasMetaConstraintBeenProcessed(MetaConstraint<?> metaConstraint) {+ return constraintsForCurrentPath().containsKey(metaConstraint);+ }+}diff --git a/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.javaindex 680a88321b..37a577ded3 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java@@ -1,8 +1,6 @@/*- * Hibernate Validator, declare and validate application constraints- *- * License: Apache License, Version 2.0- * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.validator.internal.metadata.aggregated;diff --git a/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java b/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.javaindex b3817cdd1f..dbbbf812ef 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java@@ -1,8 +1,6 @@/*- * Hibernate Validator, declare and validate application constraints- *- * License: Apache License, Version 2.0- * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.+ * SPDX-License-Identifier: Apache-2.0+ * Copyright Red Hat Inc. and Hibernate Authors*/package org.hibernate.validator.internal.metadata.core;@@ -14,7 +12,7 @@ import java.util.NoSuchElementException;import java.util.Set;import java.util.Stack;-import javax.validation.valueextraction.ValueExtractor;+import jakarta.validation.valueextraction.ValueExtractor;import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintTree;import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;@@ -106,9 +104,12 @@ public class MetaConstraint<A extends Annotation> {private static ValueExtractionPathNode getValueExtractionPath(List<ContainerClassTypeParameterAndExtractor> valueExtractionPath) {switch ( valueExtractionPath.size() ) {- case 0: return null;- case 1: return new SingleValueExtractionPathNode( valueExtractionPath.iterator().next() );- default: return new LinkedValueExtractionPathNode( null, valueExtractionPath );+ case 0:+ return null;+ case 1:+ return new SingleValueExtractionPathNode( valueExtractionPath.iterator().next() );+ default:+ return new LinkedValueExtractionPathNode( null, valueExtractionPath );}}@@ -157,9 +158,8 @@ public class MetaConstraint<A extends Annotation> {private boolean doValidateConstraint(ValidationContext<?> executionContext, ValueContext<?, ?> valueContext) {valueContext.setConstraintLocationKind( getConstraintLocationKind() );- boolean validationResult = constraintTree.validateConstraints( executionContext, valueContext );- return validationResult;+ return constraintTree.validateConstraints( executionContext, valueContext );}public ConstraintLocation getLocation() {@@ -256,10 +256,7 @@ public class MetaConstraint<A extends Annotation> {valueContext.setTypeParameter( containerClass, currentValueExtractionPathNode.getTypeParameterIndex() );}- if ( nodeName != null ) {- valueContext.appendTypeParameterNode( nodeName );- }-+ valueContext.appendTypeParameterNode( nodeName );valueContext.setCurrentValidatedValue( value );if ( currentValueExtractionPathNode.hasNext() ) {@@ -310,11 +307,17 @@ public class MetaConstraint<A extends Annotation> {private interface ValueExtractionPathNode {boolean hasNext();+ValueExtractionPathNode getPrevious();+ValueExtractionPathNode getNext();+Class<?> getContainerClass();+TypeVariable<?> getTypeParameter();+Integer getTypeParameterIndex();+ValueExtractorDescriptor getValueExtractorDescriptor();}@@ -384,7 +387,7 @@ public class MetaConstraint<A extends Annotation> {private final Integer typeParameterIndex;private final ValueExtractorDescriptor valueExtractorDescriptor;- private LinkedValueExtractionPathNode( ValueExtractionPathNode previous, List<ContainerClassTypeParameterAndExtractor> elements) {+ private LinkedValueExtractionPathNode(ValueExtractionPathNode previous, List<ContainerClassTypeParameterAndExtractor> elements) {ContainerClassTypeParameterAndExtractor first = elements.get( 0 );this.containerClass = first.containerClass;this.typeParameter = first.typeParameter;diff --git a/server-core/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java b/server-core/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.javaindex 484255ef82..fb3b52ba43 100644--- a/server-core/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java+++ b/server-core/src/main/java/org/yaml/snakeyaml/constructor/BaseConstructor.java@@ -45,6 +45,7 @@ import org.yaml.snakeyaml.nodes.NodeTuple;import org.yaml.snakeyaml.nodes.ScalarNode;import org.yaml.snakeyaml.nodes.SequenceNode;import org.yaml.snakeyaml.nodes.Tag;+import org.yaml.snakeyaml.util.Tuple;import io.onedev.server.util.BeanUtils;import io.onedev.server.annotation.Editable;@@ -81,8 +82,8 @@ public abstract class BaseConstructor {protected Composer composer;final Map<Node, Object> constructedObjects;private final Set<Node> recursiveObjects;- private final ArrayList<RecursiveTuple<Map<Object, Object>, RecursiveTuple<Object, Object>>> maps2fill;- private final ArrayList<RecursiveTuple<Set<Object>, Object>> sets2fill;+ private final ArrayList<Tuple<Map<Object, Object>, Tuple<Object, Object>>> maps2fill;+ private final ArrayList<Tuple<Set<Object>, Object>> sets2fill;/*** the tag for the root node@@ -91,6 +92,7 @@ public abstract class BaseConstructor {private PropertyUtils propertyUtils;private boolean explicitPropertyUtils;private boolean allowDuplicateKeys = true;+ private boolean warnOnDuplicateKeys = false;private boolean wrappedToRootException = false;private boolean enumCaseSensitive = false;@@ -120,9 +122,8 @@ public abstract class BaseConstructor {}constructedObjects = new HashMap<Node, Object>();recursiveObjects = new HashSet<Node>();- maps2fill =- new ArrayList<RecursiveTuple<Map<Object, Object>, RecursiveTuple<Object, Object>>>();- sets2fill = new ArrayList<RecursiveTuple<Set<Object>, Object>>();+ maps2fill = new ArrayList<Tuple<Map<Object, Object>, Tuple<Object, Object>>>();+ sets2fill = new ArrayList<Tuple<Set<Object>, Object>>();typeDefinitions = new HashMap<Class<? extends Object>, TypeDescription>();typeTags = new HashMap<Tag, Class<? extends Object>>();@@ -220,14 +221,14 @@ public abstract class BaseConstructor {*/private void fillRecursive() {if (!maps2fill.isEmpty()) {- for (RecursiveTuple<Map<Object, Object>, RecursiveTuple<Object, Object>> entry : maps2fill) {- RecursiveTuple<Object, Object> key_value = entry._2();+ for (Tuple<Map<Object, Object>, Tuple<Object, Object>> entry : maps2fill) {+ Tuple<Object, Object> key_value = entry._2();entry._1().put(key_value._1(), key_value._2());}maps2fill.clear();}if (!sets2fill.isEmpty()) {- for (RecursiveTuple<Set<Object>, Object> value : sets2fill) {+ for (Tuple<Set<Object>, Object> value : sets2fill) {value._1().add(value._2());}sets2fill.clear();@@ -264,7 +265,7 @@ public abstract class BaseConstructor {Object data = (constructedObjects.containsKey(node)) ? constructedObjects.get(node): constructor.construct(node);- finalizeConstruction(node, data);+ data = finalizeConstruction(node, data);constructedObjects.put(node, data);recursiveObjects.remove(node);if (node.isTwoStepsConstruction()) {@@ -585,6 +586,11 @@ public abstract class BaseConstructor {if (key != null) {try {key.hashCode();// check circular dependencies+ } catch (StackOverflowError e) {+ // the key (in)directly contains itself; do not call key.toString() here as it would+ // recurse over the same self-referential structure and may overflow the stack again+ throw new ConstructorException("while constructing a mapping", node.getStartMark(),+ "found recursive key that is not allowed", tuple.getKeyNode().getStartMark(), e);} catch (Exception e) {throw new ConstructorException("while constructing a mapping", node.getStartMark(),"found unacceptable key " + key, tuple.getKeyNode().getStartMark(), e);@@ -611,7 +617,7 @@ public abstract class BaseConstructor {*/@SuppressWarnings({ "rawtypes", "unchecked" })protected void postponeMapFilling(Map<Object, Object> mapping, Object key, Object value) {- maps2fill.add(0, new RecursiveTuple(mapping, new RecursiveTuple(key, value)));+ maps2fill.add(0, new Tuple(mapping, new Tuple(key, value)));}protected void constructSet2ndStep(MappingNode node, Set<Object> set) {@@ -622,6 +628,11 @@ public abstract class BaseConstructor {if (key != null) {try {key.hashCode();// check circular dependencies+ } catch (StackOverflowError e) {+ // the key (in)directly contains itself; do not call key.toString() here as it would+ // recurse over the same self-referential structure and may overflow the stack again+ throw new ConstructorException("while constructing a Set", node.getStartMark(),+ "found recursive key that is not allowed", tuple.getKeyNode().getStartMark(), e);} catch (Exception e) {throw new ConstructorException("while constructing a Set", node.getStartMark(),"found unacceptable key " + key, tuple.getKeyNode().getStartMark(), e);@@ -641,7 +652,7 @@ public abstract class BaseConstructor {* does not observe value hashCode changes.*/protected void postponeSetFilling(Set<Object> set, Object key) {- sets2fill.add(0, new RecursiveTuple<Set<Object>, Object>(set, key));+ sets2fill.add(0, new Tuple<Set<Object>, Object>(set, key));}public void setPropertyUtils(PropertyUtils propertyUtils) {@@ -678,25 +689,6 @@ public abstract class BaseConstructor {return typeDefinitions.put(definition.getType(), definition);}- private static class RecursiveTuple<T, K> {-- private final T _1;- private final K _2;-- public RecursiveTuple(T _1, K _2) {- this._1 = _1;- this._2 = _2;- }-- public K _2() {- return _2;- }-- public T _1() {- return _1;- }- }-public final boolean isExplicitPropertyUtils() {return explicitPropertyUtils;}@@ -709,6 +701,14 @@ public abstract class BaseConstructor {this.allowDuplicateKeys = allowDuplicateKeys;}+ public boolean isWarnOnDuplicateKeys() {+ return warnOnDuplicateKeys;+ }++ public void setWarnOnDuplicateKeys(boolean warnOnDuplicateKeys) {+ this.warnOnDuplicateKeys = warnOnDuplicateKeys;+ }+public boolean isWrappedToRootException() {return wrappedToRootException;}diff --git a/server-core/src/main/java/org/yaml/snakeyaml/representer/Representer.java b/server-core/src/main/java/org/yaml/snakeyaml/representer/Representer.javaindex d485742c0a..ee2ce8eb9f 100644--- a/server-core/src/main/java/org/yaml/snakeyaml/representer/Representer.java+++ b/server-core/src/main/java/org/yaml/snakeyaml/representer/Representer.java@@ -210,7 +210,7 @@ public class Representer extends SafeRepresenter {NodeTuple tuple = iter.next();Node keyNode = tuple.getKeyNode();if (keyNode.getNodeId() == NodeId.mapping && !t.equals(member.getClass())) {- mnode.getValue().add(0, new NodeTuple(+ ((MappingNode) keyNode).getValue().add(0, new NodeTuple(new ScalarNode(Tag.STR, "type"),new ScalarNode(Tag.STR, member.getClass().getSimpleName())));}diff --git a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.javaindex 913ae54794..d5d30e59be 100644--- a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java+++ b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java@@ -1,8 +1,8 @@package io.onedev.server.buildspec.job.log;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Lists;diff --git a/server-core/src/test/java/io/onedev/server/cluster/ClusterAtomicLongTest.java b/server-core/src/test/java/io/onedev/server/cluster/ClusterAtomicLongTest.javanew file mode 100644index 0000000000..a3fdc095c8--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/cluster/ClusterAtomicLongTest.java@@ -0,0 +1,88 @@+package io.onedev.server.cluster;++import static org.junit.jupiter.api.Assertions.*;++import java.util.ArrayList;+import java.util.HashSet;+import java.util.Set;+import java.util.UUID;+import java.util.concurrent.Callable;+import java.util.concurrent.Executors;+import java.util.concurrent.TimeUnit;++import com.hazelcast.config.Config;+import com.hazelcast.core.Hazelcast;+import org.junit.jupiter.api.Test;++public class ClusterAtomicLongTest {+ @Test+ public void countersAreAtomicAcrossMembersAndSurvivePartitionOwnerLoss() throws Exception {+ String clusterName = "counter-test-" + UUID.randomUUID();+ var first = Hazelcast.newHazelcastInstance(config(clusterName));+ var secondConfig = config(clusterName);+ secondConfig.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true)+ .addMember("127.0.0.1:" + first.getCluster().getLocalMember().getAddress().getPort());+ var second = Hazelcast.newHazelcastInstance(secondConfig);+ var executor = Executors.newFixedThreadPool(4);+ try {+ assertEquals(2, first.getCluster().getMembers().size());+ assertEquals(2, second.getCluster().getMembers().size());+ var firstCounter = new ClusterAtomicLong(first, "ids");+ var secondCounter = new ClusterAtomicLong(second, "ids");+ assertEquals(0, firstCounter.get());+ assertTrue(firstCounter.compareAndSet(0, 1));+ assertFalse(secondCounter.compareAndSet(0, 99));+ assertEquals(1, secondCounter.get());+ var jobs = new ArrayList<Callable<Set<Long>>>();+ for (int thread = 0; thread < 4; thread++) {+ var counter = thread % 2 == 0 ? firstCounter : secondCounter;+ jobs.add(() -> {+ var ids = new HashSet<Long>();+ for (int i = 0; i < 100; i++)+ assertTrue(ids.add(counter.getAndIncrement()));+ return ids;+ });+ }+ var ids = new HashSet<Long>();+ for (var future : executor.invokeAll(jobs)) {+ var allocated = future.get(30, TimeUnit.SECONDS);+ assertTrue(java.util.Collections.disjoint(ids, allocated));+ ids.addAll(allocated);+ }+ assertEquals(400, ids.size());+ assertEquals(401, firstCounter.get());+ firstCounter.ensureAtLeast(100_000);+ secondCounter.ensureAtLeast(1);+ assertEquals(100_000, secondCounter.getAndIncrement());++ var owner = first.getPartitionService().getPartition("ids").getOwner();+ var failed = owner.getUuid().equals(first.getCluster().getLocalMember().getUuid()) ? first : second;+ var survivor = failed == first ? second : first;+ failed.getLifecycleService().terminate();+ var survivingCounter = new ClusterAtomicLong(survivor, "ids");+ assertEquals(100_001, executor.submit(survivingCounter::getAndIncrement).get(30, TimeUnit.SECONDS).longValue());+ assertEquals(100_002, survivingCounter.get());+ } finally {+ executor.shutdownNow();+ first.shutdown();+ second.shutdown();+ }+ }++ private static Config config(String name) throws java.io.IOException {+ var config = new Config().setClusterName(name);+ config.setProperty("hazelcast.logging.type", "none");+ config.setProperty("hazelcast.operation.thread.count", "2");+ config.setProperty("hazelcast.operation.generic.thread.count", "2");+ config.setProperty("hazelcast.partition.count", "17");+ try (var socket = new java.net.ServerSocket(0, 0, java.net.InetAddress.getLoopbackAddress())) {+ config.getNetworkConfig().setPort(socket.getLocalPort()).setPortAutoIncrement(true);+ }+ config.getNetworkConfig().getInterfaces().setEnabled(true).addInterface("127.0.0.1");+ config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);+ config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false);+ config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);+ config.getMapConfig("default").setBackupCount(1);+ return config;+ }+}diff --git a/server-core/src/test/java/io/onedev/server/commandhandler/TranslateTest.java b/server-core/src/test/java/io/onedev/server/commandhandler/TranslateTest.javaindex 952751aea6..d294cb178f 100644--- a/server-core/src/test/java/io/onedev/server/commandhandler/TranslateTest.java+++ b/server-core/src/test/java/io/onedev/server/commandhandler/TranslateTest.java@@ -1,14 +1,14 @@package io.onedev.server.commandhandler;-import static org.junit.Assert.assertArrayEquals;+import static org.junit.jupiter.api.Assertions.assertArrayEquals;import java.util.List;import java.util.TreeMap;import java.util.function.Function;import java.util.stream.Collectors;-import org.junit.Assert;-import org.junit.Test;+import org.junit.jupiter.api.Assertions;+import org.junit.jupiter.api.Test;public class TranslateTest {@@ -111,7 +111,7 @@ public class TranslateTest {"\t\tm.put(\"container:image\", \"translated Image <<<translation context: container>>>\");\n" +"\t\tm.put(\"world\", \"translated world\");\n" +"}";- Assert.assertEquals(expected, translated);+ Assertions.assertEquals(expected, translated);}}diff --git a/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.java b/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.javaindex 33ab60b7e8..ae2870d2a1 100644--- a/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.java+++ b/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.java@@ -1,9 +1,9 @@package io.onedev.server.data.migration;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class ShellCommandDetectorTest {diff --git a/server-core/src/test/java/io/onedev/server/data/migration/SnakeYamlCustomizationTest.java b/server-core/src/test/java/io/onedev/server/data/migration/SnakeYamlCustomizationTest.javanew file mode 100644index 0000000000..ae8a1ec7fa--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/data/migration/SnakeYamlCustomizationTest.java@@ -0,0 +1,258 @@+package io.onedev.server.data.migration;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.when;++import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;++import org.junit.jupiter.api.Test;+import org.yaml.snakeyaml.DumperOptions;+import org.yaml.snakeyaml.Yaml;+import org.yaml.snakeyaml.nodes.MappingNode;+import org.yaml.snakeyaml.nodes.Node;+import org.yaml.snakeyaml.nodes.NodeTuple;+import org.yaml.snakeyaml.nodes.ScalarNode;+import org.yaml.snakeyaml.nodes.Tag;+import org.yaml.snakeyaml.representer.Representer;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;+import io.onedev.commons.loader.ImplementationRegistry;+import io.onedev.server.annotation.Editable;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.step.CommandStep;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;++public class SnakeYamlCustomizationTest extends AppLoaderMocker {++ @Override+ protected void setup() {+ when(AppLoader.getInstance(ImplementationRegistry.class)).thenReturn(new ImplementationRegistry() {+ @Override+ public <T> Collection<Class<? extends T>> getImplementations(Class<T> type) {+ var implementations = new ArrayList<Class<? extends T>>();+ for (var candidate : List.of(Command.class, CommandStep.class, PosixInterpreter.class)) {+ if (type.isAssignableFrom(candidate))+ implementations.add(candidate.asSubclass(type));+ }+ return implementations;+ }+ });+ }++ @Override+ protected void teardown() {+ }++ @Test+ public void clearsOnlyWritableEditableReferenceDefaultsWhenLoading() {+ var bean = VersionedYamlDoc.fromYaml("version: 0\n").toBean(Defaults.class);+ assertNull(bean.getName());+ assertNull(bean.getCommand());+ assertTrue(bean.getNames().isEmpty());+ assertTrue(bean.getVariables().isEmpty());+ assertEquals(7, bean.getRetries());+ assertTrue(bean.isEnabled());+ assertEquals("internal default", bean.getInternal());+ assertEquals("read only", bean.getReadOnly());+ // Cleared collections must still be mutable for the build-spec editor.+ bean.getNames().add("new");+ bean.getVariables().put("key", "value");+ }++ @Test+ public void loadsExplicitValuesAfterClearingEditableDefaults() {+ var bean = VersionedYamlDoc.fromYaml("""+ version: 0+ name: configured+ names: [one, two]+ variables: {key: value}+ retries: 3+ enabled: false+ command: {script: echo hello}+ """).toBean(Defaults.class);+ assertEquals("configured", bean.getName());+ assertEquals(List.of("one", "two"), bean.getNames());+ assertEquals(Map.of("key", "value"), bean.getVariables());+ assertEquals(3, bean.getRetries());+ assertFalse(bean.isEnabled());+ assertEquals("echo hello", bean.getCommand().getScript());+ }++ @Test+ public void retainsDefaultsOfNonEditableBeans() {+ var bean = VersionedYamlDoc.fromYaml("version: 0\n").toBean(PlainDefaults.class);+ assertEquals("plain default", bean.getName());+ }++ @Test+ public void representsPolymorphicPropertiesListsAndArraysWithTypeEntries() {+ var bean = new Actions();+ bean.setAction(new Command("single"));+ bean.setConcrete(new Command("concrete"));+ bean.setActions(Arrays.asList(new Command("list"), null));+ bean.setArray(new Action[] {new Command("array"), null});+ bean.setLabels(Map.of("type", "user data"));++ var document = VersionedYamlDoc.fromBean(bean);+ assertEquals(Tag.MAP, document.getTag());+ // Safe loading must succeed without Java class tags or application-specific YAML tags.+ Map<String, Object> data = new Yaml().load(document.toYaml());+ assertEquals(Map.of("type", "Command", "script", "single"), data.get("action"));+ assertEquals(Map.of("script", "concrete"), data.get("concrete"));+ assertEquals(Arrays.asList(Map.of("type", "Command", "script", "list"), null), data.get("actions"));+ assertEquals(Arrays.asList(Map.of("type", "Command", "script", "array"), null), data.get("array"));+ assertEquals(Map.of("type", "user data"), data.get("labels"));++ var restored = VersionedYamlDoc.fromYaml(document.toYaml()).toBean(Actions.class);+ assertEquals("single", assertInstanceOf(Command.class, restored.getAction()).getScript());+ assertEquals("concrete", restored.getConcrete().getScript());+ assertEquals("list", assertInstanceOf(Command.class, restored.getActions().get(0)).getScript());+ assertNull(restored.getActions().get(1));+ assertEquals("array", assertInstanceOf(Command.class, restored.getArray()[0]).getScript());+ assertNull(restored.getArray()[1]);+ }++ @Test+ public void representsEachPolymorphicSetMemberWithItsOwnTypeEntry() {+ var bean = new ActionSet();+ bean.setActions(new LinkedHashSet<>(List.of(new Command("first"), new Command("second"))));+ var root = (MappingNode) new Representer(new DumperOptions()).represent(bean);+ var set = (MappingNode) value(root, "actions");+ assertEquals(Tag.SET, set.getTag());+ assertEquals(2, set.getValue().size());+ for (var tuple : set.getValue()) {+ var member = assertInstanceOf(MappingNode.class, tuple.getKeyNode());+ assertEquals(Tag.MAP, member.getTag());+ assertEquals("Command", ((ScalarNode) value(member, "type")).getValue());+ }+ }++ @Test+ public void emitsMutatedScalarValuesUsedByYamlMigrations() {+ var document = VersionedYamlDoc.fromYaml("version: 0\n");+ var name = new ScalarNode(Tag.STR, "before");+ assertEquals(DumperOptions.ScalarStyle.PLAIN, name.getScalarStyle());+ document.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "name"), name));+ name.setValue("after: migration");+ var restored = VersionedYamlDoc.fromYaml(document.toYaml()).toBean(Defaults.class);+ assertEquals("after: migration", restored.getName());+ }++ @Test+ public void roundTripsAProductionBuildSpecWithNestedPolymorphicSteps() {+ var yaml = """+ version: %s+ jobs:+ - name: test+ steps:+ - type: CommandStep+ name: execute+ runInContainer: false+ interpreter:+ type: PosixInterpreter+ shell: bash+ commands: echo hello+ condition: SUCCESSFUL+ optional: false+ """.formatted(MigrationHelper.getVersion(BuildSpec.class));+ BuildSpec spec = VersionedYamlDoc.fromYaml(yaml).toBean(BuildSpec.class);+ var emitted = VersionedYamlDoc.fromBean(spec).toYaml();+ BuildSpec restored = VersionedYamlDoc.fromYaml(emitted).toBean(BuildSpec.class);+ assertEquals(1, restored.getJobs().size());+ assertEquals("test", restored.getJobs().get(0).getName());+ assertEquals(1, restored.getJobs().get(0).getSteps().size());+ var step = assertInstanceOf(CommandStep.class, restored.getJobs().get(0).getSteps().get(0));+ assertEquals("execute", step.getName());+ var interpreter = assertInstanceOf(PosixInterpreter.class, step.getInterpreter());+ assertEquals("bash", interpreter.getShell());+ assertEquals("echo hello", interpreter.getCommands());+ assertEquals(new Yaml().<Object>load(emitted),+ new Yaml().<Object>load(VersionedYamlDoc.fromBean(restored).toYaml()));+ }++ private static Node value(MappingNode node, String name) {+ return node.getValue().stream()+ .filter(tuple -> ((ScalarNode) tuple.getKeyNode()).getValue().equals(name))+ .findFirst().orElseThrow().getValueNode();+ }++ @Editable+ public static class Defaults {+ private String name = "default";+ private Command command = new Command("default");+ private List<String> names = new ArrayList<>(List.of("default"));+ private Map<String, String> variables = new LinkedHashMap<>(Map.of("default", "value"));+ private int retries = 7;+ private boolean enabled = true;+ private String internal = "internal default";++ @Editable public String getName() { return name; }+ public void setName(String name) { this.name = name; }+ @Editable public Command getCommand() { return command; }+ public void setCommand(Command command) { this.command = command; }+ @Editable public List<String> getNames() { return names; }+ public void setNames(List<String> names) { this.names = names; }+ @Editable public Map<String, String> getVariables() { return variables; }+ public void setVariables(Map<String, String> variables) { this.variables = variables; }+ @Editable public int getRetries() { return retries; }+ public void setRetries(int retries) { this.retries = retries; }+ @Editable public boolean isEnabled() { return enabled; }+ public void setEnabled(boolean enabled) { this.enabled = enabled; }+ public String getInternal() { return internal; }+ public void setInternal(String internal) { this.internal = internal; }+ @Editable public String getReadOnly() { return "read only"; }+ }++ public static class PlainDefaults {+ private String name = "plain default";+ @Editable public String getName() { return name; }+ public void setName(String name) { this.name = name; }+ }++ @Editable+ public abstract static class Action {+ }++ @Editable+ public static class Command extends Action {+ private String script;+ public Command() { }+ public Command(String script) { this.script = script; }+ @Editable public String getScript() { return script; }+ public void setScript(String script) { this.script = script; }+ }++ @Editable+ public static class Actions {+ private Action action;+ private Command concrete;+ private List<Action> actions;+ private Action[] array;+ private Map<String, String> labels;++ @Editable public Action getAction() { return action; }+ public void setAction(Action action) { this.action = action; }+ @Editable public Command getConcrete() { return concrete; }+ public void setConcrete(Command concrete) { this.concrete = concrete; }+ @Editable public List<Action> getActions() { return actions; }+ public void setActions(List<Action> actions) { this.actions = actions; }+ @Editable public Action[] getArray() { return array; }+ public void setArray(Action[] array) { this.array = array; }+ @Editable public Map<String, String> getLabels() { return labels; }+ public void setLabels(Map<String, String> labels) { this.labels = labels; }+ }++ public static class ActionSet {+ private Set<Action> actions;+ public Set<Action> getActions() { return actions; }+ public void setActions(Set<Action> actions) { this.actions = actions; }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java b/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.javaindex 6dd0fce606..5eb5a0018b 100644--- a/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java+++ b/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java@@ -3,10 +3,10 @@ package io.onedev.server.data.migration;import com.thoughtworks.xstream.XStream;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.AppLoaderMocker;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.Mockito;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class VersionedXmlDocTest extends AppLoaderMocker {diff --git a/server-core/src/test/java/io/onedev/server/entityreference/ReferenceUtilsTest.java b/server-core/src/test/java/io/onedev/server/entityreference/ReferenceUtilsTest.javaindex 93a4daa107..0d325eac32 100644--- a/server-core/src/test/java/io/onedev/server/entityreference/ReferenceUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/entityreference/ReferenceUtilsTest.java@@ -2,12 +2,12 @@ package io.onedev.server.entityreference;import static io.onedev.server.entityreference.ReferenceUtils.extractReferences;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.when;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.Mockito;import org.unbescape.html.HtmlEscape;diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.javaindex 33f6d5e285..87b7fdfe4b 100644--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java@@ -15,7 +15,7 @@ import org.eclipse.jgit.lib.ProgressMonitor;import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.storage.file.FileBasedConfig;import org.eclipse.jgit.util.FS;-import org.junit.Assert;+import org.junit.jupiter.api.Assertions;import org.mockito.Mockito;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -74,7 +74,7 @@ public abstract class AbstractGitTest extends AppLoaderMocker {});String gitError = GitUtils.checkError("git");- Assert.assertTrue(gitError, gitError == null);+ Assertions.assertTrue(gitError == null, gitError);}protected void deleteDir(File dir, int retries) {diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.javaindex 6ace3b662d..9d98ecf596 100644--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java@@ -1,10 +1,10 @@package io.onedev.server.git;-import static org.junit.Assert.assertArrayEquals;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNotNull;-import static org.junit.Assert.assertNull;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertArrayEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;@@ -26,7 +26,7 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.transport.PacketLineOut;import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.util.io.NullOutputStream;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Sets;import com.google.common.io.Resources;diff --git a/server-core/src/test/java/io/onedev/server/git/LastCommitsOfChildrenTest.java b/server-core/src/test/java/io/onedev/server/git/LastCommitsOfChildrenTest.javanew file mode 100644index 0000000000..1f09bb2ac7--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/git/LastCommitsOfChildrenTest.java@@ -0,0 +1,304 @@+package io.onedev.server.git;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;++import java.time.Instant;+import java.time.ZoneOffset;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.TreeMap;++import org.eclipse.jgit.dircache.DirCache;+import org.eclipse.jgit.dircache.DirCacheEntry;+import org.eclipse.jgit.lib.CommitBuilder;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.junit.jupiter.api.Test;++import io.onedev.server.git.LastCommitsOfChildren.Cache;+import io.onedev.server.git.LastCommitsOfChildren.Value;++public class LastCommitsOfChildrenTest extends AbstractGitTest {++ @Test+ public void testMergeWithoutTouchingSameFile() throws Exception {+ addFileAndCommit("initial", "", "initial commit");+ git.checkout().setName("dev").setCreateBranch(true).call();+ addFileAndCommit("d", "", "add a file to dev branch");+ git.checkout().setName("main").call();+ addFileAndCommit("m", "", "add a file to main branch");+ git.merge().include(git.getRepository().resolve("dev")).setCommit(true).call();++ LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"));+ assertEquals(git.getRepository().resolve("main~1"), lastCommits.get("m").getId());+ assertEquals(git.getRepository().resolve("dev"), lastCommits.get("d").getId());+ assertEquals(git.getRepository().resolve("main~2"), lastCommits.get("initial").getId());+ }++ @Test+ public void testMergeTouchingSameFile() throws Exception {+ addFileAndCommit("file", "1\n2\n3\n4\n5\n", "initial commit");+ git.checkout().setName("dev").setCreateBranch(true).call();+ addFileAndCommit("file", "0\n1\n2\n3\n4\n5\n", "add first line");+ git.checkout().setName("main").call();+ addFileAndCommit("file", "1\n2\n3\n4\n5\n6\n", "add last line");+ git.merge().include(git.getRepository().resolve("dev")).setCommit(true).call();++ LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"));+ assertEquals(git.getRepository().resolve("main"), lastCommits.get("file").getId());+ }++ @Test+ public void testDirAndFile() throws Exception {+ createDir("dir/dir1/subdir");+ createDir("dir/dir2");+ addFileAndCommit("dir/dir1/file", "", "commit");+ addFileAndCommit("dir/dir2/file", "", "commit");+ addFileAndCommit("dir/dir1/subdir/file", "", "commit");+ addFileAndCommit("dir/file", "", "commit");++ LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"), "dir");+ assertEquals(3, lastCommits.size());+ assertEquals(git.getRepository().resolve("main~1"), lastCommits.get("dir1").getId());+ assertEquals(git.getRepository().resolve("main~2"), lastCommits.get("dir2").getId());+ assertEquals(git.getRepository().resolve("main"), lastCommits.get("file").getId());+ }++ @Test+ public void testWithCache() throws Exception {+ addFileAndCommit("initial", "", "initial commit");+ git.checkout().setName("feature1").setCreateBranch(true).call();+ addFileAndCommit("feature1", "", "add feature1");+ git.checkout().setName("main").call();+ addFileAndCommit("main", "", "add main");+ git.merge().include(git.getRepository().resolve("feature1")).setCommit(true).call();++ final ObjectId oldId = git.getRepository().resolve("main");+ final LastCommitsOfChildren oldLastCommits = new LastCommitsOfChildren(git.getRepository(), oldId);+ Cache cache = new Cache() {++ @Override+ public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {+ if (commitId.equals(oldId))+ return oldLastCommits;+ else+ return null;+ }++ };+ assertEquals(oldLastCommits, new LastCommitsOfChildren(git.getRepository(), oldId, cache));++ git.checkout().setName("feature2").setCreateBranch(true).call();+ addFileAndCommit("initial", "hello", "modify initial");+ git.checkout().setName("main").call();+ git.merge().include(git.getRepository().resolve("feature2")).setCommit(true).call();++ ObjectId newId = git.getRepository().resolve("main");+ assertEquals(new LastCommitsOfChildren(git.getRepository(), newId), new LastCommitsOfChildren(git.getRepository(), newId, cache));+ }+++ @Test+ public void testEmptyTreeAndInvalidPaths() throws Exception {+ ObjectId empty = snapshot(Map.of(), 1);+ assertEquals(Map.of(), new LastCommitsOfChildren(git.getRepository(), empty));+ ObjectId head = snapshot(Map.of("file", "content"), 2, empty);+ assertThrows(IllegalArgumentException.class,+ () -> new LastCommitsOfChildren(git.getRepository(), head, "missing"));+ assertThrows(IllegalArgumentException.class,+ () -> new LastCommitsOfChildren(git.getRepository(), head, "file"));+ }++ @Test+ public void testAllChildrenShareOneWalkAndStopEarly() throws Exception {+ ObjectId parent = snapshot(Map.of("old", "old"), 1);+ Map<String, String> files = new HashMap<>();+ for (int i = 0; i < 200; i++)+ files.put("file" + i, "new");+ ObjectId head = snapshot(files, 2, parent);+ List<ObjectId> visited = new ArrayList<>();+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), head, id -> {+ visited.add(id.copy());+ return null;+ });+ assertEquals(200, result.size());+ for (Value value : result.values())+ assertEquals(head, value.getId());+ assertEquals(List.of(head), visited);+ }++ @Test+ public void testPrunesMergeParentForUnresolvedChildren() throws Exception {+ ObjectId root = snapshot(Map.of("dir/file", "base", "dir/unchanged", "base"), 1);+ ObjectId main = snapshot(Map.of("dir/file", "main", "dir/unchanged", "base"), 2, root);+ ObjectId side = root;+ for (int i = 3; i < 70; i++)+ side = snapshot(Map.of("dir/file", "side" + i, "dir/unchanged", "base"), i, side);+ ObjectId merge = snapshot(Map.of("dir/file", "main", "dir/unchanged", "base"), 70, main, side);+ List<ObjectId> visited = new ArrayList<>();+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), merge, "dir", id -> {+ visited.add(id.copy());+ return null;+ });+ assertEquals(main, result.get("file").getId());+ assertEquals(root, result.get("unchanged").getId());+ assertEquals(List.of(merge, main, root), visited);+ }++ @Test+ public void testCacheWaitsForOtherMergeBranches() throws Exception {+ ObjectId root = snapshot(Map.of("a", "0", "b", "0", "c", "0"), 1);+ ObjectId main = snapshot(Map.of("a", "1", "b", "0", "c", "0"), 3, root);+ ObjectId side = snapshot(Map.of("a", "0", "b", "1", "c", "0"), 2, root);+ ObjectId merge = snapshot(Map.of("a", "1", "b", "1", "c", "0"), 4, main, side);+ LastCommitsOfChildren cached = new LastCommitsOfChildren(git.getRepository(), main);+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), merge,+ id -> id.equals(main) ? cached : null);+ assertEquals(main, result.get("a").getId());+ assertEquals(side, result.get("b").getId());+ assertEquals(root, result.get("c").getId());+ assertEquals(new LastCommitsOfChildren(git.getRepository(), merge), result);+ }++ @Test+ public void testMergeRoutesEachChildThroughItsMatchingParent() throws Exception {+ ObjectId root = snapshot(Map.of("a", "0", "b", "0"), 1);+ ObjectId main = snapshot(Map.of("a", "main", "b", "0"), 2, root);+ ObjectId side = snapshot(Map.of("a", "discarded", "b", "side"), 3, root);+ ObjectId merge = snapshot(Map.of("a", "main", "b", "side"), 4, main, side);++ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), merge);+ assertEquals(main, result.get("a").getId());+ assertEquals(side, result.get("b").getId());+ for (ObjectId boundary : List.of(root, main, side, merge)) {+ LastCommitsOfChildren cached = new LastCommitsOfChildren(git.getRepository(), boundary);+ assertEquals(result, new LastCommitsOfChildren(git.getRepository(), merge,+ id -> id.equals(boundary) ? cached : null));+ }+ }++ @Test+ public void testFirstMatchingParentDoesNotDependOnOtherChildren() throws Exception {+ ObjectId root = snapshot(Map.of("a", "0", "b", "0"), 1);+ ObjectId main = snapshot(Map.of("a", "same", "b", "0"), 2, root);+ ObjectId side = snapshot(Map.of("a", "same", "b", "side"), 3, root);+ ObjectId merge = snapshot(Map.of("a", "same", "b", "side"), 4, main, side);+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), merge);+ assertEquals(main, result.get("a").getId());+ assertEquals(side, result.get("b").getId());+ LastCommitsOfChildren cached = new LastCommitsOfChildren(git.getRepository(), side);+ assertEquals(result, new LastCommitsOfChildren(git.getRepository(), merge,+ id -> id.equals(side) ? cached : null));+ }++ @Test+ public void testClockSkewCanReachAnAncestorAgainForDifferentChildren() throws Exception {+ ObjectId root = snapshot(Map.of("a", "0", "b", "0"), 1);+ ObjectId base = snapshot(Map.of("a", "1", "b", "1"), 5, root);+ ObjectId main = snapshot(Map.of("a", "1", "b", "0"), 100, base);+ ObjectId side = snapshot(Map.of("a", "0", "b", "1"), 2, base);+ ObjectId merge = snapshot(Map.of("a", "1", "b", "1"), 101, main, side);+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), merge);+ assertEquals(base, result.get("a").getId());+ assertEquals(base, result.get("b").getId());+ }++ @Test+ public void testFileDirectoryConflictDoesNotFollowMissingEntry() throws Exception {+ ObjectId root = snapshot(Map.of("anchor", "0"), 1);+ ObjectId file = snapshot(Map.of("anchor", "0", "node", "file"), 2, root);+ ObjectId missing = snapshot(Map.of("anchor", "0"), 3, root);+ ObjectId directory = snapshot(Map.of("anchor", "0", "node/child", "content"), 4, root);+ ObjectId merge = snapshot(Map.of("anchor", "0", "node/child", "content"), 5,+ file, missing, directory);+ assertEquals(directory, new LastCommitsOfChildren(git.getRepository(), merge).get("node").getId());+ assertEquals(directory, new LastCommitsOfChildren(git.getRepository(), merge, "node").get("child").getId());+ }++ @Test+ public void testPartialCacheDoesNotLoseChildren() throws Exception {+ ObjectId root = snapshot(Map.of("a", "0", "b", "0"), 1);+ ObjectId head = snapshot(Map.of("a", "0", "b", "0"), 2, root);+ LastCommitsOfChildren expected = new LastCommitsOfChildren(git.getRepository(), head);+ assertEquals(expected, new LastCommitsOfChildren(git.getRepository(), head,+ id -> id.equals(head) ? Map.of("a", expected.get("a")) : null));+ }++ @Test+ public void testCacheDoesNotReadHistoryBehindBoundary() throws Exception {+ ObjectId missing = ObjectId.fromString("1234567890123456789012345678901234567890");+ ObjectId boundary = snapshot(Map.of("a", "0", "b", "0"), 1, missing);+ ObjectId head = snapshot(Map.of("a", "1", "b", "0"), 2, boundary);+ try (RevWalk walk = new RevWalk(git.getRepository())) {+ RevCommit commit = walk.parseCommit(boundary);+ Map<String, Value> cached = Map.of("a", new Value(commit), "b", new Value(commit));+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), head,+ id -> id.equals(boundary) ? cached : null);+ assertEquals(head, result.get("a").getId());+ assertEquals(boundary, result.get("b").getId());+ }+ }++ @Test+ public void testPathBoundariesAndFileDirectoryReplacement() throws Exception {+ ObjectId root = snapshot(Map.of("dir/child", "file", "dir-other/file", "0"), 1);+ ObjectId replaced = snapshot(Map.of("dir/child/nested", "0", "dir/中文", "0", "dir-other/file", "0"), 2, root);+ ObjectId head = snapshot(Map.of("dir/child/nested", "0", "dir/中文", "0", "dir-other/file", "1"), 3, replaced);+ LastCommitsOfChildren result = new LastCommitsOfChildren(git.getRepository(), head, "dir");+ assertEquals(2, result.size());+ assertEquals(replaced, result.get("child").getId());+ assertEquals(replaced, result.get("中文").getId());+ assertEquals(replaced, new LastCommitsOfChildren(git.getRepository(), head, "dir/child").get("nested").getId());+ }++ @Test+ public void testModeChangeAndRecreatedChild() throws Exception {+ ObjectId first = ObjectId.fromString(addFileAndCommit("file", "content", "initial"));+ var index = git.getRepository().lockDirCache();+ try {+ index.getEntry("file").setFileMode(FileMode.EXECUTABLE_FILE);+ index.write();+ index.commit();+ } finally {+ index.unlock();+ }+ ObjectId modeChange = ObjectId.fromString(commit("executable"));+ assertEquals(modeChange, new LastCommitsOfChildren(git.getRepository(), modeChange).get("file").getId());+ removeFileAndCommit("file", "remove");+ ObjectId recreated = ObjectId.fromString(addFileAndCommit("file", "content", "recreate"));+ LastCommitsOfChildren cached = new LastCommitsOfChildren(git.getRepository(), first);+ assertEquals(recreated, new LastCommitsOfChildren(git.getRepository(), recreated,+ id -> id.equals(first) ? cached : null).get("file").getId());+ }++ private ObjectId snapshot(Map<String, String> files, int time, ObjectId... parents) throws Exception {+ try (var inserter = git.getRepository().newObjectInserter()) {+ DirCache index = DirCache.newInCore();+ var builder = index.builder();+ for (var file : new TreeMap<>(files).entrySet()) {+ DirCacheEntry entry = new DirCacheEntry(file.getKey());+ entry.setFileMode(FileMode.REGULAR_FILE);+ entry.setObjectId(inserter.insert(Constants.OBJ_BLOB, Constants.encode(file.getValue())));+ builder.add(entry);+ }+ builder.finish();+ CommitBuilder commit = new CommitBuilder();+ commit.setTreeId(index.writeTree(inserter));+ commit.setParentIds(parents);+ PersonIdent ident = new PersonIdent("author", "[email protected]", Instant.ofEpochSecond(time), ZoneOffset.UTC);+ commit.setAuthor(ident);+ commit.setCommitter(ident);+ commit.setMessage("commit " + time);+ ObjectId id = inserter.insert(commit);+ inserter.flush();+ return id;+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java b/server-core/src/test/java/io/onedev/server/git/command/BlameCommandTest.javaindex 54edf6d604..5860c8eba5 100644--- a/server-core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java+++ b/server-core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java@@ -1,11 +1,11 @@package io.onedev.server.git.command;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.commons.utils.LinearRange;import io.onedev.server.git.AbstractGitTest;diff --git a/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java b/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.javaindex c927f58c1e..578d0a421e 100644--- a/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java+++ b/server-core/src/test/java/io/onedev/server/git/command/LogCommandTest.java@@ -1,13 +1,13 @@package io.onedev.server.git.command;import static com.google.common.collect.Lists.newArrayList;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.ArrayList;import java.util.EnumSet;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.git.AbstractGitTest;diff --git a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceTest.java b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceTest.javaindex 2e4371d27d..7be4842db2 100644--- a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceTest.java+++ b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceTest.java@@ -1,9 +1,9 @@package io.onedev.server.git.service;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNotNull;-import static org.junit.Assert.assertNull;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.when;@@ -23,7 +23,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Maps;import com.google.common.collect.Sets;@@ -93,7 +93,7 @@ public class DefaultGitServiceTest extends AbstractGitTest {try (var walk = new RevWalk(git.getRepository())) {assertEquals(0, walk.parseCommit(commitId).getParentCount());}- var exception = org.junit.Assert.assertThrows(Exception.class, () -> gitService.commit(project, edits,+ var exception = org.junit.jupiter.api.Assertions.assertThrows(Exception.class, () -> gitService.commit(project, edits,"refs/heads/main", ObjectId.zeroId(), ObjectId.zeroId(), user, "Stale initial wiki save", false));assertNotNull(ExceptionUtils.find(exception, ObsoleteCommitException.class));assertEquals(commitId, git.getRepository().resolve("refs/heads/main"));@@ -171,7 +171,7 @@ public class DefaultGitServiceTest extends AbstractGitTest {try {gitService.commit(new Project(), edits, refName, oldCommitId, oldCommitId,user, "test delete", false);- assertTrue("An ObjectNotExistException should be thrown", false);+ assertTrue(false, "An ObjectNotExistException should be thrown");} catch (Exception e) {if (ExceptionUtils.find(e, NotFoundException.class) == null)throw ExceptionUtils.unchecked(e);@@ -258,7 +258,7 @@ public class DefaultGitServiceTest extends AbstractGitTest {try {gitService.commit(new Project(), edits, refName, oldCommitId, oldCommitId, user,"test rename tree", false);- assertTrue("A NotTreeException should be thrown", false);+ assertTrue(false, "A NotTreeException should be thrown");} catch (Exception e) {if (ExceptionUtils.find(e, NotTreeException.class) == null)throw ExceptionUtils.unchecked(e);@@ -330,7 +330,7 @@ public class DefaultGitServiceTest extends AbstractGitTest {try {gitService.commit(new Project(), edits, refName, oldCommitId, oldCommitId, user,"test add", false);- assertTrue("An ObjectAlreadyException should be thrown", false);+ assertTrue(false, "An ObjectAlreadyException should be thrown");} catch (Exception e) {if (ExceptionUtils.find(e, ObjectAlreadyExistsException.class) == null)throw ExceptionUtils.unchecked(e);@@ -492,7 +492,7 @@ public class DefaultGitServiceTest extends AbstractGitTest {try {gitService.commit(new Project(), edits, refName, oldCommitId, oldCommitId, user,"test add", false);- assertTrue("An ObsoleteCommitException should be thrown", false);+ assertTrue(false, "An ObsoleteCommitException should be thrown");} catch (Exception e) {ObsoleteCommitException obsoleteCommitException =ExceptionUtils.find(e, ObsoleteCommitException.class);diff --git a/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java b/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.javaindex d851ae5dd5..b93c928d02 100644--- a/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java+++ b/server-core/src/test/java/io/onedev/server/git/signatureverification/ssh/SignatureVerifierTest.java@@ -23,7 +23,7 @@ import org.eclipse.jgit.api.Git;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevObject;import org.eclipse.jgit.revwalk.RevWalk;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;diff --git a/server-core/src/test/java/io/onedev/server/jetty/JakartaAssetServletTest.java b/server-core/src/test/java/io/onedev/server/jetty/JakartaAssetServletTest.javanew file mode 100644index 0000000000..b1d47db353--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/jetty/JakartaAssetServletTest.java@@ -0,0 +1,57 @@+package io.onedev.server.jetty;++import static org.junit.jupiter.api.Assertions.*;++import java.nio.file.Files;+import java.nio.file.Path;++import org.eclipse.jetty.ee11.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletHolder;+import org.eclipse.jetty.server.LocalConnector;+import org.eclipse.jetty.server.Server;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.io.TempDir;++import io.onedev.server.assets.FileAssetServlet;++public class JakartaAssetServletTest {+ @TempDir+ public Path folder;++ @Test+ public void servesMappedAssetsWithMimeTypesRangesAndCachePolicy() throws Exception {+ Files.writeString(folder.resolve("module.mjs"), "export const value = 42;");+ Files.writeString(folder.resolve("prefetch.json"), "{}");+ Files.writeString(folder.resolve("space name.txt"), "encoded path");+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ var context = new ServletContextHandler();+ context.setContextPath("/");+ server.setHandler(context);+ context.addServlet(new ServletHolder("assets", new FileAssetServlet(folder.toFile().getCanonicalFile())), "/assets/*");+ context.addServlet(new ServletHolder("prefetch", new FileAssetServlet(folder.toFile().getCanonicalFile())), "/prefetch.json");+ try {+ server.start();+ String module = connector.getResponse(request("/assets/module.mjs", ""));+ assertTrue(module.startsWith("HTTP/1.1 200"), module);+ assertTrue(module.contains("Content-Type: text/javascript"), module);+ assertTrue(module.contains("Cache-Control:"), module);+ assertTrue(module.endsWith("export const value = 42;"), module);+ String range = connector.getResponse(request("/assets/module.mjs", "Range: bytes=0-5\r\n"));+ assertTrue(range.startsWith("HTTP/1.1 206"), range);+ assertTrue(range.endsWith("export"), range);+ String prefetch = connector.getResponse(request("/prefetch.json", ""));+ assertTrue(prefetch.contains("Content-Type: application/speculationrules+json"), prefetch);+ assertTrue(connector.getResponse(request("/assets/space%20name.txt", "")).endsWith("encoded path"));+ assertTrue(connector.getResponse(request("/assets/missing", "")).startsWith("HTTP/1.1 404"));+ assertTrue(connector.getResponse(request("/assets/", "")).startsWith("HTTP/1.1 403"));+ } finally {+ server.stop();+ }+ }++ private static String request(String path, String headers) {+ return "GET " + path + " HTTP/1.1\r\nHost: localhost\r\n" + headers + "Connection: close\r\n\r\n";+ }+}diff --git a/server-core/src/test/java/io/onedev/server/jetty/JakartaJettyIntegrationTest.java b/server-core/src/test/java/io/onedev/server/jetty/JakartaJettyIntegrationTest.javanew file mode 100644index 0000000000..311944d79e--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/jetty/JakartaJettyIntegrationTest.java@@ -0,0 +1,244 @@+package io.onedev.server.jetty;++import static org.junit.jupiter.api.Assertions.*;++import java.net.URI;+import java.nio.ByteBuffer;+import java.nio.charset.StandardCharsets;+import java.util.concurrent.LinkedBlockingQueue;+import java.util.concurrent.TimeUnit;++import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;++import org.apache.wicket.protocol.ws.api.ServletRequestCopy;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletHolder;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServlet;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServletFactory;+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;+import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer;+import org.eclipse.jetty.server.LocalConnector;+import org.eclipse.jetty.server.Server;+import org.eclipse.jetty.server.ServerConnector;+import org.eclipse.jetty.websocket.api.Callback;+import org.eclipse.jetty.websocket.api.Session;+import org.eclipse.jetty.websocket.client.WebSocketClient;+import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandlerFactory;+import org.eclipse.jetty.websocket.core.WebSocketComponents;+import org.junit.jupiter.api.Test;++import io.onedev.agent.AgentSocket;+import io.onedev.agent.Message;+import io.onedev.agent.MessageTypes;+import io.onedev.server.agent.ServerSocket;+import io.onedev.server.web.websocket.WebSocketProcessor;++public class JakartaJettyIntegrationTest {+ @Test+ public void compressionPreservesMethodsContentTypesAndRequestBodies() throws Exception {+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ var context = new ServletContextHandler();+ context.setContextPath("/");+ String content = "compressible content ".repeat(100);+ byte[] original = content.getBytes(StandardCharsets.UTF_8);+ var compressed = new java.io.ByteArrayOutputStream();+ try (var gzip = new java.util.zip.GZIPOutputStream(compressed)) {+ gzip.write(original);+ }+ context.addServlet(new ServletHolder(new HttpServlet() {+ @Override+ protected void service(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException {+ response.setContentType(request.getRequestURI().equals("/binary") ? "application/octet-stream" : "text/plain");+ byte[] body = request.getRequestURI().equals("/echo") ? request.getInputStream().readAllBytes() : original;+ response.setContentLength(body.length);+ response.getOutputStream().write(body);+ }+ }), "/*");+ server.setHandler(DefaultJettyService.newCompressionHandler(context));+ try {+ server.start();+ for (String method : new String[] {"GET", "POST", "PUT"}) {+ var response = org.eclipse.jetty.http.HttpTester.parseResponse(connector.getResponse(+ method + " /text HTTP/1.1\r\nHost: localhost\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"));+ assertEquals(200, response.getStatus());+ assertEquals("gzip", response.get("Content-Encoding"));+ try (var gzip = new java.util.zip.GZIPInputStream(new java.io.ByteArrayInputStream(response.getContentBytes()))) {+ assertArrayEquals(original, gzip.readAllBytes());+ }+ }+ for (String path : new String[] {"/binary", "/text"}) {+ String method = path.equals("/binary") ? "GET" : "DELETE";+ var response = org.eclipse.jetty.http.HttpTester.parseResponse(connector.getResponse(+ method + " " + path + " HTTP/1.1\r\nHost: localhost\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"));+ assertNull(response.get("Content-Encoding"));+ assertArrayEquals(original, response.getContentBytes());+ }+ var request = org.eclipse.jetty.http.HttpTester.newRequest();+ request.setMethod("POST");+ request.setURI("/echo");+ request.put("Host", "localhost");+ request.put("Connection", "close");+ request.put("Content-Encoding", "gzip");+ request.setContent(compressed.toByteArray());+ var response = org.eclipse.jetty.http.HttpTester.parseResponse(connector.getResponse(request.generate()));+ assertArrayEquals(compressed.toByteArray(), response.getContentBytes());+ } finally {+ server.stop();+ }+ }++ @Test+ public void redirectsDoNotExposeTheBackendOrigin() throws Exception {+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ var context = new ServletContextHandler();+ context.setContextPath("/onedev");+ context.addServlet(new ServletHolder(new HttpServlet() {+ @Override+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException {+ response.sendRedirect("../login?return=projects");+ }+ }), "/*");+ server.setHandler(context);+ try {+ server.start();+ String response = connector.getResponse(request("GET", "/onedev/projects/list"));+ assertTrue(response.startsWith("HTTP/1.1 302"));+ assertTrue(response.contains("Location: /onedev/login?return=projects\r\n"));+ assertFalse(response.contains("Location: http:"));+ } finally {+ server.stop();+ }+ }++ @Test+ public void websocketRequestCopyCanReadTheJakartaServletMetadata() throws Exception {+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ var context = new ServletContextHandler(ServletContextHandler.SESSIONS);+ context.setContextPath("/");+ var copy = new ServletRequestCopy[1];+ context.addServlet(new ServletHolder(new HttpServlet() {+ @Override+ protected void doGet(HttpServletRequest request, HttpServletResponse response) {+ // WebSocketProcessor now receives this real servlet request during upgrade,+ // instead of the old Jetty adapter with unsupported metadata methods.+ copy[0] = new ServletRequestCopy(request);+ response.setStatus(200);+ }+ }), "/*");+ server.setHandler(context);+ try {+ server.start();+ String response = connector.getResponse("GET /socket HTTP/1.1\r\nHost: localhost\r\n"+ + "Content-Type: text/plain;charset=UTF-8\r\nCookie: JSESSIONID=previous-session\r\n"+ + "Connection: close\r\n\r\n");+ assertTrue(response.startsWith("HTTP/1.1 200"));+ assertEquals("UTF-8", copy[0].getCharacterEncoding());+ assertTrue("text/plain;charset=UTF-8".equalsIgnoreCase(copy[0].getContentType()));+ assertEquals("previous-session", copy[0].getRequestedSessionId());+ } finally {+ server.stop();+ }+ }++ @Test+ public void healthAndReadinessUseJettysHandlerContract() throws Exception {+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ server.setHandler(new ProbeHandler(() -> false));+ try {+ server.start();+ assertTrue(connector.getResponse(request("GET", "/healthz")).contains("200 OK"));+ assertTrue(connector.getResponse(request("GET", "/readyz")).contains("503 Service Unavailable"));+ String head = connector.getResponse(request("HEAD", "/healthz"));+ assertFalse(head.substring(head.indexOf("\r\n\r\n") + 4).contains("ok"));+ String post = connector.getResponse(request("POST", "/healthz"));+ assertTrue(post.contains("405 Method Not Allowed"));+ assertTrue(post.contains("Allow: GET, HEAD"));+ assertTrue(connector.getResponse(request("GET", "/unhandled")).contains("404 Not Found"));+ } finally {+ server.stop();+ }+ }++ @Test+ public void agentAndWicketEndpointsHaveValidMetadataAndBinaryMessagesRoundTrip() throws Exception {+ var server = new Server();+ var connector = new ServerConnector(server);+ connector.setHost("127.0.0.1");+ connector.setPort(0);+ server.addConnector(connector);+ var context = new ServletContextHandler();+ context.setContextPath("/");+ server.setHandler(context);+ JettyWebSocketServletContainerInitializer.configure(context, null);+ context.addServlet(new ServletHolder(new JettyWebSocketServlet() {+ @Override+ protected void configure(JettyWebSocketServletFactory factory) {+ factory.setCreator((request, response) -> new Echo());+ }+ }), "/socket");+ try (var client = new WebSocketClient()) {+ server.start();+ var factory = new JettyWebSocketFrameHandlerFactory(+ JettyWebSocketServerContainer.getContainer(context.getServletContext()), new WebSocketComponents());+ assertNotNull(factory.getMetadata(AgentSocket.class));+ assertNotNull(factory.getMetadata(ServerSocket.class));+ assertNotNull(factory.getMetadata(WebSocketProcessor.class));+ client.start();+ var messages = new LinkedBlockingQueue<String>();+ var listener = new ReceivingListener(messages);+ Session session = client.connect(listener, URI.create("ws://127.0.0.1:" + connector.getLocalPort() + "/socket"))+ .get(10, TimeUnit.SECONDS);+ for (int i = 0; i < 100; i++)+ new Message(MessageTypes.HEART_BEAT, "message-" + i).sendBy(session);+ for (int i = 0; i < 100; i++)+ assertEquals("message-" + i, messages.poll(10, TimeUnit.SECONDS));+ session.close();+ } finally {+ server.stop();+ }+ }++ public static class ReceivingListener implements Session.Listener.AutoDemanding {+ private final LinkedBlockingQueue<String> messages;++ public ReceivingListener(LinkedBlockingQueue<String> messages) {+ this.messages = messages;+ }++ @Override+ public void onWebSocketBinary(ByteBuffer payload, Callback callback) {+ byte[] bytes = new byte[payload.remaining()];+ payload.get(bytes);+ messages.add(new String(Message.of(bytes, 0, bytes.length).getData(), StandardCharsets.UTF_8));+ callback.succeed();+ }+ }++ public static class Echo implements Session.Listener.AutoDemanding {+ private Session session;++ @Override+ public void onWebSocketOpen(Session session) {+ this.session = session;+ }++ @Override+ public void onWebSocketBinary(ByteBuffer payload, Callback callback) {+ session.sendBinary(payload, callback);+ }+ }++ private static String request(String method, String path) {+ return method + " " + path + " HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n";+ }+}diff --git a/server-core/src/test/java/io/onedev/server/markdown/LinkUtilsTest.java b/server-core/src/test/java/io/onedev/server/markdown/LinkUtilsTest.javaindex 327c8d2d7d..82a0dd4a4a 100644--- a/server-core/src/test/java/io/onedev/server/markdown/LinkUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/markdown/LinkUtilsTest.java@@ -1,9 +1,9 @@package io.onedev.server.markdown;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import org.jsoup.Jsoup;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class LinkUtilsTest {@Testdiff --git a/server-core/src/test/java/io/onedev/server/model/support/code/BranchProtectionTest.java b/server-core/src/test/java/io/onedev/server/model/support/code/BranchProtectionTest.javaindex 01fffec1ee..3f70338761 100644--- a/server-core/src/test/java/io/onedev/server/model/support/code/BranchProtectionTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/code/BranchProtectionTest.java@@ -1,9 +1,9 @@package io.onedev.server.model.support.code;import com.google.common.collect.Lists;-import org.junit.Test;+import org.junit.jupiter.api.Test;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;public class BranchProtectionTest {diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.javaindex 76d64ff3b1..4b8d3702df 100644--- a/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/CommitMessageFixSettingTest.java@@ -1,10 +1,10 @@package io.onedev.server.model.support.issue;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.when;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.Mockito;import io.onedev.commons.loader.AppLoader;diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.javaindex 97885e6380..dc48c3797e 100644--- a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java@@ -1,8 +1,8 @@package io.onedev.server.model.support.issue;-import org.junit.Test;+import org.junit.jupiter.api.Test;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;public class TimeTrackingSettingTest {diff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateBackupCompatibilityTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateBackupCompatibilityTest.javanew file mode 100644index 0000000000..fb9ff3a5ff--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateBackupCompatibilityTest.java@@ -0,0 +1,75 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.*;++import java.sql.CallableStatement;+import java.sql.PreparedStatement;+import java.sql.Types;+import java.util.UUID;++import org.hibernate.boot.MetadataSources;+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;+import org.hibernate.type.spi.TypeConfiguration;+import org.junit.jupiter.api.Test;++import com.thoughtworks.xstream.XStream;+import com.thoughtworks.xstream.mapper.MapperWrapper;++import io.onedev.server.util.xstream.HibernateProxyMapper;++public class HibernateBackupCompatibilityTest {++ @Test+ public void serializesProxyTypesAsPersistentEntityTypes() {+ var registry = new StandardServiceRegistryBuilder()+ .applySetting("hibernate.connection.url", "jdbc:hsqldb:mem:" + UUID.randomUUID())+ .applySetting("hibernate.connection.username", "sa")+ .applySetting("hibernate.cache.use_second_level_cache", false)+ .applySetting("jakarta.persistence.validation.mode", "none").build();+ try {+ var metadata = new MetadataSources(registry)+ .addAnnotatedClass(HibernateOrmUpgradeTest.Item.class).buildMetadata();+ try (var factory = metadata.buildSessionFactory(); var session = factory.openSession()) {+ var reference = session.getReference(HibernateOrmUpgradeTest.Item.class, 1L);+ assertNotEquals(HibernateOrmUpgradeTest.Item.class, reference.getClass());+ var xstream = new XStream() {+ @Override+ protected MapperWrapper wrapMapper(MapperWrapper next) {+ return new HibernateProxyMapper(next);+ }+ };+ assertEquals(xstream.getMapper().serializedClass(HibernateOrmUpgradeTest.Item.class),+ xstream.getMapper().serializedClass(reference.getClass()));+ assertFalse(org.hibernate.Hibernate.isInitialized(reference));+ }+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ }+ }++ @Test+ public void bindsPostgresBlobNullsAsBinaryInsteadOfOid() throws Exception {+ var registry = new StandardServiceRegistryBuilder()+ .applySetting("hibernate.dialect", PostgreSQLDialect.class.getName())+ .applySetting("hibernate.boot.allow_jdbc_metadata_access", false).build();+ try {+ var metadata = new MetadataSources(registry).buildMetadata();+ TypeConfiguration types = ((org.hibernate.boot.spi.MetadataImplementor) metadata).getTypeConfiguration();+ var binder = types.getJdbcTypeRegistry().getDescriptor(Types.BLOB)+ .getBinder(PrimitiveByteArrayJavaType.INSTANCE);+ var statement = mock(PreparedStatement.class);+ binder.bind(statement, null, 1, null);+ verify(statement).setNull(1, Types.VARBINARY);+ var bytes = new byte[] {0, 1, -1};+ binder.bind(statement, bytes, 2, null);+ verify(statement).setBytes(2, bytes);+ var callable = mock(CallableStatement.class);+ binder.bind(callable, null, "value", null);+ verify(callable).setNull("value", Types.VARBINARY);+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateClusterCacheTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateClusterCacheTest.javanew file mode 100644index 0000000000..dbc7ea2a37--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateClusterCacheTest.java@@ -0,0 +1,151 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;++import java.util.ArrayList;+import java.util.List;+import java.util.UUID;+import java.util.function.BooleanSupplier;++import jakarta.persistence.Entity;+import jakarta.persistence.Id;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.OneToMany;++import org.hibernate.SessionFactory;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.boot.MetadataSources;+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;+import org.hibernate.engine.spi.SessionFactoryImplementor;+import org.junit.jupiter.api.Test;++import com.hazelcast.config.Config;+import com.hazelcast.core.Hazelcast;+import com.hazelcast.core.HazelcastInstance;++import io.onedev.commons.utils.ClassUtils;+import io.onedev.server.model.AbstractEntity;++public class HibernateClusterCacheTest {+ @Entity(name = "ClusterCacheTestItem")+ @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)+ public static class Item {+ @Id Long id;+ String name;+ @ManyToOne Item parent;+ @OneToMany(mappedBy = "parent")+ @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)+ List<Item> children = new ArrayList<>();+ public Item() {}+ Item(long id, String name, Item parent) { this.id = id; this.name = name; this.parent = parent; }+ }++ private static HazelcastInstance member(String cluster, String address) {+ var config = new Config().setClusterName(cluster);+ config.setProperty("hazelcast.logging.type", "slf4j");+ config.setProperty("hazelcast.partition.count", "17");+ config.getNetworkConfig().setPort(0);+ config.getNetworkConfig().getInterfaces().setEnabled(true).addInterface("127.0.0.1");+ config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);+ config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);+ if (address != null)+ config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(address);+ return Hazelcast.newHazelcastInstance(config);+ }++ private static SessionFactory factory(HazelcastInstance member, String database, String schema) {+ var registry = new StandardServiceRegistryBuilder()+ .applySetting("jakarta.persistence.jdbc.driver", "org.hsqldb.jdbc.JDBCDriver")+ .applySetting("jakarta.persistence.jdbc.url", database)+ .applySetting("jakarta.persistence.jdbc.user", "sa")+ .applySetting("jakarta.persistence.jdbc.password", "")+ .applySetting("jakarta.persistence.validation.mode", "none")+ .applySetting("hibernate.hbm2ddl.auto", schema)+ .applySetting("hibernate.hbm2ddl.halt_on_error", true)+ .applySetting("hibernate.cache.region.factory_class", HazelcastLocalCacheRegionFactory.class.getName())+ .applySetting("hibernate.cache.hazelcast.instance_name", member.getName())+ .applySetting("hibernate.cache.hazelcast.shutdown_on_session_factory_close", false)+ .applySetting("hibernate.cache.use_second_level_cache", true)+ .applySetting("hibernate.cache.use_query_cache", true)+ .applySetting("hibernate.cache.auto_evict_collection_cache", true)+ .applySetting("hibernate.generate_statistics", true).build();+ try {+ var sources = new MetadataSources(registry).addAnnotatedClass(Item.class);+ ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class).forEach(sources::addAnnotatedClass);+ return sources.getMetadataBuilder()+ .applyPhysicalNamingStrategy(new PrefixedNamingStrategy("o_"))+ .build().buildSessionFactory();+ } catch (RuntimeException | Error e) {+ StandardServiceRegistryBuilder.destroy(registry);+ throw e;+ }+ }++ private static boolean reads(SessionFactory factory, String name, int childCount) {+ try (var session = factory.openSession()) {+ var item = session.find(Item.class, 1L);+ return item.name.equals(name) && item.children.size() == childCount+ // A scalar query checks query invalidation independently of the entity cache.+ && session.createQuery("select name from ClusterCacheTestItem where id = 1", String.class)+ .setCacheable(true).getSingleResult().equals(name);+ }+ }++ private static void await(BooleanSupplier condition, String label) throws Exception {+ long deadline = System.nanoTime() + 10_000_000_000L;+ do {+ if (condition.getAsBoolean())+ return;+ Thread.sleep(20);+ } while (System.nanoTime() < deadline);+ throw new AssertionError(label);+ }++ @Test+ public void invalidatesLocalCachesAcrossMembersAndKeepsTheClusterAlive() throws Exception {+ String cluster = "cache-review-" + UUID.randomUUID();+ String database = "jdbc:hsqldb:mem:" + UUID.randomUUID();+ var first = member(cluster, null);+ HazelcastInstance second = null;+ try {+ second = member(cluster, "127.0.0.1:" + first.getCluster().getLocalMember().getAddress().getPort());+ await(() -> first.getCluster().getMembers().size() == 2, "Two-member cluster");+ try (var writer = factory(first, database, "create-drop"); var reader = factory(second, database, "validate")) {+ assertEquals(60_000L, writer.unwrap(SessionFactoryImplementor.class).getCache().getRegionFactory().getTimeout(),+ "Cache timeout must use Hazelcast's millisecond timestamps");+ try (var session = writer.openSession()) {+ var tx = session.beginTransaction();+ var parent = new Item(1, "Before", null);+ session.persist(parent);+ session.persist(new Item(2, "Child", parent));+ tx.commit();+ }+ await(() -> reads(reader, "Before", 1) && reader.getStatistics().getQueryCacheHitCount() > 0+ && reader.getStatistics().getDomainDataRegionStatistics(Item.class.getName()).getHitCount() > 0+ && reader.getStatistics().getDomainDataRegionStatistics(Item.class.getName() + ".children").getHitCount() > 0,+ "Remote entity, collection, and query cache warm-up");+ try (var session = writer.openSession()) {+ var tx = session.beginTransaction();+ var parent = session.find(Item.class, 1L);+ parent.name = "After";+ session.persist(new Item(3, "New child", parent));+ tx.commit();+ }+ await(() -> reads(reader, "After", 2), "Cross-member entity, collection, and query invalidation");+ try (var session = writer.openSession()) {+ var tx = session.beginTransaction();+ session.createMutationQuery("update ClusterCacheTestItem set name = 'Bulk' where id = 1").executeUpdate();+ tx.commit();+ }+ await(() -> reads(reader, "Bulk", 2), "Cross-member bulk-update invalidation");+ }+ assertTrue(first.getLifecycleService().isRunning() && second.getLifecycleService().isRunning(), "Closing Hibernate must keep both shared members alive");+ } finally {+ if (second != null)+ second.shutdown();+ first.shutdown();+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateConfigTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateConfigTest.javanew file mode 100644index 0000000000..2a13e0ba1f--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateConfigTest.java@@ -0,0 +1,46 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.*;++import java.nio.file.Files;+import java.nio.file.Path;++import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.io.TempDir;++public class HibernateConfigTest {+ @TempDir+ public Path temporary;++ @Test+ public void translatesLegacyConnectionSettingsAndPreservesExplicitModernSettings() throws Exception {+ var install = Files.createDirectory(temporary.resolve("install"));+ Files.createDirectories(install.resolve("conf"));+ var properties = install.resolve("conf/hibernate.properties");+ Files.writeString(properties,+ "hibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver\n"+ + "hibernate.connection.url=jdbc:hsqldb:file:${installDir}/data/database\n"+ + "hibernate.connection.username=legacy-user\n"+ + "hibernate.connection.password=legacy-password\n"+ + "hibernate.cache.region.factory_class=com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory\n");+ var legacy = new HibernateConfig(install.toFile());+ assertEquals("org.hsqldb.jdbc.JDBCDriver", legacy.getDriver());+ assertEquals("jdbc:hsqldb:file:" + install + "/data/database", legacy.getUrl());+ assertEquals("legacy-user", legacy.getUser());+ assertEquals("legacy-password", legacy.getPassword());+ assertFalse(legacy.containsKey("hibernate.connection.url"));+ assertEquals(legacy.getUrl(), legacy.getProperty("jakarta.persistence.jdbc.url"));+ assertEquals("com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory",+ legacy.getProperty("hibernate.cache.region.factory_class"));++ Files.writeString(properties, Files.readString(properties)+ + "jakarta.persistence.jdbc.url=jdbc:hsqldb:mem:explicit\n"+ + "jakarta.persistence.jdbc.user=explicit-user\n"+ + "hibernate.cache.region.factory_class=example.CustomRegionFactory\n");+ var modern = new HibernateConfig(install.toFile());+ assertEquals("jdbc:hsqldb:mem:explicit", modern.getUrl());+ assertEquals("explicit-user", modern.getUser());+ assertEquals("legacy-password", modern.getPassword());+ assertEquals("example.CustomRegionFactory", modern.getProperty("hibernate.cache.region.factory_class"));+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateOrmUpgradeTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateOrmUpgradeTest.javanew file mode 100644index 0000000000..90baeacb45--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateOrmUpgradeTest.java@@ -0,0 +1,157 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.*;++import java.lang.reflect.Proxy;+import java.util.ArrayList;+import java.util.List;+import java.util.UUID;+import java.util.concurrent.atomic.AtomicLong;++import jakarta.persistence.Entity;+import jakarta.persistence.ManyToOne;+import jakarta.persistence.criteria.JoinType;++import org.apache.commons.lang3.SerializationUtils;+import org.hibernate.boot.MetadataSources;+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;+import org.hibernate.id.IdentifierGenerator;+import org.hibernate.mapping.SimpleValue;+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;+import org.junit.jupiter.api.Test;++import io.onedev.commons.utils.ClassUtils;+import io.onedev.server.event.ListenerRegistry;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.persistence.dao.DefaultDao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.persistence.dao.MatchMode;+import io.onedev.server.persistence.dao.Order;+import io.onedev.server.persistence.dao.Restrictions;++public class HibernateOrmUpgradeTest {+ private StandardServiceRegistryBuilder registryBuilder() {+ return new StandardServiceRegistryBuilder()+ .applySetting("hibernate.connection.driver_class", "org.hsqldb.jdbc.JDBCDriver")+ .applySetting("hibernate.connection.url", "jdbc:hsqldb:mem:" + UUID.randomUUID())+ .applySetting("hibernate.connection.username", "sa")+ .applySetting("hibernate.connection.password", "")+ .applySetting("hibernate.cache.use_second_level_cache", false)+ .applySetting("jakarta.persistence.validation.mode", "none");+ }++ @Test+ public void bootsAllProductionEntityMappings() {+ var registry = registryBuilder()+ .applySetting("hibernate.hbm2ddl.auto", "create-drop")+ .applySetting("hibernate.hbm2ddl.halt_on_error", true)+ .applySetting("hibernate.format_sql", true).build();+ try {+ var sources = new MetadataSources(registry);+ var entities = ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class);+ assertTrue(entities.size() > 50, "No production entities found");+ entities.forEach(sources::addAnnotatedClass);+ var metadata = sources.getMetadataBuilder()+ .applyPhysicalNamingStrategy(new PrefixedNamingStrategy("o_")).build();+ assertFalse(new SchemaCreatorImpl(registry).generateCreationCommands(metadata, false).isEmpty());+ try (var factory = metadata.buildSessionFactory()) {+ assertTrue(factory.isOpen());+ }+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ }+ }++ @Test+ public void queriesAndPersistsThroughTheDao() {+ var registry = registryBuilder().applySetting("hibernate.hbm2ddl.auto", "create-drop").build();+ try {+ var metadata = new MetadataSources(registry).addAnnotatedClass(Item.class).buildMetadata();+ var ids = new AtomicLong();+ // Isolate identifier allocation from OneDev's running application services.+ ((SimpleValue) metadata.getEntityBinding(Item.class.getName()).getIdentifier())+ .setCustomIdGeneratorCreator(context -> (IdentifierGenerator) (session, object) -> ids.incrementAndGet());+ try (var factory = metadata.buildSessionFactory(); var session = factory.openSession()) {+ var events = new ArrayList<>();+ var sessions = (SessionService) Proxy.newProxyInstance(getClass().getClassLoader(),+ new Class<?>[] {SessionService.class}, (proxy, method, args) -> {+ if (method.getName().equals("getSession")) return session;+ throw new UnsupportedOperationException(method.getName());+ });+ var dao = new DefaultDao(sessions, new ListenerRegistry() {+ public void post(Object event) { events.add(event); }+ public void invokeListeners(Object event) {}+ });+ var tx = session.beginTransaction();+ var parent = new Item("Parent", null);+ var first = new Item("Alpha", parent);+ var second = new Item("Beta", parent);+ dao.persist(parent);+ dao.persist(first);+ dao.persist(second);+ tx.commit();+ assertEquals(3, events.size());+ session.clear();++ // OD-2706: serialization of an initialized Hibernate proxy yields the+ // entity itself. Commons Lang must not cast it to the generated proxy class.+ var reference = session.getReference(Item.class, first.getId());+ assertFalse(org.hibernate.Hibernate.isInitialized(reference));+ org.hibernate.Hibernate.initialize(reference);+ var cloned = SerializationUtils.clone(reference);+ assertNotSame(reference, cloned);+ assertEquals(Item.class, cloned.getClass());+ assertEquals(first.getId(), cloned.getId());+ assertEquals("Alpha", cloned.name);+ session.clear();++ var criteria = EntityCriteria.of(Item.class, "item");+ criteria.createAlias("item.parent", "parent", JoinType.LEFT);+ criteria.add(Restrictions.or(Restrictions.ilike("name", "AL", MatchMode.ANYWHERE),+ Restrictions.eq("parent.name", "Parent")));+ criteria.addOrder(Order.desc("name"));+ criteria = SerializationUtils.clone(criteria);+ assertEquals(List.of("Beta", "Alpha"), dao.query(criteria).stream().map(it -> it.name).toList());+ assertEquals(2, dao.count(criteria));+ assertEquals("Alpha", dao.query(criteria, 1, 1).get(0).name);+ assertEquals("Beta", dao.find(criteria).name);+ var nested = EntityCriteria.of(Item.class);+ nested.createCriteria("parent").add(Restrictions.eq("name", "Parent"));+ assertEquals(2, dao.count(nested));+ assertEquals(0, dao.count(EntityCriteria.of(Item.class).add(Restrictions.in("id", List.of()))));++ tx = session.beginTransaction();+ var managed = dao.get(Item.class, first.getId());+ managed.name = "Updated";+ dao.persist(managed);+ tx.commit();+ session.clear();+ assertEquals("Updated", dao.get(Item.class, first.getId()).name);+ session.clear();++ first.name = "Merged";+ tx = session.beginTransaction();+ dao.persist(first);+ tx.commit();+ session.clear();+ assertEquals("Merged", dao.get(Item.class, first.getId()).name);+ tx = session.beginTransaction();+ dao.remove(dao.get(Item.class, second.getId()));+ tx.commit();+ session.clear();+ assertNull(dao.get(Item.class, second.getId()));+ }+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ }+ }++ @Entity(name = "UpgradeTestItem")+ public static class Item extends AbstractEntity {+ private String name;+ @ManyToOne+ private Item parent;+ public Item() {}+ Item(String name, Item parent) { this.name = name; this.parent = parent; }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.java b/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.javanew file mode 100644index 0000000000..9af7faf308--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/HibernateSchemaTest.java@@ -0,0 +1,342 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.*;++import java.io.BufferedReader;+import java.io.InputStreamReader;+import java.lang.reflect.Proxy;+import java.nio.charset.StandardCharsets;+import java.nio.file.Files;+import java.nio.file.Path;+import java.sql.Connection;+import java.sql.ResultSet;+import java.sql.SQLException;+import java.sql.Statement;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;+import java.util.TreeMap;+import java.util.TreeSet;+import java.util.UUID;+import java.util.stream.Collectors;++import org.apache.commons.io.FileUtils;+import org.apache.commons.lang3.SerializationUtils;+import org.hibernate.boot.MetadataSources;+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;+import org.junit.jupiter.api.Test;++import io.onedev.commons.utils.ClassUtils;+import io.onedev.server.data.DefaultDataService;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Setting;++public class HibernateSchemaTest {++ @Test+ public void exportsSchemaForEverySupportedDialect() throws Exception {+ for (var dialect : List.of("org.hibernate.dialect.HSQLDialect", "org.hibernate.dialect.MySQLDialect",+ "org.hibernate.dialect.MariaDBDialect", "io.onedev.server.persistence.PostgreSQLDialect")) {+ var registry = new StandardServiceRegistryBuilder()+ .applySetting("hibernate.dialect", dialect)+ .applySetting("hibernate.boot.allow_jdbc_metadata_access", false)+ .applySetting("hibernate.cache.use_second_level_cache", false)+ .applySetting("hibernate.format_sql", true).build();+ var installDir = Files.createTempDirectory("onedev-dialect-test");+ try {+ Files.createDirectories(installDir.resolve("conf"));+ Files.writeString(installDir.resolve("conf/hibernate.properties"),+ "hibernate.dialect=" + dialect + "\nhibernate.connection.url=jdbc:unused\n");+ var sources = new MetadataSources(registry);+ ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class).forEach(sources::addAnnotatedClass);+ var metadata = sources.getMetadataBuilder().applyPhysicalNamingStrategy(new PrefixedNamingStrategy("o_")).build();+ var factories = new DefaultSessionFactoryService();+ inject(factories, "metadata", metadata);+ var data = new DefaultDataService();+ inject(data, "sessionFactoryService", factories);+ inject(data, "hibernateConfig", new HibernateConfig(installDir.toFile()));+ var sql = new ArrayList<String>();+ var statement = Proxy.newProxyInstance(getClass().getClassLoader(),+ new Class<?>[] {Statement.class}, (proxy, method, args) -> {+ if (method.getName().equals("close")) return null;+ if (method.getName().equals("execute")) { sql.add((String) args[0]); return false; }+ throw new UnsupportedOperationException(method.getName());+ });+ var connection = (Connection) Proxy.newProxyInstance(getClass().getClassLoader(),+ new Class<?>[] {Connection.class}, (proxy, method, args) -> {+ if (method.getName().equals("createStatement")) return statement;+ throw new UnsupportedOperationException(method.getName());+ });+ data.createTables(connection);+ assertEquals(99, sql.stream().filter(command -> command.startsWith("create table ")).count(), dialect);+ assertTrue(sql.stream().noneMatch(command -> command.contains(" foreign key ")));+ if (dialect.equals("io.onedev.server.persistence.PostgreSQLDialect")) {+ assertTrue(sql.stream().anyMatch(command -> command.contains(" bytea")));+ assertTrue(sql.stream().noneMatch(command -> command.contains(" oid")));+ }+ var script = new ArrayList<>(sql);+ sql.clear();+ data.applyConstraints(connection);+ assertEquals(179, sql.size(), dialect);+ assertTrue(sql.stream().allMatch(command -> command.contains(" foreign key ")));+ script.addAll(sql);+ sql.clear();+ data.dropConstraints(connection);+ assertEquals(179, sql.size(), dialect);+ var dropKeyword = dialect.contains("MySQL") || dialect.contains("MariaDB")+ ? " drop foreign key " : " drop constraint ";+ assertTrue(sql.stream().allMatch(command -> command.contains(dropKeyword)), dialect);+ script.addAll(sql);+ sql.clear();+ data.cleanDatabase(connection);+ assertEquals(99, sql.stream().filter(command -> command.startsWith("drop table ")).count(), dialect);+ script.addAll(sql);+ for (var command : script) {+ assertFalse(command.isBlank() || command.contains("\n") || command.contains("\r"), command);+ assertFalse(command.contains("o_o_"), command);+ }+ var output = Path.of("target", "schema-audit");+ Files.createDirectories(output);+ Files.write(output.resolve(dialect.substring(dialect.lastIndexOf('.') + 1) + ".sql"), script);+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ FileUtils.deleteDirectory(installDir.toFile());+ }+ }+ }++ @Test+ public void createsValidatesAndRecreatesProductionSchema() throws Exception {+ var registry = new StandardServiceRegistryBuilder().disableAutoClose()+ .applySetting("hibernate.connection.driver_class", "org.hsqldb.jdbc.JDBCDriver")+ .applySetting("hibernate.connection.url", "jdbc:hsqldb:mem:" + UUID.randomUUID())+ .applySetting("hibernate.connection.username", "sa")+ .applySetting("hibernate.connection.password", "")+ .applySetting("hibernate.cache.use_second_level_cache", false)+ .applySetting("hibernate.format_sql", true)+ .applySetting("hibernate.hbm2ddl.auto", "validate")+ .applySetting("jakarta.persistence.validation.mode", "none")+ .build();+ var installDir = Files.createTempDirectory("onedev-schema-test");+ try {+ Files.createDirectories(installDir.resolve("conf"));+ Files.writeString(installDir.resolve("conf/hibernate.properties"),+ "hibernate.dialect=org.hibernate.dialect.HSQLDialect\n"+ + "hibernate.connection.url=jdbc:hsqldb:mem:unused\n");+ var naming = new PrefixedNamingStrategy("o_");+ var sources = new MetadataSources(registry);+ var entities = ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class);+ entities.removeIf(entity -> !entity.isAnnotationPresent(jakarta.persistence.Entity.class));+ assertTrue(entities.size() > 90, "Production entity discovery failed");+ entities.forEach(sources::addAnnotatedClass);+ var metadata = sources.getMetadataBuilder().applyPhysicalNamingStrategy(naming).build();+ var factories = new DefaultSessionFactoryService();+ inject(factories, "metadata", metadata);+ var data = new DefaultDataService();+ inject(data, "sessionFactoryService", factories);+ inject(data, "physicalNamingStrategy", naming);+ inject(data, "hibernateConfig", new HibernateConfig(installDir.toFile()));+ var connections = registry.getService(org.hibernate.engine.jdbc.connections.spi.ConnectionProvider.class);+ try (var connection = connections.getConnection()) {+ data.createTables(connection);+ assertEquals(0, foreignKeyCount(connection));+ data.applyConstraints(connection);+ assertConstraintEnforcement(connection);+ var snapshot = snapshot(connection);+ assertTrue(foreignKeyCount(connection) > 100);+ var output = Path.of("target", "schema-audit");+ Files.createDirectories(output);+ Files.write(output.resolve("schema.tsv"), snapshot);+ try (var statement = connection.createStatement(); var result = statement.executeQuery("SCRIPT")) {+ var script = new ArrayList<String>();+ while (result.next()) script.add(result.getString(1));+ Files.write(output.resolve("schema.sql"), script);+ }+ for (var entity : entities) {+ assertEquals("o_" + entity.getSimpleName(), data.getTableName(entity));+ assertEquals(data.getTableName(entity), metadata.getEntityBinding(entity.getName()).getTable().getName());+ }+ assertEquals("o_id", data.getColumnName(AbstractEntity.PROP_ID));+ // Schema validation and real selects exercise mapped names, SQL types,+ // embedded values and associations against the database we just created.+ try (var factory = metadata.buildSessionFactory(); var session = factory.openSession()) {+ for (var entity : entities)+ assertTrue(session.createQuery("from " + entity.getSimpleName(), entity).setMaxResults(1).list().isEmpty());+ data.dropConstraints(connection);+ assertEquals(0, foreignKeyCount(connection));+ data.applyConstraints(connection);+ assertEquals(stableSnapshot(snapshot), stableSnapshot(snapshot(connection)));+ data.cleanDatabase(connection);+ assertTrue(tables(connection).isEmpty());+ data.createTables(connection);+ data.applyConstraints(connection);+ assertEquals(stableSnapshot(snapshot), stableSnapshot(snapshot(connection)));+ data.cleanDatabase(connection);+ assertTrue(tables(connection).isEmpty());+ }+ // Exercise an actual Hibernate 5 schema, including INTEGER enum columns+ // and bounded BLOB columns, with the upgraded ORM.+ try (var input = getClass().getResourceAsStream("hibernate5-schema.sql")) {+ assertNotNull(input);+ try (var reader = new BufferedReader(new InputStreamReader(input,+ StandardCharsets.UTF_8)); var statement = connection.createStatement()) {+ for (var sql : reader.lines().collect(Collectors.toList())) {+ if (!sql.startsWith("--") && !sql.isBlank()) statement.execute(sql);+ }+ }+ }+ var legacySnapshot = snapshot(connection);+ assertEquals(structure(snapshot), structure(legacySnapshot));+ assertConstraintEnforcement(connection);+ var legacyMetadata = sources.getMetadataBuilder().applyPhysicalNamingStrategy(naming).build();+ inject(factories, "metadata", legacyMetadata);+ try (var factory = legacyMetadata.buildSessionFactory(); var session = factory.openSession()) {+ for (var entity : entities)+ assertTrue(session.createQuery("from " + entity.getSimpleName(), entity).setMaxResults(1).list().isEmpty());+ var key = Setting.Key.SYSTEM;+ try (var insert = connection.prepareStatement("insert into o_Setting (o_id, o_key, o_value) values (?, ?, ?)")) {+ insert.setLong(1, 1);+ insert.setInt(2, key.ordinal());+ insert.setBytes(3, SerializationUtils.serialize("legacy setting"));+ insert.executeUpdate();+ }+ var setting = session.find(Setting.class, 1L);+ assertEquals(key, setting.getKey());+ assertEquals("legacy setting", setting.getValue());+ var tx = session.beginTransaction();+ setting.setKey(Setting.Key.BACKUP);+ setting.setValue("updated setting");+ tx.commit();+ session.clear();+ setting = session.find(Setting.class, 1L);+ assertEquals(Setting.Key.BACKUP, setting.getKey());+ assertEquals("updated setting", setting.getValue());+ }+ data.cleanDatabase(connection);+ assertTrue(tables(connection).isEmpty());+ assertEquals(Integer.valueOf(1), PersistenceUtils.callWithLock(connection, () -> 1));+ assertEquals(Integer.valueOf(2), PersistenceUtils.callWithLock(connection, () -> 2));+ assertEquals(List.of("O_DATABASELOCK"), tables(connection));+ try (var statement = connection.createStatement(); var result = statement.executeQuery("select o_id from o_DatabaseLock")) {+ assertTrue(result.next());+ assertEquals(1, result.getInt(1));+ }+ System.out.println("Schema audit: " + entities.size() + " entities, " + snapshot.size() + " schema entries");+ }+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ FileUtils.deleteDirectory(installDir.toFile());+ }+ }++ private static void inject(Object target, String name, Object value) throws Exception {+ var field = target.getClass().getDeclaredField(name);+ field.setAccessible(true);+ field.set(target, value);+ }++ private static List<String> tables(Connection connection) throws SQLException {+ var tables = new ArrayList<String>();+ try (var result = connection.getMetaData().getTables(null, "PUBLIC", "%", new String[] {"TABLE"})) {+ while (result.next()) tables.add(result.getString("TABLE_NAME"));+ }+ return tables;+ }++ private static int foreignKeyCount(Connection connection) throws SQLException {+ int count = 0;+ for (var table : tables(connection)) {+ try (var result = connection.getMetaData().getImportedKeys(null, "PUBLIC", table)) {+ while (result.next()) count++;+ }+ }+ return count;+ }++ private static List<String> snapshot(Connection connection) throws SQLException {+ var rows = new TreeSet<String>();+ var jdbc = connection.getMetaData();+ for (var table : tables(connection)) {+ assertTrue(table.startsWith("O_") && !table.startsWith("O_O_"), table);+ rows.add("TABLE\t" + table);+ try (var result = jdbc.getColumns(null, "PUBLIC", table, "%")) {+ while (result.next()) {+ var column = result.getString("COLUMN_NAME");+ assertTrue(column.startsWith("O_") && !column.startsWith("O_O_"), table + "." + column);+ rows.add(row("COLUMN", table, result, "COLUMN_NAME", "DATA_TYPE", "TYPE_NAME",+ "COLUMN_SIZE", "DECIMAL_DIGITS", "NULLABLE", "COLUMN_DEF"));+ }+ }+ try (var result = jdbc.getPrimaryKeys(null, "PUBLIC", table)) {+ while (result.next()) rows.add(row("PRIMARY_KEY", table, result, "COLUMN_NAME", "KEY_SEQ"));+ }+ try (var result = jdbc.getIndexInfo(null, "PUBLIC", table, false, false)) {+ while (result.next()) rows.add(row("INDEX", table, result, "INDEX_NAME", "NON_UNIQUE",+ "COLUMN_NAME", "ORDINAL_POSITION", "ASC_OR_DESC"));+ }+ try (var result = jdbc.getImportedKeys(null, "PUBLIC", table)) {+ while (result.next()) rows.add(row("FOREIGN_KEY", table, result, "FK_NAME", "FKCOLUMN_NAME",+ "PKTABLE_NAME", "PKCOLUMN_NAME", "KEY_SEQ", "UPDATE_RULE", "DELETE_RULE"));+ }+ }+ return new ArrayList<>(rows);+ }++ private static void assertConstraintEnforcement(Connection connection) throws SQLException {+ try (var statement = connection.createStatement()) {+ statement.execute("insert into o_Setting(o_id, o_key) values(10, 0)");+ for (var sql : List.of("insert into o_Setting(o_id, o_key) values(10, 1)",+ "insert into o_Setting(o_id, o_key) values(11, 0)",+ "insert into o_Setting(o_id, o_key) values(11, null)",+ "insert into o_EmailAddress(o_id, o_primary, o_value, o_owner_id) values(1, false, '[email protected]', -1)")) {+ var failure = assertThrows(SQLException.class, () -> statement.execute(sql));+ assertTrue(failure.getSQLState().startsWith("23"), sql + ": " + failure.getMessage());+ }+ statement.execute("delete from o_Setting where o_id=10");+ }+ }++ private static List<String> structure(List<String> snapshot) {+ var rows = new ArrayList<String>();+ var indexes = new TreeMap<String, List<String>>();+ for (var row : snapshot) {+ var parts = row.split("\t");+ if (parts[0].equals("COLUMN")) {+ // Hibernate 7 narrows ordinal enums and increases HSQLDB BLOB capacity.+ // All other column attributes, including nullability/defaults, must match.+ if (parts[4].equals("BLOB")) parts[5] = "<capacity>";+ if (parts[4].equals("TINYINT")) {+ parts[3] = "4";+ parts[4] = "INTEGER";+ parts[5] = "32";+ }+ rows.add(String.join("\t", parts));+ } else if (parts[0].equals("INDEX")) {+ // Compare each complete index, preserving its column order and uniqueness.+ // HSQLDB now assigns system names to inline unique constraints.+ indexes.computeIfAbsent(parts[1] + "\t" + parts[2], key -> new ArrayList<>())+ .add(String.join("\t", parts[1], parts[3], parts[5], parts[4], parts[6]));+ } else {+ rows.add(row);+ }+ }+ for (var index : indexes.values()) {+ Collections.sort(index);+ rows.add("INDEX\t" + String.join(";", index));+ }+ Collections.sort(rows);+ return rows;+ }++ private static List<String> stableSnapshot(List<String> snapshot) {+ // HSQLDB assigns new internal names to primary/unnamed unique indexes on recreation.+ return snapshot.stream().map(row -> row.replaceAll("SYS_(PK|CT)_[0-9]+", "SYS_$1"))+ .sorted().collect(Collectors.toList());+ }++ private static String row(String kind, String table, ResultSet result, String... columns) throws SQLException {+ var row = new StringBuilder(kind).append('\t').append(table);+ for (var column : columns) row.append('\t').append(result.getString(column));+ return row.toString();+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/IdentifierMigrationTest.java b/server-core/src/test/java/io/onedev/server/persistence/IdentifierMigrationTest.javanew file mode 100644index 0000000000..65a717aec1--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/IdentifierMigrationTest.java@@ -0,0 +1,87 @@+package io.onedev.server.persistence;++import static org.junit.jupiter.api.Assertions.*;++import java.util.UUID;+import java.util.concurrent.atomic.AtomicLong;++import org.hibernate.boot.MetadataSources;+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;+import org.junit.jupiter.api.Test;++import com.google.inject.AbstractModule;+import com.google.inject.Guice;++import io.onedev.commons.loader.AppLoader;+import io.onedev.server.persistence.HibernateOrmUpgradeTest.Item;++public class IdentifierMigrationTest {+ @Test+ public void generatedImportedAndReservedIdsKeepTheirSemantics() {+ var previousInjector = AppLoader.injector;+ var allocated = new AtomicLong();+ AppLoader.injector = Guice.createInjector(new AbstractModule() {+ @Override+ protected void configure() {+ bind(IdService.class).toInstance(new IdService() {+ public void init() {}+ public long nextId(Class<?> type) { return allocated.incrementAndGet(); }+ public void useId(Class<?> type, long id) {}+ });+ }+ });+ var registry = new StandardServiceRegistryBuilder()+ .applySetting("jakarta.persistence.jdbc.driver", "org.hsqldb.jdbc.JDBCDriver")+ .applySetting("jakarta.persistence.jdbc.url", "jdbc:hsqldb:mem:" + UUID.randomUUID())+ .applySetting("jakarta.persistence.jdbc.user", "sa")+ .applySetting("hibernate.hbm2ddl.auto", "create-drop")+ .applySetting("hibernate.cache.use_second_level_cache", false)+ .applySetting("jakarta.persistence.validation.mode", "none").build();+ try (var factory = new MetadataSources(registry).addAnnotatedClass(Item.class)+ .buildMetadata().buildSessionFactory()) {+ try (var session = factory.openSession()) {+ var tx = session.beginTransaction();+ var generated = new Item("Generated", null);+ session.persist(generated);+ tx.commit();+ assertEquals(Long.valueOf(1), generated.getId());+ }+ var parent = new Item("Imported parent", null);+ parent.setId(400L);+ var child = new Item("Imported child", parent);+ child.setId(401L);+ try (var session = factory.openStatelessSession()) {+ var tx = session.beginTransaction();+ session.insert(parent);+ session.insert(child);+ tx.commit();+ }+ try (var session = factory.openSession()) {+ assertEquals(Long.valueOf(400), session.createQuery(+ "select parent.id from UpgradeTestItem where id=401", Long.class).getSingleResult());+ var tx = session.beginTransaction();+ var updated = new Item("Updated parent", null);+ updated.setId(400L);+ session.merge(updated);+ var reserved = new Item("System", null);+ reserved.setId(-1L);+ session.merge(reserved);+ tx.commit();+ session.clear();+ assertEquals("Updated parent", session.createQuery(+ "select name from UpgradeTestItem where id=400", String.class).getSingleResult());+ assertNotNull(session.find(Item.class, -1L));+ assertEquals(4L, (long) session.createQuery("select count(*) from UpgradeTestItem", Long.class).getSingleResult());+ }+ try (var session = factory.openStatelessSession()) {+ var tx = session.beginTransaction();+ assertThrows(org.hibernate.exception.ConstraintViolationException.class, () -> session.insert(parent));+ tx.rollback();+ }+ assertEquals(1, allocated.get(), "Assigned IDs must not consume generated IDs");+ } finally {+ StandardServiceRegistryBuilder.destroy(registry);+ AppLoader.injector = previousInjector;+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/persistence/hibernate5-schema.sql b/server-core/src/test/java/io/onedev/server/persistence/hibernate5-schema.sqlnew file mode 100644index 0000000000..a1a4d19c61--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/persistence/hibernate5-schema.sql@@ -0,0 +1,323 @@+-- Generated from commit 46a7f8af2afb0aa76792e5e519a6a53ceeddcd51 with Hibernate 5.4.24.Final.+-- Empty HSQLDB schema created through DefaultDataService.createTables/applyConstraints.+CREATE MEMORY TABLE PUBLIC.O_ACCESSTOKEN(O_ID BIGINT NOT NULL PRIMARY KEY,O_CREATEDATE TIMESTAMP,O_EXPIREDATE TIMESTAMP,O_HASOWNERPERMISSIONS BOOLEAN NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_VALUE VARCHAR(255) NOT NULL,O_OWNER_ID BIGINT NOT NULL,CONSTRAINT UKI14G13HKG7DC38R454ET3SJ76 UNIQUE(O_OWNER_ID,O_NAME),CONSTRAINT UK_2LXIOKEJP3YJQ3QMXY2J2X9C6 UNIQUE(O_VALUE))+CREATE INDEX IDXR88828I98OG1JW6LMKEHIYFYU ON PUBLIC.O_ACCESSTOKEN(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_ACCESSTOKENAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_PROJECT_ID BIGINT NOT NULL,O_ROLE_ID BIGINT NOT NULL,O_TOKEN_ID BIGINT NOT NULL,CONSTRAINT UKHPJ8UVV39S91TOMLM5FL7RECT UNIQUE(O_TOKEN_ID,O_PROJECT_ID,O_ROLE_ID),CONSTRAINT FKITCP3NK07LT4IWT15O3T3F47T FOREIGN KEY(O_TOKEN_ID) REFERENCES PUBLIC.O_ACCESSTOKEN(O_ID))+CREATE MEMORY TABLE PUBLIC.O_AGENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_CPUCOUNT INTEGER NOT NULL,O_IPADDRESS VARCHAR(255) NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_OSARCH VARCHAR(255) NOT NULL,O_OSNAME VARCHAR(255) NOT NULL,O_OSVERSION VARCHAR(255) NOT NULL,O_PAUSED BOOLEAN NOT NULL,O_LASTUSEDDATE_ID BIGINT NOT NULL,O_TOKEN_ID BIGINT NOT NULL,CONSTRAINT UK_9DO73EEDOE8MVBV5HWX3JCKAA UNIQUE(O_LASTUSEDDATE_ID),CONSTRAINT UK_FNCBIEXQMEP7JAJ4BLIO1AACP UNIQUE(O_TOKEN_ID))+CREATE INDEX IDXAP706VW6D3J08VSY4MHFMBQ25 ON PUBLIC.O_AGENT(O_IPADDRESS)+CREATE INDEX IDXQPPB69FT1U7SG96ANUK8EQK41 ON PUBLIC.O_AGENT(O_PAUSED)+CREATE INDEX IDXJUCYDDSTX7IDQTB0938CRIA0U ON PUBLIC.O_AGENT(O_NAME)+CREATE INDEX IDX8JN1PGBJ8RDM6F9Q7CYVUWQJK ON PUBLIC.O_AGENT(O_OSNAME)+CREATE INDEX IDXAEPDTUGUMNJXFKY3TJVNEV3HJ ON PUBLIC.O_AGENT(O_OSVERSION)+CREATE INDEX IDXHJW7AC1CR3733KHYUFIH6CR3Q ON PUBLIC.O_AGENT(O_OSARCH)+CREATE MEMORY TABLE PUBLIC.O_AGENTATTRIBUTE(O_ID BIGINT NOT NULL PRIMARY KEY,O_NAME VARCHAR(255) NOT NULL,O_VALUE VARCHAR(255) NOT NULL,O_AGENT_ID BIGINT NOT NULL,CONSTRAINT UKQ7RHM946FYXCQD1MVCELOOA7V UNIQUE(O_AGENT_ID,O_NAME),CONSTRAINT FKH4F3MUUBCRBC18EEUEIJ82QIP FOREIGN KEY(O_AGENT_ID) REFERENCES PUBLIC.O_AGENT(O_ID))+CREATE INDEX IDXLSX4RK8XDYCH9WX7KO0TPRY58 ON PUBLIC.O_AGENTATTRIBUTE(O_NAME)+CREATE INDEX IDX16PMMOTFHV1K1ES5RLG6OK74G ON PUBLIC.O_AGENTATTRIBUTE(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_AGENTLASTUSEDDATE(O_ID BIGINT NOT NULL PRIMARY KEY,O_VALUE TIMESTAMP)+CREATE INDEX IDXMNBGKY6MR2H345AWQWEFQKC52 ON PUBLIC.O_AGENTLASTUSEDDATE(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_AGENTTOKEN(O_ID BIGINT NOT NULL PRIMARY KEY,O_VALUE VARCHAR(255) NOT NULL,CONSTRAINT UK_58W50N6W66K0F3WOQ665J0FC1 UNIQUE(O_VALUE))+CREATE INDEX IDX3DEH28J787BJYQWVRMP4SJ3EH ON PUBLIC.O_AGENTTOKEN(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_ALERT(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP,O_DETAIL VARCHAR(10000),O_MAILERROR BOOLEAN NOT NULL,O_SUBJECT VARCHAR(255) NOT NULL,CONSTRAINT UK_QAJUVQ4N44ACH5TG3DIC08PCS UNIQUE(O_SUBJECT))+CREATE INDEX IDX93BKPN0J9B77YRH93BJ3P9FYB ON PUBLIC.O_ALERT(O_DATE)+CREATE INDEX IDXTIKQL7MBBQYBPXCDN7IX7JXBE ON PUBLIC.O_ALERT(O_SUBJECT)+CREATE MEMORY TABLE PUBLIC.O_AUDIT(O_ID BIGINT NOT NULL PRIMARY KEY,O_ACTION VARCHAR(512) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_NEWCONTENT VARCHAR(1048576),O_OLDCONTENT VARCHAR(1048576),O_PROJECT_ID BIGINT,O_USER_ID BIGINT NOT NULL)+CREATE INDEX IDXIPCXFRC5A3CPT80RJ80EWM57X ON PUBLIC.O_AUDIT(O_DATE)+CREATE INDEX IDXIW63NY9QA6WM7HK8RAV5R2U7R ON PUBLIC.O_AUDIT(O_ACTION)+CREATE MEMORY TABLE PUBLIC.O_BASEAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_PROJECT_ID BIGINT NOT NULL,O_ROLE_ID BIGINT NOT NULL,CONSTRAINT UKHMU9JMCDC5Q0HJ668YYPNM946 UNIQUE(O_PROJECT_ID,O_ROLE_ID))+CREATE MEMORY TABLE PUBLIC.O_BUILD(O_ID BIGINT NOT NULL PRIMARY KEY,O_CHECKOUTPATHS BLOB(255) NOT NULL,O_COMMITHASH VARCHAR(255) NOT NULL,O_DESCRIPTION VARCHAR(12000),O_FINISHDATE TIMESTAMP,O_FINISHDAY INTEGER,O_FINISHMONTH INTEGER,O_FINISHWEEK INTEGER,O_JOBNAME VARCHAR(255) NOT NULL,O_NUMBER BIGINT NOT NULL,O_PAUSED BOOLEAN NOT NULL,O_PENDINGDATE TIMESTAMP,O_PENDINGDURATION BIGINT,O_REFNAME VARCHAR(255) NOT NULL,O_RETRYDATE TIMESTAMP,O_RUNNINGDATE TIMESTAMP,O_RUNNINGDURATION BIGINT,O_STATUS INTEGER NOT NULL,O_SUBMITDATE TIMESTAMP NOT NULL,O_SUBMITREASON VARCHAR(1000) NOT NULL,O_SUBMITSEQUENCE BIGINT NOT NULL,O_TOKEN VARCHAR(255) NOT NULL,O_UUID VARCHAR(255) NOT NULL,O_VERSION VARCHAR(255),O_WORKDIRPATH VARCHAR(255),O_AGENT_ID BIGINT,O_CANCELLER_ID BIGINT,O_ISSUE_ID BIGINT,O_NUMBERSCOPE_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT,O_SUBMITTER_ID BIGINT NOT NULL,CONSTRAINT UK82YGWPRW67QNO3KBRM6B4XKN5 UNIQUE(O_NUMBERSCOPE_ID,O_NUMBER),CONSTRAINT FK4425AH37KKQQL9AFRXJ3J9S01 FOREIGN KEY(O_AGENT_ID) REFERENCES PUBLIC.O_AGENT(O_ID))+CREATE INDEX IDXE22XK8YNBAMUUNNN3MWWGIYKL ON PUBLIC.O_BUILD(O_COMMITHASH)+CREATE INDEX IDX1LDY4IGHE17ORC41XNF6O7CEG ON PUBLIC.O_BUILD(O_NUMBER)+CREATE INDEX IDXDIA13NKDKHM1EGRU54XX7HFOC ON PUBLIC.O_BUILD(O_JOBNAME)+CREATE INDEX IDXNC0BK4W928296P1V6RODD4600 ON PUBLIC.O_BUILD(O_STATUS)+CREATE INDEX IDXAH0M79L3MV268NYAV19MRQUMQ ON PUBLIC.O_BUILD(O_REFNAME)+CREATE INDEX IDXQFVUV5RRHU10DP5YNL9FD3N09 ON PUBLIC.O_BUILD(O_SUBMITDATE)+CREATE INDEX IDXIC0DJMNWQJPLNS4S1HNR66K04 ON PUBLIC.O_BUILD(O_PENDINGDATE)+CREATE INDEX IDXRNP2LODNO1XQE63U6W4ORCGNX ON PUBLIC.O_BUILD(O_RUNNINGDATE)+CREATE INDEX IDXQG9XIGWIQUB9P0PY1A731NPWD ON PUBLIC.O_BUILD(O_FINISHDATE)+CREATE INDEX IDXBIA932803V60LHTJUEOJDALUW ON PUBLIC.O_BUILD(O_FINISHMONTH)+CREATE INDEX IDXNJE0JX62Y3524L51EYAYFQW4B ON PUBLIC.O_BUILD(O_FINISHWEEK)+CREATE INDEX IDX993GUWBJ10D0R6R3V4QHOA7SY ON PUBLIC.O_BUILD(O_FINISHDAY)+CREATE INDEX IDXD9C70VLPIDMKLDTW1I7AO6ODW ON PUBLIC.O_BUILD(O_VERSION)+CREATE INDEX IDXGA4UR2Y797A1VDXT5R0PG60GN ON PUBLIC.O_BUILD(O_PROJECT_ID,O_COMMITHASH)+CREATE MEMORY TABLE PUBLIC.O_BUILDDEPENDENCE(O_ID BIGINT NOT NULL PRIMARY KEY,O_ARTIFACTS VARCHAR(255),O_DESTINATIONPATH VARCHAR(255),O_REQUIRESUCCESSFUL BOOLEAN NOT NULL,O_DEPENDENCY_ID BIGINT NOT NULL,O_DEPENDENT_ID BIGINT NOT NULL,CONSTRAINT UKTFG0Y3RH09B62NVVJSI2FC2DJ UNIQUE(O_DEPENDENT_ID,O_DEPENDENCY_ID),CONSTRAINT FKIV1176TCQP3R8L1LWBYHTA01Y FOREIGN KEY(O_DEPENDENCY_ID) REFERENCES PUBLIC.O_BUILD(O_ID),CONSTRAINT FKNNIF4YDIGU70PWJKN7KW643M7 FOREIGN KEY(O_DEPENDENT_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE MEMORY TABLE PUBLIC.O_BUILDLABEL(O_ID BIGINT NOT NULL PRIMARY KEY,O_BUILD_ID BIGINT NOT NULL,O_SPEC_ID BIGINT NOT NULL,CONSTRAINT UKKMI55J28EGP6B4IV4HKYQRNGP UNIQUE(O_BUILD_ID,O_SPEC_ID),CONSTRAINT FKQV458FX3DXQMQX86UCY6II4IP FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE MEMORY TABLE PUBLIC.O_BUILDPARAM(O_ID BIGINT NOT NULL PRIMARY KEY,O_NAME VARCHAR(255) NOT NULL,O_TYPE VARCHAR(255) NOT NULL,O_VALUE VARCHAR(500),O_BUILD_ID BIGINT NOT NULL,CONSTRAINT UKFAJTEJD16E3J0E2UFNR134785 UNIQUE(O_BUILD_ID,O_NAME,O_VALUE),CONSTRAINT FKC41FRTEF950HGQBW54VMMAXDP FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE INDEX IDXLG2O1KO8AXHPFUL0N4NJWX05J ON PUBLIC.O_BUILDPARAM(O_NAME)+CREATE INDEX IDXD9WVTMVECTTTPKK3XBO7PWRXW ON PUBLIC.O_BUILDPARAM(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_BUILDQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKT8Q3LGAEA3OUH2YJMFI7QOQ62 UNIQUE(O_PROJECT_ID,O_USER_ID))+CREATE MEMORY TABLE PUBLIC.O_CHAT(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_TITLE VARCHAR(255) NOT NULL,O_AI_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL)+CREATE MEMORY TABLE PUBLIC.O_CHATMESSAGE(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT VARCHAR(100000) NOT NULL,O_ERROR BOOLEAN NOT NULL,O_REQUEST BOOLEAN NOT NULL,O_CHAT_ID BIGINT NOT NULL,CONSTRAINT FKJAUGNF8TTTQBDNJMQY1VNOFTS FOREIGN KEY(O_CHAT_ID) REFERENCES PUBLIC.O_CHAT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_NEWCOMMITHASH VARCHAR(255) NOT NULL,O_OLDCOMMITHASH VARCHAR(255) NOT NULL,O_PATHFILTER VARCHAR(255),O_WHITESPACEOPTION INTEGER NOT NULL,O_CONTENT VARCHAR(100000) NOT NULL,O_CREATEDATE TIMESTAMP NOT NULL,O_LAST_ACTIVITY_DATE TIMESTAMP NOT NULL,O_LAST_ACTIVITY_DESCRIPTION VARCHAR(255) NOT NULL,O_COMMITHASH VARCHAR(255) NOT NULL,O_PATH VARCHAR(255) NOT NULL,O_RANGE VARBINARY(255) NOT NULL,O_REPLYCOUNT INTEGER NOT NULL,O_RESOLVED BOOLEAN NOT NULL,O_UUID VARCHAR(255) NOT NULL,O_PULLREQUEST_ID BIGINT,O_LAST_ACTIVITY_USER BIGINT,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL)+CREATE INDEX IDXR4HINREDTXPKDR6C63HDI38A4 ON PUBLIC.O_CODECOMMENT(O_COMMITHASH)+CREATE INDEX IDXI9A5PWJGF8GD9PHCISCRRI8W3 ON PUBLIC.O_CODECOMMENT(O_PATH)+CREATE INDEX IDX52M07AVOSEQ24WD4LPKTUM45I ON PUBLIC.O_CODECOMMENT(O_CREATEDATE)+CREATE INDEX IDXM348DV3HN3S4KRGFW4DKBCLIE ON PUBLIC.O_CODECOMMENT(O_LAST_ACTIVITY_DATE)+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENTMENTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_COMMENT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKFKAI1QPUMAJIGM7KE8YIJNKV4 UNIQUE(O_COMMENT_ID,O_USER_ID),CONSTRAINT FKD1HWCFOMOFRE977XH9LVASY2D FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_CODECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENTQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKHL4VWVFRJWK00W6XRE1MKROV UNIQUE(O_PROJECT_ID,O_USER_ID))+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENTREPLY(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT VARCHAR(100000) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_NEWCOMMITHASH VARCHAR(255) NOT NULL,O_OLDCOMMITHASH VARCHAR(255) NOT NULL,O_PATHFILTER VARCHAR(255),O_WHITESPACEOPTION INTEGER NOT NULL,O_USER_ID BIGINT NOT NULL,O_COMMENT_ID BIGINT NOT NULL,O_PULLREQUEST_ID BIGINT,CONSTRAINT FKSIASO3U9QLRDF91RVG6522JD FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_CODECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENTSTATUSCHANGE(O_ID BIGINT NOT NULL PRIMARY KEY,O_NEWCOMMITHASH VARCHAR(255) NOT NULL,O_OLDCOMMITHASH VARCHAR(255) NOT NULL,O_PATHFILTER VARCHAR(255),O_WHITESPACEOPTION INTEGER NOT NULL,O_DATE TIMESTAMP NOT NULL,O_RESOLVED BOOLEAN NOT NULL,O_COMMENT_ID BIGINT NOT NULL,O_PULLREQUEST_ID BIGINT,O_USER_ID BIGINT NOT NULL,CONSTRAINT FKB26HL668IK7D8OO2KK952GNP2 FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_CODECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_CODECOMMENTTOUCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_COMMENTID BIGINT,O_PROJECT_ID BIGINT)+CREATE INDEX IDXJ64P8JNUS12QWBMFD833M5SD7 ON PUBLIC.O_CODECOMMENTTOUCH(O_COMMENTID)+CREATE MEMORY TABLE PUBLIC.O_COMMITQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKBX4OOGW4V6WYBDX23SB9VRDXK UNIQUE(O_PROJECT_ID,O_USER_ID))+CREATE MEMORY TABLE PUBLIC.O_COVERAGEMETRIC(O_ID BIGINT NOT NULL PRIMARY KEY,O_BRANCHCOVERAGE INTEGER NOT NULL,O_LINECOVERAGE INTEGER NOT NULL,O_REPORTNAME VARCHAR(255) NOT NULL,O_BUILD_ID BIGINT NOT NULL,CONSTRAINT UKONV0N9QFTE41GJO0TCALFLEAH UNIQUE(O_BUILD_ID,O_REPORTNAME),CONSTRAINT FKLJCNLKK46EXBN24RXWLY1HG04 FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE INDEX IDX9XN2B5NE0YHNMYPTNM1YQ2A9U ON PUBLIC.O_COVERAGEMETRIC(O_REPORTNAME)+CREATE MEMORY TABLE PUBLIC.O_DASHBOARD(O_ID BIGINT NOT NULL PRIMARY KEY,O_FOREVERYONE BOOLEAN NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_WIDGETS BLOB(65535) NOT NULL,O_OWNER_ID BIGINT NOT NULL,CONSTRAINT UKF75Q9NNDS3764C66TR9YYKWRT UNIQUE(O_OWNER_ID,O_NAME))+CREATE INDEX IDXG13NPT8IODWSUOA4NLQ7X8ODY ON PUBLIC.O_DASHBOARD(O_NAME)+CREATE MEMORY TABLE PUBLIC.O_DASHBOARDGROUPSHARE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DASHBOARD_ID BIGINT NOT NULL,O_GROUP_ID BIGINT NOT NULL,CONSTRAINT UKGWFDCBG9RRYHTUXI7V68DIADT UNIQUE(O_GROUP_ID,O_DASHBOARD_ID),CONSTRAINT FKK4DYLQEEIQCUQMR7P91P974OI FOREIGN KEY(O_DASHBOARD_ID) REFERENCES PUBLIC.O_DASHBOARD(O_ID))+CREATE MEMORY TABLE PUBLIC.O_DASHBOARDUSERSHARE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DASHBOARD_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKTR2GCXEQL6KVB2ASNS7Q5B0UE UNIQUE(O_USER_ID,O_DASHBOARD_ID),CONSTRAINT FK9SFMRG307JE3Q7XQ0M4095WKS FOREIGN KEY(O_DASHBOARD_ID) REFERENCES PUBLIC.O_DASHBOARD(O_ID))+CREATE MEMORY TABLE PUBLIC.O_DASHBOARDVISIT(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_DASHBOARD_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKR5JUJFE9STLPTG70DU7GP4603 UNIQUE(O_USER_ID,O_DASHBOARD_ID),CONSTRAINT FK1T10E1H7B7H6C9WHN0NGJBIYS FOREIGN KEY(O_DASHBOARD_ID) REFERENCES PUBLIC.O_DASHBOARD(O_ID))+CREATE MEMORY TABLE PUBLIC.O_EMAILADDRESS(O_ID BIGINT NOT NULL PRIMARY KEY,O_PRIMARY BOOLEAN NOT NULL,O_VALUE VARCHAR(255) NOT NULL,O_VERIFICATIONCODE VARCHAR(255),O_OWNER_ID BIGINT NOT NULL,CONSTRAINT UK_EEKDLSAIXI3AUR18M4PX8U1MM UNIQUE(O_VALUE))+CREATE INDEX IDXIPD7QOA5NHGOL2L4WIAYGWOBN ON PUBLIC.O_EMAILADDRESS(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_GITLFSLOCK(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_PATH VARCHAR(255) NOT NULL,O_OWNER_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,CONSTRAINT UKJDNB5JAG7OCJ0XCPXOEASWAIP UNIQUE(O_PROJECT_ID,O_PATH))+CREATE INDEX IDXC44JLVV542G6WWW1VK26QWDXJ ON PUBLIC.O_GITLFSLOCK(O_PATH)+CREATE MEMORY TABLE PUBLIC.O_GPGKEY(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT BLOB(65535) NOT NULL,O_CREATEDAT TIMESTAMP NOT NULL,O_KEYID BIGINT,O_OWNER_ID BIGINT NOT NULL,CONSTRAINT UK_LH5BRD865EVHFYDT4P47HN3RB UNIQUE(O_KEYID))+CREATE INDEX IDXB0B192M26VF3OQROARA7U6B37 ON PUBLIC.O_GPGKEY(O_KEYID)+CREATE MEMORY TABLE PUBLIC.O_GROUP(O_ID BIGINT NOT NULL PRIMARY KEY,O_ADMINISTRATOR BOOLEAN NOT NULL,O_CREATEROOTPROJECTS BOOLEAN NOT NULL,O_DESCRIPTION VARCHAR(255),O_ENFORCE2FA BOOLEAN NOT NULL,O_NAME VARCHAR(255) NOT NULL,CONSTRAINT UK_OHPN469IKH9EDLTIXWQT36J7X UNIQUE(O_NAME))+CREATE MEMORY TABLE PUBLIC.O_GROUPAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_GROUP_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_ROLE_ID BIGINT NOT NULL,CONSTRAINT UK43TP5QYVEU2FFFIJT0418WN12 UNIQUE(O_GROUP_ID,O_PROJECT_ID,O_ROLE_ID),CONSTRAINT FK4DQKRGV236A01MIILSI3VPC8V FOREIGN KEY(O_GROUP_ID) REFERENCES PUBLIC.O_GROUP(O_ID))+CREATE MEMORY TABLE PUBLIC.O_GROUPENTITLEMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_AI_ID BIGINT NOT NULL,O_GROUP_ID BIGINT NOT NULL,CONSTRAINT UKJD58F6F4K9YNSDO7DG1AUQ13 UNIQUE(O_AI_ID,O_GROUP_ID),CONSTRAINT FKIR8LBHOLSPWD3K5Q4O5J4BUQU FOREIGN KEY(O_GROUP_ID) REFERENCES PUBLIC.O_GROUP(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUE(O_ID BIGINT NOT NULL PRIMARY KEY,O_BOARDPOSITION INTEGER NOT NULL,O_COMMENTCOUNT INTEGER NOT NULL,O_CONFIDENTIAL BOOLEAN NOT NULL,O_CONFUSEDCOUNT INTEGER NOT NULL,O_DESCRIPTION VARCHAR(100000),O_DESCRIPTIONREVISIONCOUNT INTEGER NOT NULL,O_EXTERNALPARTICIPANTS BLOB(65535) NOT NULL,O_EYESCOUNT INTEGER NOT NULL,O_HEARTCOUNT INTEGER NOT NULL,O_LAST_ACTIVITY_DATE TIMESTAMP NOT NULL,O_LAST_ACTIVITY_DESCRIPTION VARCHAR(255) NOT NULL,O_MESSAGEID VARCHAR(255),O_NUMBER BIGINT NOT NULL,O_ONBEHALFOF BLOB(255),O_OWNESTIMATEDTIME INTEGER NOT NULL,O_OWNSPENTTIME INTEGER NOT NULL,O_PINDATE TIMESTAMP,O_PROGRESS INTEGER NOT NULL,O_SMILECOUNT INTEGER NOT NULL,O_STATE VARCHAR(255) NOT NULL,O_STATEORDINAL INTEGER NOT NULL,O_SUBMITDATE TIMESTAMP NOT NULL,O_TADACOUNT INTEGER NOT NULL,O_THUMBSDOWNCOUNT INTEGER NOT NULL,O_THUMBSUPCOUNT INTEGER NOT NULL,O_TICKCOUNT INTEGER NOT NULL,O_TITLE VARCHAR(255) NOT NULL,O_TOTALESTIMATEDTIME INTEGER NOT NULL,O_TOTALSPENTTIME INTEGER NOT NULL,O_UUID VARCHAR(255) NOT NULL,O_VOTECOUNT INTEGER NOT NULL,O_LAST_ACTIVITY_USER BIGINT,O_MOVEDTO_ID BIGINT,O_NUMBERSCOPE_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_SUBMITTER_ID BIGINT NOT NULL,CONSTRAINT UKL18V6UTA3AG37PGLBJS6S6U2X UNIQUE(O_NUMBERSCOPE_ID,O_NUMBER),CONSTRAINT FKA603BDA80SWISOYQ1NUIVWKSR FOREIGN KEY(O_MOVEDTO_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE INDEX IDXPUFV60TTPP8WL921SVFSB8HUM ON PUBLIC.O_ISSUE(O_STATE)+CREATE INDEX IDXSUFEQ8NTCN7XIVF8I7MY8E2UU ON PUBLIC.O_ISSUE(O_UUID)+CREATE INDEX IDXX2LXT80885C9T2F5755HFMMT ON PUBLIC.O_ISSUE(O_BOARDPOSITION)+CREATE INDEX IDXQNX13VX8RPD8DGV7GDJUQD8EC ON PUBLIC.O_ISSUE(O_TITLE)+CREATE INDEX IDXBJ1BLEM2OOKM5YLQQXOO6U8EQ ON PUBLIC.O_ISSUE(O_NUMBER)+CREATE INDEX IDX6MP49WHMPKSDYB7LRUWEC75KL ON PUBLIC.O_ISSUE(O_SUBMITDATE)+CREATE INDEX IDX9RX7A0GIDQQBCKR02GOJTOTHD ON PUBLIC.O_ISSUE(O_VOTECOUNT)+CREATE INDEX IDXODUDXQB4J5WMNKME3C3KCD566 ON PUBLIC.O_ISSUE(O_COMMENTCOUNT)+CREATE INDEX IDXTOKCSWEDR8O5R224SLP10UNWF ON PUBLIC.O_ISSUE(O_THUMBSUPCOUNT)+CREATE INDEX IDXC936PP81NPCD8KAYRYBXWW2S1 ON PUBLIC.O_ISSUE(O_THUMBSDOWNCOUNT)+CREATE INDEX IDXAGWD44SEC3BSRS4CEQY0PACXV ON PUBLIC.O_ISSUE(O_SMILECOUNT)+CREATE INDEX IDXLFBCC8AXJH7B0UYCMV9U73YXQ ON PUBLIC.O_ISSUE(O_TADACOUNT)+CREATE INDEX IDXRJEGRQ0HT8AD1F2O6N8C9K1DA ON PUBLIC.O_ISSUE(O_CONFUSEDCOUNT)+CREATE INDEX IDXIK37G89U5XK1MG4FLV0RX7EW2 ON PUBLIC.O_ISSUE(O_HEARTCOUNT)+CREATE INDEX IDXMRFS3SJYFCG5JRH5O8JEFG61H ON PUBLIC.O_ISSUE(O_EYESCOUNT)+CREATE INDEX IDXIN8V22SKB0X6PSM3VYXHUQ6XF ON PUBLIC.O_ISSUE(O_TICKCOUNT)+CREATE INDEX IDXE5H516JJP1MEGNXHH26H99Q8K ON PUBLIC.O_ISSUE(O_MESSAGEID)+CREATE INDEX IDXC3CGWEPAHPKF2HYNBVKQW37H8 ON PUBLIC.O_ISSUE(O_LAST_ACTIVITY_DATE)+CREATE MEMORY TABLE PUBLIC.O_ISSUEAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKQO6F9A3B3PFMGN7TE5W1C8LAU UNIQUE(O_USER_ID,O_ISSUE_ID),CONSTRAINT FKQMSXSJTY3XNBH3LPCHASNYVAP FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUECHANGE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATA BLOB(1M) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT FKMQQQB1S6B2S8Q8G6HQ1XA74RF FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUECOMMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT VARCHAR(100000) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_MESSAGEID VARCHAR(255),O_ONBEHALFOF BLOB(255),O_REVISIONCOUNT INTEGER NOT NULL,O_USER_ID BIGINT NOT NULL,O_ISSUE_ID BIGINT NOT NULL,CONSTRAINT FKMA5LDNQQPUEIU49D30KJGASC9 FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE INDEX IDX9VLFWTVGRWSPXD44BQ4PLB28S ON PUBLIC.O_ISSUECOMMENT(O_MESSAGEID)+CREATE MEMORY TABLE PUBLIC.O_ISSUECOMMENTREACTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMOJI VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,O_COMMENT_ID BIGINT NOT NULL,CONSTRAINT UK19FNT8FL7BDR9M8H23CD8A4AE UNIQUE(O_COMMENT_ID,O_USER_ID,O_EMOJI),CONSTRAINT FK1NX4VB8EP93XBKPTAMRTECL37 FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_ISSUECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUECOMMENTREVISION(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_NEWCONTENT VARCHAR(100000),O_OLDCONTENT VARCHAR(100000),O_USER_ID BIGINT NOT NULL,O_COMMENT_ID BIGINT NOT NULL,CONSTRAINT FKKJ72CEF5CFNJHV245VKEDEDAI FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_ISSUECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEDESCRIPTIONREVISION(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_NEWCONTENT VARCHAR(100000),O_OLDCONTENT VARCHAR(100000),O_USER_ID BIGINT NOT NULL,O_ISSUE_ID BIGINT NOT NULL,CONSTRAINT FKONI6IK8I4TQSFQR4F93YCSE46 FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEFIELD(O_ID BIGINT NOT NULL PRIMARY KEY,O_NAME VARCHAR(255) NOT NULL,O_ORDINAL BIGINT NOT NULL,O_TYPE VARCHAR(255) NOT NULL,O_VALUE VARCHAR(500),O_ISSUE_ID BIGINT NOT NULL,CONSTRAINT UKALDQE6XH6V2UUFNE0M7T4WYCY UNIQUE(O_ISSUE_ID,O_NAME,O_VALUE),CONSTRAINT FKDEB3IQKIBTJW3WF8EYYPDJESC FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE INDEX IDXQYHC87IQRS49YBNQCJFNMTV3M ON PUBLIC.O_ISSUEFIELD(O_NAME)+CREATE INDEX IDX7JJ6SALJ3BRO292UYL80RSK0 ON PUBLIC.O_ISSUEFIELD(O_VALUE)+CREATE INDEX IDXMGPSLO9FFU8FJBE02C3NREY7 ON PUBLIC.O_ISSUEFIELD(O_TYPE)+CREATE INDEX IDX7ISPUWQ9DLFHI7365UHYOW3XS ON PUBLIC.O_ISSUEFIELD(O_ORDINAL)+CREATE MEMORY TABLE PUBLIC.O_ISSUELINK(O_ID BIGINT NOT NULL PRIMARY KEY,O_POSITION INTEGER NOT NULL,O_SOURCE_ID BIGINT NOT NULL,O_SPEC_ID BIGINT NOT NULL,O_TARGET_ID BIGINT NOT NULL,CONSTRAINT UK8AI6KA1C9OHY0P7CE1WHY5I11 UNIQUE(O_SOURCE_ID,O_TARGET_ID,O_SPEC_ID),CONSTRAINT FKC4TYL3XEJAJWF5ASYKDGDPOXS FOREIGN KEY(O_SOURCE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID),CONSTRAINT FKAXG3JRVYGIQAHIY67IMFK8I80 FOREIGN KEY(O_TARGET_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEMENTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKN9QVAQV5YSQKXAHSQP7MDMIL5 UNIQUE(O_ISSUE_ID,O_USER_ID),CONSTRAINT FK1UHHYO5P15PW61QI9CBSRFYCN FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYWATCHES BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK442AAY3BK0WEH6JV60VYSMII3 UNIQUE(O_PROJECT_ID,O_USER_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEREACTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMOJI VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,O_ISSUE_ID BIGINT NOT NULL,CONSTRAINT UKGAL09VMXLVB1G4N6XGWO3OP1O UNIQUE(O_ISSUE_ID,O_USER_ID,O_EMOJI),CONSTRAINT FK8OK4DBNO5HX2D3MUN30WKRVLG FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUESCHEDULE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP,O_ISSUE_ID BIGINT NOT NULL,O_ITERATION_ID BIGINT NOT NULL,CONSTRAINT UKHEPI672J7U38L2FLA92E5UWAO UNIQUE(O_ISSUE_ID,O_ITERATION_ID),CONSTRAINT FK4AUYAIFY4LCYDISFWXTWIDKAW FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUESTATEHISTORY(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_DURATION BIGINT,O_STATE VARCHAR(255) NOT NULL,O_DAY INTEGER,O_MONTH INTEGER,O_WEEK INTEGER,O_ISSUE_ID BIGINT NOT NULL,CONSTRAINT FKCCPTWUYRFS8V9MXMMYNT17AQR FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE INDEX IDX3HYMEFSPAITB06XPYYHC1ND09 ON PUBLIC.O_ISSUESTATEHISTORY(O_STATE)+CREATE INDEX IDXDAOCY164TM6WGV6GOM5EIN76D ON PUBLIC.O_ISSUESTATEHISTORY(O_DATE)+CREATE INDEX IDX4SG1COY4NPC2M99MCXMFORKI4 ON PUBLIC.O_ISSUESTATEHISTORY(O_MONTH)+CREATE INDEX IDXCNK1XBIYR5A5I7OCEJP6NI66P ON PUBLIC.O_ISSUESTATEHISTORY(O_WEEK)+CREATE INDEX IDXNR3NH9TB2AIQDVUHGWJBUYNH6 ON PUBLIC.O_ISSUESTATEHISTORY(O_DAY)+CREATE MEMORY TABLE PUBLIC.O_ISSUETOUCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_ISSUEID BIGINT,O_PROJECT_ID BIGINT)+CREATE INDEX IDXL104ODKUAIWT3MTMOJ3QS6MSE ON PUBLIC.O_ISSUETOUCH(O_ISSUEID)+CREATE MEMORY TABLE PUBLIC.O_ISSUEVOTE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK9H8LD86LAIHIDITIK978IB38R UNIQUE(O_ISSUE_ID,O_USER_ID),CONSTRAINT FKT21N9JXI6PWYLRTDST2DXONOS FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEWATCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_WATCHING BOOLEAN NOT NULL,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKA4H1UNN42YUVXDKXL1HKTEUUX UNIQUE(O_ISSUE_ID,O_USER_ID),CONSTRAINT FKR19EOFHBHN3J2USIENTDFXIPI FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ISSUEWORK(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_MINUTES INTEGER NOT NULL,O_NOTE VARCHAR(1000),O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT FKM1MF1T3131F70B16V7IB3NKR2 FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE INDEX IDX2KA85UD88A52HXUO8Y6TUT6EA ON PUBLIC.O_ISSUEWORK(O_DATE)+CREATE MEMORY TABLE PUBLIC.O_ISSUEWORKREACTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMOJI VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,O_WORK_ID BIGINT NOT NULL,CONSTRAINT UK6D29YYFOW1X6NAXWLL0C887GK UNIQUE(O_WORK_ID,O_USER_ID,O_EMOJI),CONSTRAINT FKB11HG3EPN81USMJ5VP2XTAM86 FOREIGN KEY(O_WORK_ID) REFERENCES PUBLIC.O_ISSUEWORK(O_ID))+CREATE MEMORY TABLE PUBLIC.O_ITERATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_CLOSED BOOLEAN NOT NULL,O_DESCRIPTION VARCHAR(15000),O_DUEDAY BIGINT,O_NAME VARCHAR(255) NOT NULL,O_STARTDAY BIGINT,O_PROJECT_ID BIGINT NOT NULL,CONSTRAINT UKF6A3R4TFJ9H4YL97I1KH8MNPQ UNIQUE(O_PROJECT_ID,O_NAME))+CREATE MEMORY TABLE PUBLIC.O_LABELSPEC(O_ID BIGINT NOT NULL PRIMARY KEY,O_COLOR VARCHAR(255) NOT NULL,O_NAME VARCHAR(255) NOT NULL)+CREATE INDEX IDXCKRGR6Y6LFQYUEBX5PO48VH1N ON PUBLIC.O_LABELSPEC(O_NAME)+CREATE MEMORY TABLE PUBLIC.O_LINKAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_LINK_ID BIGINT NOT NULL,O_ROLE_ID BIGINT NOT NULL,CONSTRAINT UKTOEPIF8KGBDVTX0HGL478SDD4 UNIQUE(O_LINK_ID,O_ROLE_ID))+CREATE MEMORY TABLE PUBLIC.O_LINKSPEC(O_ID BIGINT NOT NULL PRIMARY KEY,O_ISSUEQUERY VARCHAR(255),O_MULTIPLE BOOLEAN NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_OPPOSITE BLOB(65535),O_ORDER INTEGER NOT NULL,CONSTRAINT UK_9A711JGWL7RDB1UI96C468GQR UNIQUE(O_NAME))+CREATE MEMORY TABLE PUBLIC.O_MEMBERSHIP(O_ID BIGINT NOT NULL PRIMARY KEY,O_GROUP_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKMV4ADY4DF0N2UAESK0BJ953V0 UNIQUE(O_USER_ID,O_GROUP_ID),CONSTRAINT FKMRJ3KS5M177SX0AK9A7YPNMJD FOREIGN KEY(O_GROUP_ID) REFERENCES PUBLIC.O_GROUP(O_ID))+CREATE MEMORY TABLE PUBLIC.O_MODELVERSION(O_ID BIGINT NOT NULL PRIMARY KEY,O_VERSIONCOLUMN VARCHAR(255))+CREATE MEMORY TABLE PUBLIC.O_PACK(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATA BLOB(65535),O_NAME VARCHAR(255) NOT NULL,O_PRERELEASE BOOLEAN NOT NULL,O_PUBLISHDATE TIMESTAMP,O_TYPE VARCHAR(255) NOT NULL,O_VERSION VARCHAR(255) NOT NULL,O_BUILD_ID BIGINT,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK4GTQ5JX1671GERX8LC82745BY UNIQUE(O_PROJECT_ID,O_TYPE,O_NAME,O_VERSION),CONSTRAINT FKFGESNVEOULP1YXPXFVELVGQP6 FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE INDEX IDXGS2CMV3JS3JIIDJLFSTSICQPL ON PUBLIC.O_PACK(O_TYPE)+CREATE INDEX IDXFLOR8W40K6I824LARGNOHXB25 ON PUBLIC.O_PACK(O_NAME)+CREATE INDEX IDXNE4F70RHMYD82XVQGLBBWPQUH ON PUBLIC.O_PACK(O_VERSION)+CREATE MEMORY TABLE PUBLIC.O_PACKBLOB(O_ID BIGINT NOT NULL PRIMARY KEY,O_CREATEDATE TIMESTAMP NOT NULL,O_MD5HASH VARCHAR(255),O_SHA1HASH VARCHAR(255),O_SHA256HASH VARCHAR(255) NOT NULL,O_SHA512HASH VARCHAR(255),O_SIZE BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,CONSTRAINT UK8L3VWPSB4XT6B7UY8AI3UY25G UNIQUE(O_PROJECT_ID,O_SHA256HASH))+CREATE INDEX IDX13BPX6KPQA9Q6QJSRD4U661JM ON PUBLIC.O_PACKBLOB(O_SHA256HASH)+CREATE INDEX IDXK8Y0AC52WRR0D88V85B89FVMC ON PUBLIC.O_PACKBLOB(O_CREATEDATE)+CREATE MEMORY TABLE PUBLIC.O_PACKBLOBREFERENCE(O_ID BIGINT NOT NULL PRIMARY KEY,O_PACK_ID BIGINT NOT NULL,O_PACKBLOB_ID BIGINT NOT NULL,CONSTRAINT UK5N3OG8LN28CNL15I3T3QJ5QFV UNIQUE(O_PACK_ID,O_PACKBLOB_ID),CONSTRAINT FKEEAMIL8S8N9SX7YIV610NDMP2 FOREIGN KEY(O_PACK_ID) REFERENCES PUBLIC.O_PACK(O_ID),CONSTRAINT FKSJXK5F4HP3RGD6IEXFFSLI3M9 FOREIGN KEY(O_PACKBLOB_ID) REFERENCES PUBLIC.O_PACKBLOB(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PACKLABEL(O_ID BIGINT NOT NULL PRIMARY KEY,O_PACK_ID BIGINT NOT NULL,O_SPEC_ID BIGINT NOT NULL,CONSTRAINT UKJWG7E055B1D4URLSJGETRTM7T UNIQUE(O_PACK_ID,O_SPEC_ID),CONSTRAINT FKHFKF1GE384FEVBXBHPJ3LPKXL FOREIGN KEY(O_PACK_ID) REFERENCES PUBLIC.O_PACK(O_ID),CONSTRAINT FKHDX61CIVQB5Y1S4M6BNMUPDIY FOREIGN KEY(O_SPEC_ID) REFERENCES PUBLIC.O_LABELSPEC(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PACKQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK97IWL96633CVDT2WPGAXDGYTG UNIQUE(O_PROJECT_ID,O_USER_ID))+CREATE MEMORY TABLE PUBLIC.O_PENDINGSUGGESTIONAPPLY(O_ID BIGINT NOT NULL PRIMARY KEY,O_SUGGESTION BLOB(255) NOT NULL,O_COMMENT_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK910X6R4IJORBE57AMW1CF8KEO UNIQUE(O_USER_ID,O_REQUEST_ID,O_COMMENT_ID),CONSTRAINT FKJ8XKWGD2XCFJ7OCR9O3MD411U FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_CODECOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PROBLEMMETRIC(O_ID BIGINT NOT NULL PRIMARY KEY,O_CRITICALSEVERITIES INTEGER NOT NULL,O_HIGHSEVERITIES INTEGER NOT NULL,O_LOWSEVERITIES INTEGER NOT NULL,O_MEDIUMSEVERITIES INTEGER NOT NULL,O_REPORTNAME VARCHAR(255) NOT NULL,O_BUILD_ID BIGINT NOT NULL,CONSTRAINT UKT3W236J8TXDBVC8Q4KF606085 UNIQUE(O_BUILD_ID,O_REPORTNAME),CONSTRAINT FKI636XXRUUSJQQWLOYUCQT8FC4 FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE INDEX IDXMBYP1RTB5753Y04BNYSEPFU6S ON PUBLIC.O_PROBLEMMETRIC(O_REPORTNAME)+CREATE MEMORY TABLE PUBLIC.O_PROJECT(O_ID BIGINT NOT NULL PRIMARY KEY,O_AISETTING BLOB(65535),O_BRANCHPROTECTIONS BLOB(65535) NOT NULL,O_BUILDSETTING BLOB(65535) NOT NULL,O_CODEANALYSISSETTING BLOB(65535),O_CODEMANAGEMENT BOOLEAN NOT NULL,O_CONTRIBUTEDSETTINGS BLOB(65535) NOT NULL,O_CREATEDATE TIMESTAMP NOT NULL,O_DESCRIPTION VARCHAR(15000),O_GITPACKCONFIG BLOB(65535),O_ISSUEMANAGEMENT BOOLEAN NOT NULL,O_ISSUESETTING BLOB(65535) NOT NULL,O_KEY VARCHAR(255),O_NAME VARCHAR(255) NOT NULL,O_NAMEDCODECOMMENTQUERIES BLOB(65535),O_NAMEDCOMMITQUERIES BLOB(65535),O_PACKMANAGEMENT BOOLEAN NOT NULL,O_PACKSETTING BLOB(65535) NOT NULL,O_PATH VARCHAR(255) NOT NULL,O_PATHLEN INTEGER NOT NULL,O_PULLREQUESTSETTING BLOB(65535) NOT NULL,O_SERVICEDESKEMAILADDRESS VARCHAR(255),O_TAGPROTECTIONS BLOB(65535) NOT NULL,O_TIMETRACKING BOOLEAN NOT NULL,O_WEBHOOKS BLOB(65535) NOT NULL,O_WIKIMANAGEMENT BOOLEAN NOT NULL,O_WIKISETTING BLOB(65535),O_WORKSPACESETTING BLOB(65535) NOT NULL,O_WORKSPACESPECS BLOB(65535) NOT NULL,O_FORKEDFROM_ID BIGINT,O_LASTACTIVITYDATE_ID BIGINT NOT NULL,O_PARENT_ID BIGINT,CONSTRAINT UKQUU8GQQJW34IBWS51KGIQORJD UNIQUE(O_PARENT_ID,O_NAME),CONSTRAINT UK_J7GPCEE0LH0W4OCK713LHV2RN UNIQUE(O_KEY),CONSTRAINT UK_JACBGY5HPMC1G1RG5N0VDVD8Y UNIQUE(O_SERVICEDESKEMAILADDRESS),CONSTRAINT UK_P5S7YFAWER6NF6CG5PESE59Q UNIQUE(O_LASTACTIVITYDATE_ID),CONSTRAINT FKNWAK65PWLRIH9LA3YXM6PFD8C FOREIGN KEY(O_FORKEDFROM_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FK7J5R9DEDNFXVMKC1473TDT7IC FOREIGN KEY(O_PARENT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID))+CREATE INDEX IDXS1CHQO15Q2E19APJ6E8JD4H87 ON PUBLIC.O_PROJECT(O_NAME)+CREATE INDEX IDXHTPCGROKH3IPWPCWV2H42GRTF ON PUBLIC.O_PROJECT(O_PATH)+CREATE MEMORY TABLE PUBLIC.O_PROJECTENTITLEMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_AI_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,CONSTRAINT UKQNJELWWG1Y4FBXX1P6OECKUAA UNIQUE(O_AI_ID,O_PROJECT_ID),CONSTRAINT FK84AW2X3R982H927AHNRD7XQER FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PROJECTLABEL(O_ID BIGINT NOT NULL PRIMARY KEY,O_PROJECT_ID BIGINT NOT NULL,O_SPEC_ID BIGINT NOT NULL,CONSTRAINT UKS5FK9TI5I1YWNJ8QMKHY2DBDB UNIQUE(O_PROJECT_ID,O_SPEC_ID),CONSTRAINT FKMHKX9KKD1AYM7W5U04WVG2G4C FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FK779J2T2EBYG6RW766RYY1SLP FOREIGN KEY(O_SPEC_ID) REFERENCES PUBLIC.O_LABELSPEC(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PROJECTLASTACTIVITYDATE(O_ID BIGINT NOT NULL PRIMARY KEY,O_VALUE TIMESTAMP NOT NULL)+CREATE INDEX IDXFL1Y1OIBJQK75LA3NUEXBR3H4 ON PUBLIC.O_PROJECTLASTACTIVITYDATE(O_VALUE)+CREATE MEMORY TABLE PUBLIC.O_PULLREQUEST(O_ID BIGINT NOT NULL PRIMARY KEY,O_AUTO_MERGE_COMMIT_MESSAGE VARCHAR(1048576),O_AUTO_MERGE_ENABLED BOOLEAN NOT NULL,O_BASECOMMITHASH VARCHAR(255) NOT NULL,O_BUILDCOMMITHASH VARCHAR(255),O_CHECKERROR VARCHAR(1024),O_CLOSEDATE TIMESTAMP,O_CLOSEDAY INTEGER,O_CLOSEMONTH INTEGER,O_CLOSEWEEK INTEGER,O_CODE_COMMENTS_UPDT TIMESTAMP,O_COMMENTCOUNT INTEGER NOT NULL,O_CONFUSEDCOUNT INTEGER NOT NULL,O_DESCRIPTION VARCHAR(100000),O_DESCRIPTIONREVISIONCOUNT INTEGER NOT NULL,O_DURATION BIGINT,O_EYESCOUNT INTEGER NOT NULL,O_HEARTCOUNT INTEGER NOT NULL,O_LAST_ACTIVITY_DATE TIMESTAMP NOT NULL,O_LAST_ACTIVITY_DESCRIPTION VARCHAR(255) NOT NULL,O_PREVIEW_HEAD VARCHAR(255),O_PREVIEW_MERGE_COMMIT VARCHAR(255),O_PREVIEW_MERGE_STRATEGY INTEGER,O_PREVIEW_TARGET_HEAD VARCHAR(255),O_MERGESTRATEGY INTEGER NOT NULL,O_NUMBER BIGINT NOT NULL,O_SMILECOUNT INTEGER NOT NULL,O_SOURCEBRANCH VARCHAR(255) NOT NULL,O_STATUS INTEGER NOT NULL,O_SUBMITDATE TIMESTAMP NOT NULL,O_SUBMITDAY INTEGER,O_SUBMITMONTH INTEGER,O_SUBMITWEEK INTEGER,O_TADACOUNT INTEGER NOT NULL,O_TARGETBRANCH VARCHAR(255) NOT NULL,O_THUMBSDOWNCOUNT INTEGER NOT NULL,O_THUMBSUPCOUNT INTEGER NOT NULL,O_TICKCOUNT INTEGER NOT NULL,O_TITLE VARCHAR(255) NOT NULL,O_UUID VARCHAR(255) NOT NULL,O_LAST_ACTIVITY_USER BIGINT,O_NUMBERSCOPE_ID BIGINT NOT NULL,O_SOURCEPROJECT_ID BIGINT,O_SUBMITTER_ID BIGINT NOT NULL,O_TARGETPROJECT_ID BIGINT NOT NULL,CONSTRAINT UKMYY49ELL7Q1R9IU3VNY0RAPTT UNIQUE(O_NUMBERSCOPE_ID,O_NUMBER),CONSTRAINT FKPTWK3M4DEKYQBOG03R11CD6EX FOREIGN KEY(O_NUMBERSCOPE_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FKHD7YY8USY4CKUBSH4QVTK9Q1X FOREIGN KEY(O_SOURCEPROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FKEUBVXHF7SX0Q9EVT5RMVNABXJ FOREIGN KEY(O_TARGETPROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID))+CREATE INDEX IDX5CVHYLJOTW9UO8BFBVYFB6VI7 ON PUBLIC.O_PULLREQUEST(O_TITLE)+CREATE INDEX IDXJW2EO2DMKAM0DWASKKIUUWQMR ON PUBLIC.O_PULLREQUEST(O_UUID)+CREATE INDEX IDXKS48095K4CED9ND23QGQGHQJ ON PUBLIC.O_PULLREQUEST(O_NUMBER)+CREATE INDEX IDXTMLGM90E4DM72J09JSUQGQTUQ ON PUBLIC.O_PULLREQUEST(O_SUBMITDATE)+CREATE INDEX IDX7GPHCGKG7PN5XUFBVO7XW58BC ON PUBLIC.O_PULLREQUEST(O_LAST_ACTIVITY_DATE)+CREATE INDEX IDXSN876WCN724YIULOR3KWJU6B6 ON PUBLIC.O_PULLREQUEST(O_PREVIEW_HEAD)+CREATE INDEX IDX5PC9BFA958CLYR3BVCEP7J6CT ON PUBLIC.O_PULLREQUEST(O_SUBMITMONTH)+CREATE INDEX IDXKA1R21FKJR33I21GBU32NAOGH ON PUBLIC.O_PULLREQUEST(O_SUBMITWEEK)+CREATE INDEX IDXFYYBMX6ERQACKMRGL1L6Y4S2K ON PUBLIC.O_PULLREQUEST(O_SUBMITDAY)+CREATE INDEX IDXNPB173FAMMXTB9MORKOS4KJBR ON PUBLIC.O_PULLREQUEST(O_CLOSEMONTH)+CREATE INDEX IDXS44Y6S2OVMYQDOC5WW25CWM3A ON PUBLIC.O_PULLREQUEST(O_CLOSEWEEK)+CREATE INDEX IDXDWA1EL7YWMVB1AV9W49P0KUKT ON PUBLIC.O_PULLREQUEST(O_CLOSEDAY)+CREATE INDEX IDXLPEQIOY5WC7NIYT7PU8QQR3H0 ON PUBLIC.O_PULLREQUEST(O_STATUS)+CREATE INDEX IDXE3FM441145SGAQN2B9MEVOYI4 ON PUBLIC.O_PULLREQUEST(O_THUMBSUPCOUNT)+CREATE INDEX IDXQ21JUHPJOMQKDWVNVG6AVVYSD ON PUBLIC.O_PULLREQUEST(O_THUMBSDOWNCOUNT)+CREATE INDEX IDX7S5FD3HTQW50CLU3MFEHN63MA ON PUBLIC.O_PULLREQUEST(O_SMILECOUNT)+CREATE INDEX IDXG7OUVOYXP91UQNQ4RY9B0KWY8 ON PUBLIC.O_PULLREQUEST(O_TADACOUNT)+CREATE INDEX IDXOD4PT5MCJ3EIBS1X0CO153BUC ON PUBLIC.O_PULLREQUEST(O_CONFUSEDCOUNT)+CREATE INDEX IDXP1OD5E5EEVJ0EDBOEPD9MJYDR ON PUBLIC.O_PULLREQUEST(O_HEARTCOUNT)+CREATE INDEX IDXG3Q7J78OIW0NYK84J4PL9M8D1 ON PUBLIC.O_PULLREQUEST(O_EYESCOUNT)+CREATE INDEX IDXHNXIC6HEKVISFRBL3R8FY0H2Q ON PUBLIC.O_PULLREQUEST(O_TICKCOUNT)+CREATE INDEX IDXO62ULQG8L9Y8NOCEHNDG16Q9 ON PUBLIC.O_PULLREQUEST(O_COMMENTCOUNT)+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTASSIGNMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKNB9LLIU2T4MFPG3MPBQ7DEO6U UNIQUE(O_USER_ID,O_REQUEST_ID),CONSTRAINT FKK4C7VDTC35IM5MDKDEV7JJPTX FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTCHANGE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATA BLOB(1M) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT FK4EHNXVUOUHL18K9CEOS99SK4N FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTCOMMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT VARCHAR(100000) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_MESSAGEID VARCHAR(255),O_REVISIONCOUNT INTEGER NOT NULL,O_USER_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT NOT NULL,CONSTRAINT FKGXCAJQP8L0A5WAO81H8R74B5O FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE INDEX IDXQUIKWE6NM1CRFHVGTK52DLCPA ON PUBLIC.O_PULLREQUESTCOMMENT(O_MESSAGEID)+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTCOMMENTREACTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMOJI VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,O_COMMENT_ID BIGINT NOT NULL,CONSTRAINT UKSFA735N5U04VGL7WADXMHUS1U UNIQUE(O_COMMENT_ID,O_USER_ID,O_EMOJI),CONSTRAINT FK1NJUK36HBW21USDKNNNL2AYOJ FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_PULLREQUESTCOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTCOMMENTREVISION(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_NEWCONTENT VARCHAR(100000),O_OLDCONTENT VARCHAR(100000),O_USER_ID BIGINT NOT NULL,O_COMMENT_ID BIGINT NOT NULL,CONSTRAINT FKA4YXLMNI7K3U9GH7O1JJL9EUJ FOREIGN KEY(O_COMMENT_ID) REFERENCES PUBLIC.O_PULLREQUESTCOMMENT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTDESCRIPTIONREVISION(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_NEWCONTENT VARCHAR(100000),O_OLDCONTENT VARCHAR(100000),O_USER_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT NOT NULL,CONSTRAINT FK9N5NPBJL3MXLJRL43KOOIITE6 FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTLABEL(O_ID BIGINT NOT NULL PRIMARY KEY,O_REQUEST_ID BIGINT NOT NULL,O_SPEC_ID BIGINT NOT NULL,CONSTRAINT UKP53F32QDFC8UC5BC9IW3GD38K UNIQUE(O_REQUEST_ID,O_SPEC_ID),CONSTRAINT FKA2O1PYY1E5RCLMP0V4GBOY44N FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID),CONSTRAINT FK2NNGPVUL6J14XN2UYQ9RSKLJS FOREIGN KEY(O_SPEC_ID) REFERENCES PUBLIC.O_LABELSPEC(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTMENTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKUA6BE7VQY66AOBYBKPNIAEPW UNIQUE(O_REQUEST_ID,O_USER_ID),CONSTRAINT FKIF10NKNJ4PB4R0SDD9T0UFYP9 FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYWATCHES BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKSOVA4HT0PBTFHEP5OVWSDVA1I UNIQUE(O_PROJECT_ID,O_USER_ID),CONSTRAINT FK47NC1L5EEBDN0JFYYYBKWT34L FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTREACTION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMOJI VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT NOT NULL,CONSTRAINT UK3K4RDKFIUI33LM8MTQHBBC17N UNIQUE(O_REQUEST_ID,O_USER_ID,O_EMOJI),CONSTRAINT FKAAHHAOOCVD8DRBXITX5KGMH3E FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTREVIEW(O_ID BIGINT NOT NULL PRIMARY KEY,O_STATUS INTEGER NOT NULL,O_STATUSDATE TIMESTAMP,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKLWE76LVGT4GMXJDGHHRCFDDOD UNIQUE(O_USER_ID,O_REQUEST_ID),CONSTRAINT FK437QQAC29FS6EFUS0SWRWNPS6 FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTTOUCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_REQUESTID BIGINT,O_PROJECT_ID BIGINT,CONSTRAINT FKDSQFGTE4RKHOFK935GG2FW2BY FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID))+CREATE INDEX IDXRT9VCOKL25I5QIYEDQ560CUT9 ON PUBLIC.O_PULLREQUESTTOUCH(O_REQUESTID)+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTUPDATE(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_HEADCOMMITHASH VARCHAR(255) NOT NULL,O_TARGETHEADCOMMITHASH VARCHAR(255) NOT NULL,O_REQUEST_ID BIGINT NOT NULL,CONSTRAINT FKAGOY30SSJRVN47Q04CI0BUW3H FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE INDEX IDXFTD0C98UVDMP18SMBK1RMX15 ON PUBLIC.O_PULLREQUESTUPDATE(O_DATE)+CREATE MEMORY TABLE PUBLIC.O_PULLREQUESTWATCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_WATCHING BOOLEAN NOT NULL,O_REQUEST_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKQ7KAN1V67LBXREQTK8ORVT6OQ UNIQUE(O_REQUEST_ID,O_USER_ID),CONSTRAINT FKQJ624BP9KTWCX4SQ6CGU215MO FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID))+CREATE MEMORY TABLE PUBLIC.O_REVIEWEDDIFF(O_ID BIGINT NOT NULL PRIMARY KEY,O_BLOBPATH VARCHAR(255) NOT NULL,O_DATE TIMESTAMP NOT NULL,O_NEWCOMMITHASH VARCHAR(255) NOT NULL,O_OLDCOMMITHASH VARCHAR(255) NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKPQTIA8D4UHC1S4KVDYQYLAR6S UNIQUE(O_USER_ID,O_OLDCOMMITHASH,O_NEWCOMMITHASH,O_BLOBPATH))+CREATE INDEX IDXBHX3TJ2DPO3VIXPM3RML1HQ3U ON PUBLIC.O_REVIEWEDDIFF(O_OLDCOMMITHASH)+CREATE INDEX IDXGSN6TLA3A8WOLH9T7XM556QUF ON PUBLIC.O_REVIEWEDDIFF(O_NEWCOMMITHASH)+CREATE INDEX IDXA9R06H8H6HGHQ6RYRY6A69NIJ ON PUBLIC.O_REVIEWEDDIFF(O_BLOBPATH)+CREATE INDEX IDXPOA98BJH63U2JUYYQDPS0EX8R ON PUBLIC.O_REVIEWEDDIFF(O_DATE)+CREATE MEMORY TABLE PUBLIC.O_ROLE(O_ID BIGINT NOT NULL PRIMARY KEY,O_ACCESSCONFIDENTIALISSUES BOOLEAN NOT NULL,O_ACCESSTIMETRACKING BOOLEAN NOT NULL,O_EDIT_OTHER_ISSUES BOOLEAN,O_CODEPRIVILEGE INTEGER,O_CREATECHILDREN BOOLEAN NOT NULL,O_CREATEWORKSPACES BOOLEAN NOT NULL,O_DESCRIPTION VARCHAR(255),O_EDITABLEISSUEFIELDS BLOB(65535) NOT NULL,O_JOBPRIVILEGES BLOB(65535) NOT NULL,O_MANAGEBUILDS BOOLEAN NOT NULL,O_MANAGECODECOMMENTS BOOLEAN NOT NULL,O_MANAGEISSUES BOOLEAN NOT NULL,O_MANAGEPROJECT BOOLEAN NOT NULL,O_MANAGEPULLREQUESTS BOOLEAN NOT NULL,O_MANAGEWORKSPACES BOOLEAN NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_PACKPRIVILEGE INTEGER,O_SCHEDULEISSUES BOOLEAN NOT NULL,O_UPLOADCACHE BOOLEAN NOT NULL,CONSTRAINT UK_GVRVUA8JY1DB7N3QJ96A8SSF4 UNIQUE(O_NAME))+CREATE INDEX IDXHNUFK5L79RVRPTOMLF1710KTW ON PUBLIC.O_ROLE(O_NAME)+CREATE MEMORY TABLE PUBLIC.O_SETTING(O_ID BIGINT NOT NULL PRIMARY KEY,O_KEY INTEGER NOT NULL,O_VALUE BLOB(65535),CONSTRAINT UK_86SYY6JLP3DRBBBIKXVM0LIX1 UNIQUE(O_KEY))+CREATE MEMORY TABLE PUBLIC.O_SSHKEY(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONTENT VARCHAR(5000) NOT NULL,O_CREATEDAT TIMESTAMP NOT NULL,O_FINGERPRINT VARCHAR(255) NOT NULL,O_OWNER_ID BIGINT NOT NULL,CONSTRAINT UK_SG9D2TO9B1KQXLKLQLT6E6H1U UNIQUE(O_FINGERPRINT))+CREATE INDEX IDXRTCLNR0TI4C0YQTGWHCCJ1HG9 ON PUBLIC.O_SSHKEY(O_FINGERPRINT)+CREATE MEMORY TABLE PUBLIC.O_SSOACCOUNT(O_ID BIGINT NOT NULL PRIMARY KEY,O_SUBJECT VARCHAR(255) NOT NULL,O_PROVIDER_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKEXGD2C5XXKV8R5R79Y6AOP25X UNIQUE(O_PROVIDER_ID,O_SUBJECT))+CREATE INDEX IDXH5IS72O6HC65UU9B7MQONPY1S ON PUBLIC.O_SSOACCOUNT(O_SUBJECT)+CREATE MEMORY TABLE PUBLIC.O_SSOPROVIDER(O_ID BIGINT NOT NULL PRIMARY KEY,O_CONNECTOR BLOB(65535) NOT NULL,O_NAME VARCHAR(255) NOT NULL,O_DEFAULTGROUP_ID BIGINT,CONSTRAINT UK_IH4Q49WGROQ9HKIE4U59OVUX9 UNIQUE(O_NAME),CONSTRAINT FKBGV1XPTO70F0XJ1VLX2MQCDAK FOREIGN KEY(O_DEFAULTGROUP_ID) REFERENCES PUBLIC.O_GROUP(O_ID))+CREATE INDEX IDXON4038D1REJUJ7EBXEFFONT1T ON PUBLIC.O_SSOPROVIDER(O_NAME)+CREATE MEMORY TABLE PUBLIC.O_STOPWATCH(O_ID BIGINT NOT NULL PRIMARY KEY,O_DATE TIMESTAMP NOT NULL,O_ISSUE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKL3NSPUUEJVAMT0OGMGCNM0GR4 UNIQUE(O_ISSUE_ID,O_USER_ID),CONSTRAINT FKEG3GHS1463QM9EDDMNQ04Q0W1 FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID))+CREATE MEMORY TABLE PUBLIC.O_UNITTESTMETRIC(O_ID BIGINT NOT NULL PRIMARY KEY,O_NUMOFTESTCASES INTEGER NOT NULL,O_NUMOFTESTSUITES INTEGER NOT NULL,O_REPORTNAME VARCHAR(255) NOT NULL,O_TESTCASESUCCESSRATE INTEGER NOT NULL,O_TESTSUITESUCCESSRATE INTEGER NOT NULL,O_TOTALTESTDURATION INTEGER NOT NULL,O_BUILD_ID BIGINT NOT NULL,CONSTRAINT UK6CSD39GX6DR5PY30L2K9YS1XB UNIQUE(O_BUILD_ID,O_REPORTNAME),CONSTRAINT FKD7OOUYFDHY1V6PJQDH2OGOFBY FOREIGN KEY(O_BUILD_ID) REFERENCES PUBLIC.O_BUILD(O_ID))+CREATE INDEX IDX1EX963OPA5GOBTJ20ST6EW96E ON PUBLIC.O_UNITTESTMETRIC(O_REPORTNAME)+CREATE MEMORY TABLE PUBLIC.O_USER(O_ID BIGINT NOT NULL PRIMARY KEY,O_AISETTING BLOB(65535),O_BUILDQUERIES BLOB(65535) NOT NULL,O_BUILDQUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_DISABLED BOOLEAN NOT NULL,O_FULLNAME VARCHAR(255),O_ISSUEQUERIES BLOB(65535) NOT NULL,O_ISSUEQUERYWATCHES BLOB(65535) NOT NULL,O_PRIVATE_EMAILS BOOLEAN,O_NAME VARCHAR(255) NOT NULL,O_NOTIFYOWNEVENTS BOOLEAN NOT NULL,O_PACKQUERIES BLOB(65535) NOT NULL,O_PACKQUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_PASSWORD VARCHAR(1024),O_PASSWORDRESETCODE VARCHAR(255),O_PROJECTQUERIES BLOB(65535) NOT NULL,O_PULLREQUESTQUERIES BLOB(65535) NOT NULL,O_PULLREQUESTQUERYWATCHES BLOB(65535) NOT NULL,O_TWOFACTORAUTHENTICATION BLOB(65535),O_TYPE INTEGER NOT NULL,O_WORKSPACEQUERIES BLOB(65535) NOT NULL,O_WORKSPACEQUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,CONSTRAINT UK_OP1RWECOSS3WASNNJAJ28YWLV UNIQUE(O_NAME))+CREATE INDEX IDX8CSJ349QJY0DIFYE718OM9EMK ON PUBLIC.O_USER(O_NAME)+CREATE INDEX IDX7RYQO9H8JWHHM6X0NV3PEM53I ON PUBLIC.O_USER(O_FULLNAME)+CREATE MEMORY TABLE PUBLIC.O_USERAUTHORIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_PROJECT_ID BIGINT NOT NULL,O_ROLE_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK6WYVNCLFGM5G22VHTLNNP3EUU UNIQUE(O_USER_ID,O_PROJECT_ID,O_ROLE_ID),CONSTRAINT FK59ENYP88RMHGP5K1H6LS7ESHH FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FKJNO26EQA5MOWA41XPME4RWJQQ FOREIGN KEY(O_ROLE_ID) REFERENCES PUBLIC.O_ROLE(O_ID),CONSTRAINT FKF5C832PVR1PE8OMCT8NQ0UHD8 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID))+CREATE MEMORY TABLE PUBLIC.O_USERENTITLEMENT(O_ID BIGINT NOT NULL PRIMARY KEY,O_AI_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UK31SLA58T9W79WP8OLV7NUWB23 UNIQUE(O_AI_ID,O_USER_ID),CONSTRAINT FKDEATP1BEII9578VW9WYFX5HOM FOREIGN KEY(O_AI_ID) REFERENCES PUBLIC.O_USER(O_ID),CONSTRAINT FKAVE6IJJ31GID42Q0M8XSPY125 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID))+CREATE MEMORY TABLE PUBLIC.O_USERINVITATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_EMAILADDRESS VARCHAR(255) NOT NULL,O_INVITATIONCODE VARCHAR(255) NOT NULL,CONSTRAINT UK_BEA7VF915MGF2TGT955FYOPSR UNIQUE(O_EMAILADDRESS),CONSTRAINT UK_6SUDX7DT2IDAPA73FPOLSIBFL UNIQUE(O_INVITATIONCODE))+CREATE INDEX IDXKXAAPVL90JMQJLPL8778HQ59S ON PUBLIC.O_USERINVITATION(O_EMAILADDRESS)+CREATE INDEX IDXQU4YKKDUQSMLHT9PKSFII87B4 ON PUBLIC.O_USERINVITATION(O_INVITATIONCODE)+CREATE MEMORY TABLE PUBLIC.O_WORKSPACE(O_ID BIGINT NOT NULL PRIMARY KEY,O_ACTIVEDATE TIMESTAMP,O_BRANCH VARCHAR(255),O_COMMITHASH VARCHAR(255) NOT NULL,O_CREATEDATE TIMESTAMP NOT NULL,O_FORTASKAUTOMATION BOOLEAN NOT NULL,O_INACTIVEDATE TIMESTAMP,O_K8SPVCNAME VARCHAR(255),O_MERGEIFACCEPTABLE BOOLEAN NOT NULL,O_NUMBER BIGINT NOT NULL,O_PARTICIPATINGUSERIDS BLOB(255),O_PROVISIONERNAME VARCHAR(255),O_SERVERADDRESS VARCHAR(255),O_SPECNAME VARCHAR(255) NOT NULL,O_STATUS INTEGER NOT NULL,O_TOKEN VARCHAR(255) NOT NULL,O_AGENT_ID BIGINT,O_ISSUE_ID BIGINT,O_NUMBERSCOPE_ID BIGINT NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_REQUEST_ID BIGINT,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKKR7KNMV9C6EKNVA2FRGHR6GLM UNIQUE(O_NUMBERSCOPE_ID,O_NUMBER),CONSTRAINT FKIEKRTB1AIM12ACAX2LDVD87N FOREIGN KEY(O_AGENT_ID) REFERENCES PUBLIC.O_AGENT(O_ID),CONSTRAINT FKI0AAIH9EBO5S8MKCTOX2OY73Q FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID),CONSTRAINT FKEFA43SPIN58VUMJWIFMPWCE07 FOREIGN KEY(O_NUMBERSCOPE_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FK42G0K1SIF2B75M2RI8PV0OMW1 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FKTD83BG6UARJWQ436SPFT0FKGB FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID),CONSTRAINT FKKRELP11GPWMNPTAHTAIGLNOS4 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID))+CREATE INDEX IDXBNQTSCGCPECOU0O98E1EF2UAJ ON PUBLIC.O_WORKSPACE(O_SPECNAME)+CREATE INDEX IDXB96P1LAHL180SFJC3VQMYFRB9 ON PUBLIC.O_WORKSPACE(O_STATUS)+CREATE INDEX IDX9GEB43LCBWR0WHNET1HV1YK25 ON PUBLIC.O_WORKSPACE(O_BRANCH)+CREATE INDEX IDX2F4OCEVSAQKQJ1YCXV9CDI73J ON PUBLIC.O_WORKSPACE(O_CREATEDATE)+CREATE INDEX IDX6058175AP61BJ2KL8CW9CK0GT ON PUBLIC.O_WORKSPACE(O_ACTIVEDATE)+CREATE INDEX IDXH9DF4CXMPJ5MOX88JY1J5MP8M ON PUBLIC.O_WORKSPACE(O_NUMBER)+CREATE MEMORY TABLE PUBLIC.O_WORKSPACEQUERYPERSONALIZATION(O_ID BIGINT NOT NULL PRIMARY KEY,O_QUERIES BLOB(65535) NOT NULL,O_QUERYSUBSCRIPTIONS BLOB(65535) NOT NULL,O_PROJECT_ID BIGINT NOT NULL,O_USER_ID BIGINT NOT NULL,CONSTRAINT UKMK796EPK287EDJ2V9RVB0UG8H UNIQUE(O_PROJECT_ID,O_USER_ID),CONSTRAINT FKI83X1C5EPJDXC428395OYD1HO FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID),CONSTRAINT FKLS0P5J3XLH1P2WCCPN0VVLFEQ FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID))+ALTER TABLE PUBLIC.O_ACCESSTOKEN ADD CONSTRAINT FKIRJ2PI2NR85RQ82N5PL6PPCXE FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ACCESSTOKENAUTHORIZATION ADD CONSTRAINT FK9STIQA0RBE2URQ8VVSFWH1REB FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_ACCESSTOKENAUTHORIZATION ADD CONSTRAINT FKHPBLUVKEYFGMLHKEFPU46ME8R FOREIGN KEY(O_ROLE_ID) REFERENCES PUBLIC.O_ROLE(O_ID)+ALTER TABLE PUBLIC.O_AGENT ADD CONSTRAINT FKP1AV15M2H3JDDQ9V38CCV3BMN FOREIGN KEY(O_LASTUSEDDATE_ID) REFERENCES PUBLIC.O_AGENTLASTUSEDDATE(O_ID)+ALTER TABLE PUBLIC.O_AGENT ADD CONSTRAINT FK43JR14FN5UJSCXKR63CEG84CC FOREIGN KEY(O_TOKEN_ID) REFERENCES PUBLIC.O_AGENTTOKEN(O_ID)+ALTER TABLE PUBLIC.O_AUDIT ADD CONSTRAINT FK6AWLLLV7YT75276URSD5BFTO6 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_AUDIT ADD CONSTRAINT FKT884NJKC0Q1CIV9Q1KY8AAJQG FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_BASEAUTHORIZATION ADD CONSTRAINT FKHB5VTW5UWPA947QNBKQQFLI4I FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_BASEAUTHORIZATION ADD CONSTRAINT FK7HJTHUT90UL18W1F5F0VC6N85 FOREIGN KEY(O_ROLE_ID) REFERENCES PUBLIC.O_ROLE(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FKQJ6V41BI61XEMFB43BJ265QXO FOREIGN KEY(O_CANCELLER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FKCQT648WIMYGI8L5MLNA7N9XFR FOREIGN KEY(O_ISSUE_ID) REFERENCES PUBLIC.O_ISSUE(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FKBQWV7VANJIOKGXQA3NN8H2AQU FOREIGN KEY(O_NUMBERSCOPE_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FK7DU5V10CPRNVK1N2H5E68TDY9 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FKKU04D28CUXEMV5A3YMQE79T98 FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID)+ALTER TABLE PUBLIC.O_BUILD ADD CONSTRAINT FK80P4S2SYP4JYT201E0SKXDWVN FOREIGN KEY(O_SUBMITTER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_BUILDLABEL ADD CONSTRAINT FKJ9QU741COO9M5AFOQDTPLWCV4 FOREIGN KEY(O_SPEC_ID) REFERENCES PUBLIC.O_LABELSPEC(O_ID)+ALTER TABLE PUBLIC.O_BUILDQUERYPERSONALIZATION ADD CONSTRAINT FKFL32VHSUIF9357TNRHCSBT8SF FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_BUILDQUERYPERSONALIZATION ADD CONSTRAINT FKNJKQMW5GFC3B2OTD5OJW37BW1 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CHAT ADD CONSTRAINT FKE78JO0UDULQQ9UUYCAFVKYAHI FOREIGN KEY(O_AI_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CHAT ADD CONSTRAINT FK6QMUF9QJIQFVADQQXSWTKR8GG FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENT ADD CONSTRAINT FK4DOX4328VV5RFTC06VTPLV3PK FOREIGN KEY(O_PULLREQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENT ADD CONSTRAINT FKAPO41GKW1C0HBFE448218TY2H FOREIGN KEY(O_LAST_ACTIVITY_USER) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENT ADD CONSTRAINT FK5MYVWVGQA7B1QB94RI6RTJJH4 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENT ADD CONSTRAINT FKN8GQLIGBSQFGJYO9SA1LURWL FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTMENTION ADD CONSTRAINT FKSTNPVFR1PIJW5PITFKVHVQXJP FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTQUERYPERSONALIZATION ADD CONSTRAINT FKPW081VLQGHPXLXJMSDSRNCSIM FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTQUERYPERSONALIZATION ADD CONSTRAINT FKDB4OPG8EK20HYE9HWOCH1A6EU FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTREPLY ADD CONSTRAINT FKI6YO1L8DF3T1RXG8073ET0O21 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTREPLY ADD CONSTRAINT FK3XYOBKVRYNF1XH3JIJ83T8DHK FOREIGN KEY(O_PULLREQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTSTATUSCHANGE ADD CONSTRAINT FKLGH09M07Y3KVVS7SUYITG0F2Q FOREIGN KEY(O_PULLREQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTSTATUSCHANGE ADD CONSTRAINT FKLHEXFHQGR0VKHIL19IGDVLLNE FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_CODECOMMENTTOUCH ADD CONSTRAINT FKO1JM0PKDVUSE5GRXI6X8VE07P FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_COMMITQUERYPERSONALIZATION ADD CONSTRAINT FKT89T18NRRSLN889D0P19UMSAV FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_COMMITQUERYPERSONALIZATION ADD CONSTRAINT FK2SPP35E7O8AOSEUCFFSVWY0H7 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_DASHBOARD ADD CONSTRAINT FK91YUL0VYU02BC9TSRUC0BG1K FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_DASHBOARDGROUPSHARE ADD CONSTRAINT FKFOB1T0JS06FRTKKU3KUGIQWY9 FOREIGN KEY(O_GROUP_ID) REFERENCES PUBLIC.O_GROUP(O_ID)+ALTER TABLE PUBLIC.O_DASHBOARDUSERSHARE ADD CONSTRAINT FK9G200IH6LCKN497L5S0TTIV6T FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_DASHBOARDVISIT ADD CONSTRAINT FK94U2JLEWJPNIPO80Q0LYIOG4T FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_EMAILADDRESS ADD CONSTRAINT FKDARWH81IJUPOXMPSCHGI2YIIM FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_GITLFSLOCK ADD CONSTRAINT FKBQ0KAROIMB91LER1X9TTMTMFY FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_GITLFSLOCK ADD CONSTRAINT FK4SFBNJEG66X1KV1TW5J7Q5AKM FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_GPGKEY ADD CONSTRAINT FK8HQPOYI1T7W9SO5R5G24TC5FL FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_GROUPAUTHORIZATION ADD CONSTRAINT FKTE7OYHW5YHPECLKJMKYH6E7D6 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_GROUPAUTHORIZATION ADD CONSTRAINT FK8CKUBER0QYN92LOFPIUHUCYF8 FOREIGN KEY(O_ROLE_ID) REFERENCES PUBLIC.O_ROLE(O_ID)+ALTER TABLE PUBLIC.O_GROUPENTITLEMENT ADD CONSTRAINT FKA0392O2URRUEJ6MVMYAD1I406 FOREIGN KEY(O_AI_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUE ADD CONSTRAINT FKQ84AHT0N933VKFE5RAKNCS84Y FOREIGN KEY(O_LAST_ACTIVITY_USER) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUE ADD CONSTRAINT FKTH8NQER31RPT0VJY8CSFGAMBA FOREIGN KEY(O_NUMBERSCOPE_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_ISSUE ADD CONSTRAINT FKPWKGCI0XWFOG055S2P7K91F58 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_ISSUE ADD CONSTRAINT FKC2GFH8KLMUYQ0NFNDODQADN11 FOREIGN KEY(O_SUBMITTER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEAUTHORIZATION ADD CONSTRAINT FKFV13WKU3S18S6GN6K1X988IN7 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUECHANGE ADD CONSTRAINT FK8PU94LEG2GYJM4QWEK3UNYG8C FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUECOMMENT ADD CONSTRAINT FK8EU1SOPLBD9IBIWSOI1SRYKSH FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUECOMMENTREACTION ADD CONSTRAINT FKQBAYD938IVJSP6A0B2QXME25N FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUECOMMENTREVISION ADD CONSTRAINT FKS5BT3LAV7CF1YSCT28GCXLVT0 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEDESCRIPTIONREVISION ADD CONSTRAINT FKNWIVG38XX359O9BTS1E6BNI7W FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUELINK ADD CONSTRAINT FKOB2G31QI7L6RXUYMQ6FJ9EXQQ FOREIGN KEY(O_SPEC_ID) REFERENCES PUBLIC.O_LINKSPEC(O_ID)+ALTER TABLE PUBLIC.O_ISSUEMENTION ADD CONSTRAINT FK5WUBEG1MBDKXROWGDQB87E6WE FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEQUERYPERSONALIZATION ADD CONSTRAINT FKNDCVUGFJ5R1FURL80TDOYRVLE FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_ISSUEQUERYPERSONALIZATION ADD CONSTRAINT FKE3BLNLHBAIKS5XE16H4QT84L6 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEREACTION ADD CONSTRAINT FKSASI07QDSWG3EVSGQDMCAOVBW FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUESCHEDULE ADD CONSTRAINT FKHX0N3I0491M3RN4GW2501NQ0M FOREIGN KEY(O_ITERATION_ID) REFERENCES PUBLIC.O_ITERATION(O_ID)+ALTER TABLE PUBLIC.O_ISSUETOUCH ADD CONSTRAINT FK20WY9HJU85LTPK6K9YL4XA51F FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_ISSUEVOTE ADD CONSTRAINT FKG47QNLHCPGCABWD4QQHA93EBI FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEWATCH ADD CONSTRAINT FKFRQWQW5M5LP4Y1MDF8T1TC5DV FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEWORK ADD CONSTRAINT FKCVCAXL0DLNPPQ71MIEMO9FGLU FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ISSUEWORKREACTION ADD CONSTRAINT FKA6HQ9WFDBOEC4T8FS3G2UN7IL FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_ITERATION ADD CONSTRAINT FKSOWT2I1H8H85PBE5FKH1YH6JH FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_LINKAUTHORIZATION ADD CONSTRAINT FK9864FNEYPTFICACTC5KCEPQ7I FOREIGN KEY(O_LINK_ID) REFERENCES PUBLIC.O_LINKSPEC(O_ID)+ALTER TABLE PUBLIC.O_LINKAUTHORIZATION ADD CONSTRAINT FKJC6LN2JARY4829PQBT2W32RPK FOREIGN KEY(O_ROLE_ID) REFERENCES PUBLIC.O_ROLE(O_ID)+ALTER TABLE PUBLIC.O_MEMBERSHIP ADD CONSTRAINT FKL17E7JPVTDC14ENN4UHTLYHPM FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PACK ADD CONSTRAINT FK4PHPQAP0206ORDSVIY1W4K40E FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_PACK ADD CONSTRAINT FK1QY3E3JFS9D9SYH9UC2H7C4IC FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PACKBLOB ADD CONSTRAINT FK36RUQ099QJWQUV3IDHW4GS7T1 FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_PACKQUERYPERSONALIZATION ADD CONSTRAINT FKTEQX7E3699XGL7JJTKEW3EKOP FOREIGN KEY(O_PROJECT_ID) REFERENCES PUBLIC.O_PROJECT(O_ID)+ALTER TABLE PUBLIC.O_PACKQUERYPERSONALIZATION ADD CONSTRAINT FK82TPFDVKE0JLJY43IEUAVNMHW FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PENDINGSUGGESTIONAPPLY ADD CONSTRAINT FK3KK3KXBIFE0HRIVVPTTRABFUU FOREIGN KEY(O_REQUEST_ID) REFERENCES PUBLIC.O_PULLREQUEST(O_ID)+ALTER TABLE PUBLIC.O_PENDINGSUGGESTIONAPPLY ADD CONSTRAINT FK34TFNG1RJQINMSHPOAG2KJ9IW FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PROJECT ADD CONSTRAINT FKMM06X2TRD1BR3LNW7H1CXT3NY FOREIGN KEY(O_LASTACTIVITYDATE_ID) REFERENCES PUBLIC.O_PROJECTLASTACTIVITYDATE(O_ID)+ALTER TABLE PUBLIC.O_PROJECTENTITLEMENT ADD CONSTRAINT FKR7B21HCPUGAGKHUXCABVXNKAP FOREIGN KEY(O_AI_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUEST ADD CONSTRAINT FKB1VWOK7R1P1H4XXFY12C3CGMY FOREIGN KEY(O_LAST_ACTIVITY_USER) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUEST ADD CONSTRAINT FK60160XL29VUGV04EMH50A3CV FOREIGN KEY(O_SUBMITTER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTASSIGNMENT ADD CONSTRAINT FKTLUE2OBQRIKTGESYKDYV83JUS FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTCHANGE ADD CONSTRAINT FK8L0R63JKKKQEKR8T8QMP250UY FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTCOMMENT ADD CONSTRAINT FK3GCIXBE5YPJDVOWESJLK6C5O5 FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTCOMMENTREACTION ADD CONSTRAINT FK55R3H3W3HVJFK7MY2SXEHRLRM FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTCOMMENTREVISION ADD CONSTRAINT FKF907BXRBYPL4MT9FEWL9QG2VI FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTDESCRIPTIONREVISION ADD CONSTRAINT FKCB9VWO9SJWCKDG83GBFFDXBQM FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTMENTION ADD CONSTRAINT FKBN0S10Y9KPS3G2JRX24498RHJ FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTQUERYPERSONALIZATION ADD CONSTRAINT FKOGH87B4R56EFI0BQF80RIRLBJ FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTREACTION ADD CONSTRAINT FKMVB846T5FUQVPNYOUGBPWDPNU FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTREVIEW ADD CONSTRAINT FKD0B9JJYHE7VXN73DLQFDN3V0J FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_PULLREQUESTWATCH ADD CONSTRAINT FKQCLMYK872U9PH2EKGFYL8Q79A FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_REVIEWEDDIFF ADD CONSTRAINT FKBWC0HECH4VACE79H0BHMA4UJB FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_SSHKEY ADD CONSTRAINT FKHCYBGC5RXADNHGJF53PW02ERP FOREIGN KEY(O_OWNER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_SSOACCOUNT ADD CONSTRAINT FKIA7YAHYBGIXTP1OJ5I575A5PL FOREIGN KEY(O_PROVIDER_ID) REFERENCES PUBLIC.O_SSOPROVIDER(O_ID)+ALTER TABLE PUBLIC.O_SSOACCOUNT ADD CONSTRAINT FKRVV4DHRBI8TG8CQBR9Y94P7AR FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)+ALTER TABLE PUBLIC.O_STOPWATCH ADD CONSTRAINT FKIEHJ0WL2A4P73UA1GVNO69QYN FOREIGN KEY(O_USER_ID) REFERENCES PUBLIC.O_USER(O_ID)diff --git a/server-core/src/test/java/io/onedev/server/rest/JakartaValidationServletTest.java b/server-core/src/test/java/io/onedev/server/rest/JakartaValidationServletTest.javanew file mode 100644index 0000000000..7a143179c0--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/rest/JakartaValidationServletTest.java@@ -0,0 +1,95 @@+package io.onedev.server.rest;++import static org.junit.jupiter.api.Assertions.assertTrue;++import java.util.List;+import java.util.Map;++import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Consumes;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.QueryParam;++import org.eclipse.jetty.server.LocalConnector;+import org.eclipse.jetty.server.Server;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletHolder;+import org.glassfish.jersey.server.ResourceConfig;+import org.glassfish.jersey.jackson.JacksonFeature;+import org.glassfish.jersey.server.validation.ValidationFeature;+import org.glassfish.jersey.servlet.ServletContainer;+import org.junit.jupiter.api.Test;++public class JakartaValidationServletTest {+ @Test+ public void validatesJakartaConstraintsThroughTheJakartaServletStack() throws Exception {+ var server = new Server();+ var connector = new LocalConnector(server);+ server.addConnector(connector);+ var context = new ServletContextHandler();+ context.setContextPath("/");+ server.setHandler(context);+ context.addServlet(new ServletHolder(new ServletContainer(+ new ResourceConfig(Resource.class, ValidationFeature.class, JacksonFeature.class))), "/*");+ try {+ server.start();+ assertTrue(connector.getResponse(request("/validation")).startsWith("HTTP/1.1 400"));+ assertTrue(connector.getResponse(request("/validation?name=x")).startsWith("HTTP/1.1 400"));+ assertTrue(connector.getResponse(request("/validation?name=valid")).startsWith("HTTP/1.1 200"));+ assertTrue(connector.getResponse(post("/validation/list", "[{}]")).startsWith("HTTP/1.1 400"));+ assertTrue(connector.getResponse(post("/validation/list", "[{\"name\":\"valid\"}]")).startsWith("HTTP/1.1 200"));+ assertTrue(connector.getResponse(post("/validation/map", "{\"key\":{}}")).startsWith("HTTP/1.1 400"));+ assertTrue(connector.getResponse(post("/validation/map", "{\"key\":{\"name\":\"valid\"}}")).startsWith("HTTP/1.1 200"));+ } finally {+ server.stop();+ }+ }++ private String request(String path) {+ return "GET " + path + " HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n";+ }++ private String post(String path, String json) {+ return "POST " + path + " HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n"+ + "Content-Type: application/json\r\nContent-Length: " + json.length() + "\r\n\r\n" + json;+ }++ @Path("/validation")+ public static class Resource {+ @GET+ public String get(@QueryParam("name") @NotNull @Size(min = 2) String name) {+ return name;+ }++ @POST+ @Path("/list")+ @Consumes("application/json")+ public String list(@NotNull List<@Valid Entry> entries) {+ return "valid";+ }++ @POST+ @Path("/map")+ @Consumes("application/json")+ public String map(@NotNull Map<String, @Valid Entry> entries) {+ return "valid";+ }+ }++ public static class Entry {+ private String name;++ @NotNull+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/rest/ParameterValueHelperTest.java b/server-core/src/test/java/io/onedev/server/rest/ParameterValueHelperTest.javanew file mode 100644index 0000000000..8085b0d543--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/rest/ParameterValueHelperTest.java@@ -0,0 +1,183 @@+package io.onedev.server.rest;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.*;++import java.util.List;+import java.util.function.Function;++import jakarta.ws.rs.BadRequestException;++import org.glassfish.jersey.server.ContainerRequest;+import org.glassfish.jersey.model.Parameter.Source;+import org.glassfish.jersey.server.spi.internal.ParamValueFactoryWithSource;+import org.glassfish.jersey.server.spi.internal.ParameterValueHelper;+import org.junit.jupiter.api.Test;++import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;+import com.fasterxml.jackson.annotation.PropertyAccessor;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.thoughtworks.xstream.XStream;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.rest.annotation.Immutable;+import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperModule;++public class ParameterValueHelperTest extends AppLoaderMocker {++ private Dao dao;+ private ObjectMapper mapper;++ @Override+ protected void setup() {+ dao = mock(Dao.class);+ mapper = new ObjectMapper().registerModule(new HibernateObjectMapperModule(dao));+ // Match ObjectMapperProvider: REST entities are mapped through their fields.+ mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE);+ mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);+ when(AppLoader.getInstance(XStream.class)).thenReturn(new XStream());+ }++ @Override+ protected void teardown() {+ }++ @Test+ public void updatesTheEntitySelectedByTheFirstArgumentAndClearsContext() {+ var entity = existingEntity(42L);+ var args = parameters(+ provider(Source.PATH, request -> 42L),+ provider(Source.ENTITY, request -> read(+ "{\"name\":\"updated\",\"immutableValue\":\"replacement\"}")),+ provider(Source.QUERY, request -> {+ // Even arguments after the body must be resolved before deserialization.+ verifyNoInteractions(dao);+ return "query";+ }));++ assertEquals(42L, args[0]);+ assertSame(entity, args[1]);+ assertEquals("query", args[2]);+ assertEquals("updated", entity.getName());+ assertEquals("retained", entity.getDescription());+ assertEquals("original", entity.getImmutableValue());+ assertEquals("before", entity.getOldVersion().getRootElement().elementText("name"));+ verify(dao).load(TestEntity.class, 42L);+ assertNoEntityContext();+ }++ @Test+ public void createsAnEntityWhenThereIsNoLeadingLongArgument() {+ var created = (TestEntity) parameters(provider(Source.ENTITY,+ request -> read("{\"name\":\"created\",\"immutableValue\":\"initial\"}")))[0];+ assertNull(created.getId());+ assertNull(created.getOldVersion());+ assertEquals("created", created.getName());+ assertEquals("initial", created.getImmutableValue());++ // A Long elsewhere in the argument list must not be treated as the entity ID.+ var args = parameters(provider(Source.QUERY, request -> "first"),+ provider(Source.PATH, request -> 42L),+ provider(Source.ENTITY, request -> read("{}")));+ assertNull(((TestEntity) args[2]).getId());+ verifyNoInteractions(dao);+ }++ @Test+ public void clearsContextWhenANonBodyParameterFails() {+ var failure = new BadRequestException("Invalid query parameter");+ assertSame(failure, assertThrows(BadRequestException.class, () -> parameters(+ provider(Source.PATH, request -> 42L),+ provider(Source.QUERY, request -> { throw failure; }),+ provider(Source.ENTITY, request -> fail("Body must not be read")))));+ assertNoEntityContext();+ }++ @Test+ public void clearsContextWhenBodyDeserializationFails() {+ existingEntity(42L);+ assertThrows(BadRequestException.class, () -> parameters(+ provider(Source.PATH, request -> 42L),+ provider(Source.ENTITY, request -> read("{\"description\":\"retained\",\"name\":"))));+ verify(dao).load(TestEntity.class, 42L);+ assertNoEntityContext();+ }++ @Test+ public void restoresOuterContextAfterNestedSuccessAndFailure() {+ var outer = existingEntity(42L);+ var inner = existingEntity(7L);+ var args = parameters(provider(Source.PATH, request -> 42L),+ provider(Source.ENTITY, request -> {+ var nested = parameters(provider(Source.PATH, nestedRequest -> 7L),+ provider(Source.ENTITY, nestedRequest -> read("{\"name\":\"inner\"}")));+ assertSame(inner, nested[1]);+ assertSame(outer, read("{\"name\":\"after success\"}"));++ assertThrows(BadRequestException.class, () -> parameters(+ provider(Source.PATH, nestedRequest -> 7L),+ provider(Source.ENTITY, nestedRequest -> read("{\"description\":\"retained\",\"name\":"))));+ return read("{\"name\":\"after failure\"}");+ }));+ assertSame(outer, args[1]);+ assertEquals("after failure", outer.getName());+ assertEquals("inner", inner.getName());+ assertNoEntityContext();+ }++ private TestEntity existingEntity(Long id) {+ var entity = new TestEntity();+ entity.setId(id);+ entity.setName("before");+ entity.setDescription("retained");+ entity.setImmutableValue("original");+ when(dao.load(TestEntity.class, id)).thenReturn(entity);+ return entity;+ }++ private void assertNoEntityContext() {+ clearInvocations(dao);+ // Deserialize outside Jersey on the same thread to detect a leaked argument array.+ var created = read("{\"name\":\"fresh\"}");+ assertNull(created.getId());+ assertNull(created.getOldVersion());+ assertEquals("fresh", created.getName());+ verifyNoInteractions(dao);+ }++ private TestEntity read(String json) {+ try {+ return mapper.readValue(json, TestEntity.class);+ } catch (JsonProcessingException e) {+ throw new BadRequestException(e);+ }+ }++ private ParamValueFactoryWithSource<?> provider(Source source, Function<ContainerRequest, ?> function) {+ return new ParamValueFactoryWithSource<>(function, source);+ }++ private Object[] parameters(ParamValueFactoryWithSource<?>... providers) {+ return ParameterValueHelper.getParameterValues(List.of(providers), null);+ }++ public static class TestEntity extends AbstractEntity {+ private static final long serialVersionUID = 1L;++ private String name;+ private String description;+ @Immutable+ private String immutableValue;++ public String getName() { return name; }+ public void setName(String name) { this.name = name; }+ public String getDescription() { return description; }+ public void setDescription(String description) { this.description = description; }+ public String getImmutableValue() { return immutableValue; }+ public void setImmutableValue(String immutableValue) { this.immutableValue = immutableValue; }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.javaindex 28af68f7ff..7265c40eae 100644--- a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java+++ b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java@@ -1,7 +1,7 @@package io.onedev.server.search.commit;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.io.IOException;import java.util.Collection;@@ -11,7 +11,7 @@ import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.invocation.InvocationOnMock;import org.mockito.stubbing.Answer;diff --git a/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.javaindex 0b0e93fe19..ff3bb93860 100644--- a/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.codecomment;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.commons.codeassist.CodeAssist;import io.onedev.commons.codeassist.FenceAware;diff --git a/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.javaindex a414bd28fd..8a684d9bd0 100644--- a/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.issue;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.commons.codeassist.CodeAssist;import io.onedev.commons.codeassist.FenceAware;diff --git a/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.javaindex d9babf60d1..e3ca293561 100644--- a/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java@@ -1,10 +1,10 @@package io.onedev.server.search.entity.pullrequest;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.commons.codeassist.CodeAssist;import io.onedev.commons.codeassist.FenceAware;diff --git a/server-core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java b/server-core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.javaindex dc3dcc4f41..6b3cf917e5 100644--- a/server-core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java+++ b/server-core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java@@ -1,9 +1,9 @@package io.onedev.server.search.query.regex;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.base.Splitter;diff --git a/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.javaindex 89b1e7d079..2431f56609 100644--- a/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/util/BeanUtilsTest.java@@ -1,12 +1,12 @@package io.onedev.server.util;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.lang.reflect.Method;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class BeanUtilsTest {diff --git a/server-core/src/test/java/io/onedev/server/util/ContentDetectorTest.java b/server-core/src/test/java/io/onedev/server/util/ContentDetectorTest.javaindex 8ab58fc46c..43eca5ad03 100644--- a/server-core/src/test/java/io/onedev/server/util/ContentDetectorTest.java+++ b/server-core/src/test/java/io/onedev/server/util/ContentDetectorTest.java@@ -1,12 +1,12 @@package io.onedev.server.util;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.io.IOException;import java.nio.charset.StandardCharsets;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.io.Resources;diff --git a/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java b/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.javaindex 50412ba6a7..f1424badd7 100644--- a/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java+++ b/server-core/src/test/java/io/onedev/server/util/PathComparatorTest.java@@ -1,8 +1,8 @@package io.onedev.server.util;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class PathComparatorTest {diff --git a/server-core/src/test/java/io/onedev/server/util/RangeBuilderTest.java b/server-core/src/test/java/io/onedev/server/util/RangeBuilderTest.javaindex 87be7f23ca..1e24c1cb3a 100644--- a/server-core/src/test/java/io/onedev/server/util/RangeBuilderTest.java+++ b/server-core/src/test/java/io/onedev/server/util/RangeBuilderTest.java@@ -1,10 +1,10 @@package io.onedev.server.util;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Lists;diff --git a/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java b/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.javaindex d8efd1826a..71cc57cd7f 100644--- a/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java+++ b/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java@@ -1,8 +1,8 @@package io.onedev.server.util;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;diff --git a/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.javaindex 069eaf26c0..fd54d0b71e 100644--- a/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/util/ReflectionUtilsTest.java@@ -1,11 +1,11 @@package io.onedev.server.util;-import static org.junit.Assert.assertSame;+import static org.junit.jupiter.api.Assertions.assertSame;import java.lang.reflect.Method;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.base.Optional;diff --git a/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java b/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.javaindex 645d507a0b..d94d0f790d 100644--- a/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java+++ b/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java@@ -1,10 +1,10 @@package io.onedev.server.util;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.text.ParseException;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;public class SemanticVersionTest {diff --git a/server-core/src/test/java/io/onedev/server/util/StringTransformerTest.java b/server-core/src/test/java/io/onedev/server/util/StringTransformerTest.javaindex 690568fc8a..c9c6aa5895 100644--- a/server-core/src/test/java/io/onedev/server/util/StringTransformerTest.java+++ b/server-core/src/test/java/io/onedev/server/util/StringTransformerTest.java@@ -1,11 +1,11 @@package io.onedev.server.util;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.util.regex.Matcher;import java.util.regex.Pattern;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;public class StringTransformerTest {diff --git a/server-core/src/test/java/io/onedev/server/util/UrlUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/UrlUtilsTest.javaindex 1cd7345067..08ab90d7ad 100644--- a/server-core/src/test/java/io/onedev/server/util/UrlUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/util/UrlUtilsTest.java@@ -1,8 +1,8 @@package io.onedev.server.util;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class UrlUtilsTest {diff --git a/server-core/src/test/java/io/onedev/server/util/VersionTest.java b/server-core/src/test/java/io/onedev/server/util/VersionTest.javaindex 50617b0551..ffaadfa902 100644--- a/server-core/src/test/java/io/onedev/server/util/VersionTest.java+++ b/server-core/src/test/java/io/onedev/server/util/VersionTest.java@@ -1,11 +1,11 @@package io.onedev.server.util;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertTrue;-import static org.junit.Assert.fail;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.junit.jupiter.api.Assertions.fail;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class VersionTest {diff --git a/server-core/src/test/java/io/onedev/server/util/criteria/CriteriaTest.java b/server-core/src/test/java/io/onedev/server/util/criteria/CriteriaTest.javaindex 8601d95d4f..d5424929d2 100644--- a/server-core/src/test/java/io/onedev/server/util/criteria/CriteriaTest.java+++ b/server-core/src/test/java/io/onedev/server/util/criteria/CriteriaTest.java@@ -2,13 +2,13 @@ package io.onedev.server.util.criteria;import static com.google.common.collect.Lists.newArrayList;import static com.google.common.collect.Sets.newHashSet;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.Collection;import java.util.HashSet;import java.util.Set;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.util.Pair;diff --git a/server-core/src/test/java/io/onedev/server/util/diff/DiffUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/diff/DiffUtilsTest.javaindex c568851511..2f45e05a67 100644--- a/server-core/src/test/java/io/onedev/server/util/diff/DiffUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/util/diff/DiffUtilsTest.java@@ -1,10 +1,10 @@package io.onedev.server.util.diff;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Lists;diff --git a/server-core/src/test/java/io/onedev/server/util/facade/FacadeLookupCacheTest.java b/server-core/src/test/java/io/onedev/server/util/facade/FacadeLookupCacheTest.javanew file mode 100644index 0000000000..5099bd3cab--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/util/facade/FacadeLookupCacheTest.java@@ -0,0 +1,304 @@+package io.onedev.server.util.facade;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;++import java.util.Collection;+import java.util.HashMap;++import org.apache.commons.lang3.SerializationUtils;+import org.junit.jupiter.api.Test;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;+import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.SystemSetting;+import io.onedev.server.model.support.code.GitPackConfig;+import io.onedev.server.service.SettingService;+import io.onedev.server.service.UserService;++public class FacadeLookupCacheTest extends AppLoaderMocker {++ private SystemSetting systemSetting;++ private UserService userService;++ @Override+ protected void setup() {+ systemSetting = new SystemSetting();+ systemSetting.setNoreplyEmailDomain("noreply.example.com");+ var settingService = mock(SettingService.class);+ when(settingService.getSystemSetting()).thenReturn(systemSetting);+ when(AppLoader.getInstance(SettingService.class)).thenReturn(settingService);+ userService = mock(UserService.class);+ when(AppLoader.getInstance(UserService.class)).thenReturn(userService);+ }++ @Override+ protected void teardown() {+ }++ @Test+ public void userLookupsAvoidRepeatedScansAndReadCurrentRecords() {+ var records = new CountingMap<UserFacade>();+ var cache = new UserCache(records);+ var user = user(1L, "alice", false);+ records.put(1L, user);+ assertSame(user, cache.findByName("ALICE"));+ assertSame(user, cache.findByName("alice"));+ assertEquals(1, records.scans);++ // Mutate the delegate directly, as replication does, without going through the cache.+ var updated = user(1L, "alice", true);+ records.put(1L, updated);+ assertSame(updated, cache.findByName("alice"));+ assertEquals(1, records.scans);++ var renamed = user(1L, "bob", true);+ records.put(1L, renamed);+ assertNull(cache.findByName("alice"));+ assertSame(renamed, cache.findByName("bob"));+ var replacement = user(2L, "alice", false);+ records.put(2L, replacement);+ assertSame(replacement, cache.findByName("alice"));+ records.remove(2L);+ assertNull(cache.findByName("alice"));+ records.clear();+ assertNull(cache.findByName("bob"));+ }++ @Test+ public void emailValueLookupsAvoidRepeatedScansAndFollowAddressChanges() {+ var records = new CountingMap<EmailAddressFacade>();+ var cache = new EmailAddressCache(records);+ var address = new EmailAddressFacade(1L, 10L, "[email protected]", true, "unverified");+ records.put(1L, address);+ assertSame(address, cache.findByValue("[email protected]"));+ assertSame(address, cache.findByValue("[email protected]"));+ assertEquals(1, records.scans);++ var verified = new EmailAddressFacade(1L, 10L, "[email protected]", true, null);+ records.put(1L, verified);+ assertSame(verified, cache.findByValue("[email protected]"));+ assertEquals(1, records.scans);++ var changed = new EmailAddressFacade(1L, 10L, "[email protected]", true, null);+ records.put(1L, changed);+ assertNull(cache.findByValue("[email protected]"));+ assertSame(changed, cache.findByValue("[email protected]"));+ var replacement = new EmailAddressFacade(2L, 20L, "[email protected]", true, null);+ records.put(2L, replacement);+ assertSame(replacement, cache.findByValue("[email protected]"));+ records.remove(2L);+ assertNull(cache.findByValue("[email protected]"));+ records.clear();+ assertNull(cache.findByValue("[email protected]"));+ }++ @Test+ public void noreplyLookupsFollowCurrentDomainAndUserDespiteCachedAddress() {+ var records = new CountingMap<EmailAddressFacade>();+ var cache = new EmailAddressCache(records);+ var address = new EmailAddressFacade(1L, 10L, "[email protected]", true, null);+ records.put(1L, address);+ assertSame(address, cache.findByValue("[email protected]"));++ systemSetting.setNoreplyEmailDomain("example.com");+ when(userService.findFacadeByName("alice")).thenReturn(user(20L, "alice", false));+ var noreply = cache.findByValue("[email protected]");+ assertNull(noreply.getId());+ assertEquals(20L, noreply.getOwnerId());+ assertEquals("[email protected]", noreply.getValue());+ assertFalse(noreply.isPrimary());+ assertTrue(noreply.isVerified());+ when(userService.findFacadeByName("alice")).thenReturn(null);+ assertNull(cache.findByValue("[email protected]"));+ when(userService.findFacadeByName("alice")).thenReturn(user(30L, "alice", false));+ assertEquals(30L, cache.findByValue("[email protected]").getOwnerId());+ assertEquals(1, records.scans);++ systemSetting.setNoreplyEmailDomain("noreply.example.com");+ assertSame(address, cache.findByValue("[email protected]"));+ assertEquals(1, records.scans);+ }++ @Test+ public void primaryLookupsAvoidRepeatedScansAndFollowEmailChanges() {+ var records = new CountingMap<EmailAddressFacade>();+ var cache = new EmailAddressCache(records);+ var primary = email(1L, 10L, true, "unverified");+ records.put(1L, primary);+ assertSame(primary, cache.findPrimary(10L));+ assertSame(primary, cache.findPrimary(10L));+ assertEquals(1, records.scans);++ var verified = email(1L, 10L, true, null);+ records.put(1L, verified);+ assertSame(verified, cache.findPrimary(10L));+ assertEquals(1, records.scans);++ records.put(1L, email(1L, 10L, false, null));+ var replacement = email(2L, 10L, true, null);+ records.put(2L, replacement);+ assertSame(replacement, cache.findPrimary(10L));+ records.remove(2L);+ assertNull(cache.findPrimary(10L));+ records.put(2L, replacement);+ assertSame(replacement, cache.findPrimary(10L));++ var transferred = email(2L, 20L, true, null);+ records.put(2L, transferred);+ assertNull(cache.findPrimary(10L));+ assertSame(transferred, cache.findPrimary(20L));+ records.clear();+ assertNull(cache.findPrimary(20L));+ }++ @Test+ public void projectPathLookupsAvoidRepeatedScansAndFollowMoves() {+ var records = new CountingMap<ProjectFacade>();+ var cache = new ProjectCache(records);+ var project = project(1L, "parent/project", "PRJ");+ records.put(1L, project);+ assertSame(project, cache.findByPath("PARENT/PROJECT"));+ assertSame(project, cache.findByPath("parent/project"));+ assertEquals(1, records.scans);++ var updated = project(1L, "parent/project", "NEW");+ records.put(1L, updated);+ assertSame(updated, cache.findByPath("Parent/Project"));+ assertEquals(1, records.scans);++ var moved = project(1L, "renamed/project", "NEW");+ records.put(1L, moved);+ assertNull(cache.findByPath("parent/project"));+ assertSame(moved, cache.findByPath("renamed/project"));+ var replacement = project(2L, "parent/project", "PRJ");+ records.put(2L, replacement);+ assertSame(replacement, cache.findByPath("PARENT/PROJECT"));+ records.remove(2L);+ assertNull(cache.findByPath("parent/project"));+ records.clear();+ assertNull(cache.findByPath("renamed/project"));+ }++ @Test+ public void projectKeyLookupsPreserveCaseSensitivityAndFollowKeyChanges() {+ var records = new CountingMap<ProjectFacade>();+ var cache = new ProjectCache(records);+ var project = project(1L, "parent/project", "PRJ");+ records.put(1L, project);+ assertSame(project, cache.findByKey("PRJ"));+ assertSame(project, cache.findByKey("PRJ"));+ assertEquals(1, records.scans);+ assertNull(cache.findByKey("prj"));++ var moved = project(1L, "renamed/project", "PRJ");+ records.put(1L, moved);+ assertSame(moved, cache.findByKey("PRJ"));+ assertEquals(2, records.scans);++ var changed = project(1L, "renamed/project", "NEW");+ records.put(1L, changed);+ assertNull(cache.findByKey("PRJ"));+ assertSame(changed, cache.findByKey("NEW"));+ var replacement = project(2L, "parent/project", "PRJ");+ records.put(2L, replacement);+ assertSame(replacement, cache.findByKey("PRJ"));+ records.put(2L, project(2L, "parent/project", null));+ assertNull(cache.findByKey("PRJ"));+ records.remove(1L);+ assertNull(cache.findByKey("NEW"));+ }++ @Test+ public void missingLookupsSeeSubsequentInsertions() {+ var users = new UserCache(new HashMap<>());+ assertNull(users.findByName("alice"));+ var user = user(1L, "alice", false);+ users.put(1L, user);+ assertSame(user, users.findByName("alice"));++ var emails = new EmailAddressCache(new HashMap<>());+ assertNull(emails.findPrimary(1L));+ assertNull(emails.findByValue("[email protected]"));+ var email = email(1L, 1L, true, null);+ emails.put(1L, email);+ assertSame(email, emails.findPrimary(1L));+ assertSame(email, emails.findByValue("[email protected]"));++ var projects = new ProjectCache(new HashMap<>());+ assertNull(projects.findByPath("parent/project"));+ assertNull(projects.findByKey("PRJ"));+ var project = project(1L, "parent/project", "PRJ");+ projects.put(1L, project);+ assertSame(project, projects.findByPath("parent/project"));+ assertSame(project, projects.findByKey("PRJ"));+ }++ @Test+ public void snapshotsAndSerializationPreserveLookupBehavior() {+ var users = new UserCache(new HashMap<>());+ users.put(1L, user(1L, "alice", false));+ users.findByName("alice");+ var userSnapshot = users.clone();+ var restoredUsers = SerializationUtils.clone(users);+ users.put(1L, user(1L, "bob", false));+ assertNotNull(userSnapshot.findByName("alice"));+ assertNotNull(restoredUsers.findByName("alice"));+ assertNull(users.findByName("alice"));+ assertNotNull(users.findByName("bob"));++ var emails = new EmailAddressCache(new HashMap<>());+ emails.put(1L, email(1L, 1L, true, null));+ emails.findPrimary(1L);+ emails.findByValue("[email protected]");+ var emailSnapshot = emails.clone();+ var restoredEmails = SerializationUtils.clone(emails);+ emails.clear();+ assertNotNull(emailSnapshot.findPrimary(1L));+ assertNotNull(restoredEmails.findPrimary(1L));+ assertNull(emails.findPrimary(1L));+ assertNotNull(emailSnapshot.findByValue("[email protected]"));+ assertNotNull(restoredEmails.findByValue("[email protected]"));+ assertNull(emails.findByValue("[email protected]"));++ var projects = new ProjectCache(new HashMap<>());+ projects.put(1L, project(1L, "parent/project", "PRJ"));+ projects.findByPath("parent/project");+ projects.findByKey("PRJ");+ var projectSnapshot = projects.clone();+ var restoredProjects = SerializationUtils.clone(projects);+ projects.clear();+ assertNotNull(projectSnapshot.findByPath("PARENT/PROJECT"));+ assertNotNull(projectSnapshot.findByKey("PRJ"));+ assertNotNull(restoredProjects.findByPath("PARENT/PROJECT"));+ assertNotNull(restoredProjects.findByKey("PRJ"));+ assertNull(projects.findByPath("parent/project"));+ assertNull(projects.findByKey("PRJ"));+ }++ private static UserFacade user(Long id, String name, boolean disabled) {+ return new UserFacade(id, name, name, User.Type.ORDINARY, disabled, false, false);+ }++ private static EmailAddressFacade email(Long id, Long ownerId, boolean primary, String verificationCode) {+ return new EmailAddressFacade(id, ownerId, id + "@example.com", primary, verificationCode);+ }++ private static ProjectFacade project(Long id, String path, String key) {+ return new ProjectFacade(id, "project", key, path, null, true, true,+ new GitPackConfig(), id, null, null);+ }++ private static class CountingMap<V> extends HashMap<Long, V> {+ private int scans;++ @Override+ public Collection<V> values() {+ scans++;+ return super.values();+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.javaindex f01904a72a..4bd97834f9 100644--- a/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java+++ b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java@@ -1,12 +1,12 @@package io.onedev.server.util.interpolative;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.util.ArrayList;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Lists;diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javaindex bace2f875b..8034b0f1fe 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -1,10 +1,10 @@package io.onedev.server.util.patternset;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.function.Function;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.google.common.collect.Sets;diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.javaindex fe35192af1..5d43dd6ecc 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java@@ -1,9 +1,9 @@package io.onedev.server.util.patternset;import com.google.common.collect.Sets;-import org.junit.Test;+import org.junit.jupiter.api.Test;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class PatternSetGrammarTest {diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationContainerCascadeTest.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationContainerCascadeTest.javanew file mode 100644index 0000000000..6c5c17160b--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationContainerCascadeTest.java@@ -0,0 +1,91 @@+package io.onedev.server.validation;++import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;++import java.util.List;+import java.util.Map;++import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;++import org.junit.jupiter.api.Test;++import io.onedev.server.model.support.code.BranchProtection;+import io.onedev.server.model.support.code.FileProtection;++public class HibernateValidationContainerCascadeTest extends HibernateValidationTestSupport {++ @Test+ public void fileProtectionsRetainPropertyAndClassValidation() {+ var branch = new BranchProtection();+ branch.setBranches("main");+ var missingPaths = new FileProtection();+ missingPaths.setJobNames(List.of("build"));+ var missingRequirement = new FileProtection();+ missingRequirement.setPaths("src/**");+ branch.setFileProtections(List.of(missingPaths, missingRequirement));+ assertPaths(validator.validate(branch), "fileProtections[0].paths");++ missingPaths.setPaths("docs/**");+ assertPaths(validator.validate(branch), "fileProtections[1]");+ missingRequirement.setJobNames(List.of("test"));+ assertPaths(validator.validate(branch));++ var property = validator.getConstraintsForClass(BranchProtection.class)+ .getConstraintsForProperty("fileProtections");+ assertFalse(property.isCascaded());+ assertTrue(property.getConstrainedContainerElementTypes().iterator().next().isCascaded());+ }++ @Test+ public void containerCascadesRespectGetterOverrides() {+ assertPaths(validator.validate(new Parent()), "children[0].name");+ assertPaths(validator.validate(new Inherited()), "children[0].name");+ assertPaths(validator.validate(new Redeclared()), "children[0].name");+ assertPaths(validator.validate(new Removed()));+ }++ @Test+ public void nestedContainerElementsAreValidated() {+ assertPaths(validator.validate(new Nested()), "children[key].<map value>[0].name");+ }++ public static class Child {+ @NotNull+ public String getName() {+ return null;+ }+ }++ public static class Parent {+ private final List<Child> children = List.of(new Child());++ public List<@Valid Child> getChildren() {+ return children;+ }+ }++ public static class Inherited extends Parent {+ }++ public static class Redeclared extends Parent {+ @Override+ public List<@Valid Child> getChildren() {+ return super.getChildren();+ }+ }++ public static class Removed extends Parent {+ @Override+ public List<Child> getChildren() {+ return super.getChildren();+ }+ }++ public static class Nested {+ public Map<String, List<@Valid Child>> getChildren() {+ return Map.of("key", List.of(new Child()));+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInheritanceTest.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInheritanceTest.javaindex 8c5a71dc5e..165872c1c0 100644--- a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInheritanceTest.java+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInheritanceTest.java@@ -1,17 +1,15 @@package io.onedev.server.validation;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.List;-import java.util.Set;-import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;-import javax.validation.groups.Default;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;+import jakarta.validation.groups.Default;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class HibernateValidationInheritanceTest extends HibernateValidationTestSupport {@@ -30,27 +28,36 @@ public class HibernateValidationInheritanceTest extends HibernateValidationTestS}@Test- public void defaultGroupRetainsParentConstraintsOfTheSameType() {- // Unlike validateValue and explicit groups, default-group bean/property validation- // also checks the parent's annotation when the child redeclares the same type.+ public void childGetterReplacesConstraintAttributesForEveryValidationPath() {var bean = new ChildSize();for (Class<?> group : new Class<?>[] {Default.class, Checks.class}) {bean.name = "abc";for (var violations : List.of(validator.validate(bean, group),validator.validateProperty(bean, "name", group))) {- if (group == Default.class) {- assertPaths(violations, "name");- assertEquals("parent size", violations.iterator().next().getMessage());- } else {- assertPaths(violations);- }+ assertPaths(violations);}bean.name = "a";for (var violations : List.of(validator.validate(bean, group),validator.validateProperty(bean, "name", group))) {- assertPaths(violations, group == Default.class ? new String[] {"name", "name"} : new String[] {"name"});- assertEquals(group == Default.class ? Set.of("parent size", "child size") : Set.of("child size"), violations.stream()- .map(it -> it.getMessage()).collect(Collectors.toSet()));+ assertPaths(violations, "name");+ assertEquals("child size", violations.iterator().next().getMessage());+ }+ }+ }++ @Test+ public void ungroupedOverridesReplaceParentConstraintsAndRemainInherited() {+ for (var bean : List.of(new UngroupedChildSize(), new InheritedChildSize())) {+ bean.name = "abc";+ assertPaths(validator.validate(bean));+ assertPaths(validator.validateProperty(bean, "name"));+ assertPaths(validator.validateValue(bean.getClass(), "name", "abc"));+ bean.name = "a";+ for (var violations : List.of(validator.validate(bean),+ validator.validateProperty(bean, "name"),+ validator.validateValue(bean.getClass(), "name", "a"))) {+ assertPaths(violations, "name");+ assertEquals("child size", violations.iterator().next().getMessage());}}}@@ -98,6 +105,26 @@ public class HibernateValidationInheritanceTest extends HibernateValidationTestS}}+ public static class UngroupedParentSize {+ String name;++ @Size(min = 5, message = "parent size")+ public String getName() {+ return name;+ }+ }++ public static class UngroupedChildSize extends UngroupedParentSize {+ @Override+ @Size(min = 2, message = "child size")+ public String getName() {+ return super.getName();+ }+ }++ public static class InheritedChildSize extends UngroupedChildSize {+ }+public static class RequiredName {@NotNullpublic String getName() {@@ -124,8 +151,7 @@ public class HibernateValidationInheritanceTest extends HibernateValidationTestSreturn child;}- @Valid- public List<RequiredName> getChildren() {+ public List<@Valid RequiredName> getChildren() {return children;}}@@ -153,8 +179,7 @@ public class HibernateValidationInheritanceTest extends HibernateValidationTestS}@Override- @Valid- public List<RequiredName> getChildren() {+ public List<@Valid RequiredName> getChildren() {return super.getChildren();}}diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInterpolationTest.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInterpolationTest.javaindex e550fa0558..d9eca76007 100644--- a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInterpolationTest.java+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationInterpolationTest.java@@ -1,9 +1,9 @@package io.onedev.server.validation;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNull;-import static org.junit.Assert.assertSame;-import static org.junit.Assert.assertThrows;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertThrows;import java.lang.annotation.Retention;import java.lang.annotation.Target;@@ -11,16 +11,16 @@ import java.util.List;import java.util.concurrent.Executors;import java.util.concurrent.TimeUnit;-import javax.validation.Constraint;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Payload;-import javax.validation.ValidationException;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.Constraint;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Payload;+import jakarta.validation.ValidationException;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import org.hibernate.validator.internal.metadata.core.MetaConstraint;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Interpolative;diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationOrderTest.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationOrderTest.javaindex f464f03b90..dd5b4b73ed 100644--- a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationOrderTest.java+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationOrderTest.java@@ -1,17 +1,17 @@package io.onedev.server.validation;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.ArrayList;import java.util.List;-import javax.validation.ConstraintValidatorContext;-import javax.validation.GroupSequence;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.validation.groups.Default;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.GroupSequence;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.groups.Default;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.annotation.ClassValidating;@@ -21,7 +21,7 @@ public class HibernateValidationOrderTest extends HibernateValidationTestSupportpublic void classValidationWaitsForPropertiesAndCascadedBeans() {// BuildSpec.isValid runs after nested jobs/steps are validated. Cover the default,// explicit group, and group-sequence paths through the customized ValidatorImpl.- for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class}) {+ for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class, DefaultFirstChecks.class}) {var root = new Root();root.name = "job";root.child.name = "step";@@ -31,35 +31,61 @@ public class HibernateValidationOrderTest extends HibernateValidationTestSupport}@Test- public void invalidPropertySuppressesClassValidationOnlyOutsideTheDefaultGroup() {- for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class}) {+ public void invalidPropertySuppressesClassValidation() {+ for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class, DefaultFirstChecks.class}) {var root = new Root();root.child.name = "step";assertPaths(validator.validate(root, group), "name");- // The default-group path bypasses the existing failure guard.- assertEquals(group == Default.class ? List.of("child", "root") : List.of(), root.calls);+ assertEquals(List.of(), root.calls);}}@Test- public void invalidNestedPropertySuppressesClassValidationOnlyOutsideTheDefaultGroup() {- for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class}) {+ public void invalidNestedPropertySuppressesClassValidation() {+ for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class, DefaultFirstChecks.class}) {var root = new Root();root.name = "job";assertPaths(validator.validate(root, group), "child.name");- assertEquals(group == Default.class ? List.of("child", "root") : List.of(), root.calls);+ assertEquals(List.of(), root.calls);}}@Test- public void nestedClassViolationSuppressesParentValidationOnlyOutsideTheDefaultGroup() {- for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class}) {+ public void nestedClassViolationSuppressesParentValidation() {+ for (Class<?> group : new Class<?>[] {Default.class, Checks.class, OrderedChecks.class, DefaultFirstChecks.class}) {var root = new Root();root.name = "job";root.child.name = "step";root.child.valid = false;assertPaths(validator.validate(root, group), "child");- assertEquals(group == Default.class ? List.of("child", "root") : List.of("child"), root.calls);+ assertEquals(List.of("child"), root.calls);+ }+ }++ @Test+ public void ungroupedClassValidationWaitsForSuccessfulPropertyValidation() {+ var bean = new UngroupedBean();+ assertPaths(validator.validate(bean), "name");+ assertEquals(0, bean.calls);+ bean.name = "job";+ assertPaths(validator.validate(bean));+ assertEquals(1, bean.calls);+ }++ @ClassValidating+ public static class UngroupedBean implements Validatable {+ String name;+ int calls;++ @NotNull+ public String getName() {+ return name;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ calls++;+ return true;}}@@ -70,6 +96,10 @@ public class HibernateValidationOrderTest extends HibernateValidationTestSupportpublic interface OrderedChecks {}+ @GroupSequence({Default.class, Checks.class})+ public interface DefaultFirstChecks {+ }+@ClassValidating(groups = {Default.class, Checks.class})public static class Root implements Validatable {final List<String> calls = new ArrayList<>();diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationTestSupport.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationTestSupport.javaindex 98e6be401f..34fd98bbd7 100644--- a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationTestSupport.java+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationTestSupport.java@@ -1,18 +1,18 @@package io.onedev.server.validation;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.Arrays;import java.util.Set;import java.util.stream.Collectors;-import javax.validation.ConstraintViolation;-import javax.validation.Validation;-import javax.validation.Validator;-import javax.validation.ValidatorFactory;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Validation;+import jakarta.validation.Validator;+import jakarta.validation.ValidatorFactory;-import org.junit.After;-import org.junit.Before;+import org.junit.jupiter.api.AfterEach;+import org.junit.jupiter.api.BeforeEach;public abstract class HibernateValidationTestSupport {@@ -20,13 +20,13 @@ public abstract class HibernateValidationTestSupport {protected Validator validator;- @Before+ @BeforeEachpublic void createValidator() {factory = Validation.buildDefaultValidatorFactory();validator = factory.getValidator();}- @After+ @AfterEachpublic void closeValidator() {factory.close();}@@ -34,6 +34,6 @@ public abstract class HibernateValidationTestSupport {protected void assertPaths(Set<? extends ConstraintViolation<?>> violations, String... expected) {assertEquals(Arrays.stream(expected).collect(Collectors.toSet()), violations.stream().map(it -> it.getPropertyPath().toString()).collect(Collectors.toSet()));- assertEquals("Unexpected duplicate violations: " + violations, expected.length, violations.size());+ assertEquals(expected.length, violations.size(), "Unexpected duplicate violations: " + violations);}}diff --git a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationVisibilityTest.java b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationVisibilityTest.javaindex 02da3949b9..081eda1100 100644--- a/server-core/src/test/java/io/onedev/server/validation/HibernateValidationVisibilityTest.java+++ b/server-core/src/test/java/io/onedev/server/validation/HibernateValidationVisibilityTest.java@@ -1,14 +1,14 @@package io.onedev.server.validation;-import static org.junit.Assert.assertSame;-import static org.junit.Assert.assertThrows;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertThrows;import java.util.List;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;@@ -108,9 +108,8 @@ public class HibernateValidationVisibilityTest extends HibernateValidationTestSureturn child;}- @Valid@DependsOn(property = "enabled")- public List<Child> getChildren() {+ public List<@Valid Child> getChildren() {return children;}}@@ -139,10 +138,9 @@ public class HibernateValidationVisibilityTest extends HibernateValidationTestSu}@Override- @Valid@DependsOn(property = "enabled")@DependsOn(property = "mode", value = "write")- public List<Child> getChildren() {+ public List<@Valid Child> getChildren() {return super.getChildren();}}@@ -166,9 +164,8 @@ public class HibernateValidationVisibilityTest extends HibernateValidationTestSureturn new Child();}- @Valid@ShowCondition("isVisible")- public List<Child> getChildren() {+ public List<@Valid Child> getChildren() {return List.of(new Child());}diff --git a/server-core/src/test/java/io/onedev/server/validation/validator/PathValidatorTest.java b/server-core/src/test/java/io/onedev/server/validation/validator/PathValidatorTest.javaindex a2f025ed26..562230ac5d 100644--- a/server-core/src/test/java/io/onedev/server/validation/validator/PathValidatorTest.java+++ b/server-core/src/test/java/io/onedev/server/validation/validator/PathValidatorTest.java@@ -1,9 +1,9 @@package io.onedev.server.validation.validator;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNull;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNull;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.annotation.Path;@@ -12,8 +12,8 @@ public class PathValidatorTest {@Testpublic void allowsDotsWithinPathSegments() {for (String path : new String[] {"release..notes", "docs/release..notes", "..notes", "notes..", "..."}) {- assertNull(path, PathValidator.checkPath(Path.Type.RELATIVE, path));- assertNull(path, PathValidator.checkPath(Path.Type.ABSOLUTE, "/" + path));+ assertNull(PathValidator.checkPath(Path.Type.RELATIVE, path), path);+ assertNull(PathValidator.checkPath(Path.Type.ABSOLUTE, "/" + path), path);}}@@ -21,8 +21,8 @@ public class PathValidatorTest {public void rejectsParentDirectorySegments() {for (String path : new String[] {"..", "../notes", "docs/../notes", "docs/..", "..\\notes","docs\\..\\notes", "docs\\..", "docs/..\\notes", "docs\\../notes"}) {- assertEquals(path, "'..' is not allowed", PathValidator.checkPath(Path.Type.RELATIVE, path));- assertEquals(path, "'..' is not allowed", PathValidator.checkPath(Path.Type.ABSOLUTE, "/" + path));+ assertEquals("'..' is not allowed", PathValidator.checkPath(Path.Type.RELATIVE, path), path);+ assertEquals("'..' is not allowed", PathValidator.checkPath(Path.Type.ABSOLUTE, "/" + path), path);}}diff --git a/server-core/src/test/java/io/onedev/server/web/component/RepeatingViewTest.java b/server-core/src/test/java/io/onedev/server/web/component/RepeatingViewTest.javanew file mode 100644index 0000000000..6366e7a3c6--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/web/component/RepeatingViewTest.java@@ -0,0 +1,37 @@+package io.onedev.server.web.component;++import static org.junit.jupiter.api.Assertions.*;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.markup.Markup;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.util.tester.WicketTester;+import org.junit.jupiter.api.Test;++public class RepeatingViewTest {+ @Test+ public void reordersRenderedChildrenWithoutDetachingAndRetainsOrderAfterSerialization() {+ var tester = new WicketTester();+ try {+ var rows = new RepeatingView("rows");+ var first = new Label(rows.newChildId(), "first-value");+ var second = new Label(rows.newChildId(), "second-value");+ rows.add(first, second);+ first.error("Keep feedback attached");+ rows.swap(0, 1);+ assertSame(second, rows.get(0));+ assertSame(rows, first.getParent());+ assertTrue(first.hasErrorMessage());+ var restored = SerializationUtils.clone(rows);+ assertEquals(second.getId(), restored.get(0).getId());+ tester.startComponentInPage(restored, Markup.of("<div wicket:id='rows'></div>"));+ String html = tester.getLastResponseAsString();+ assertTrue(html.indexOf("second-value") < html.indexOf("first-value"));+ var third = new Label(restored.newChildId(), "third-value");+ restored.add(third);+ assertSame(third, restored.get(2));+ } finally {+ tester.destroy();+ }+ }+}diff --git a/server-core/src/test/java/io/onedev/server/web/component/diff/DiffExpandSupportTest.java b/server-core/src/test/java/io/onedev/server/web/component/diff/DiffExpandSupportTest.javaindex 4620302333..5eb12ebba5 100644--- a/server-core/src/test/java/io/onedev/server/web/component/diff/DiffExpandSupportTest.java+++ b/server-core/src/test/java/io/onedev/server/web/component/diff/DiffExpandSupportTest.java@@ -4,14 +4,14 @@ import static io.onedev.server.web.component.diff.DiffExpandSupport.Direction.DOimport static io.onedev.server.web.component.diff.DiffExpandSupport.Direction.UP;import static java.util.stream.Collectors.toList;import static java.util.stream.IntStream.range;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.util.ArrayList;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffMatchPatch.Operation;diff --git a/server-core/src/test/java/io/onedev/server/web/component/diff/blob/text/DiffSymbolContextTest.java b/server-core/src/test/java/io/onedev/server/web/component/diff/blob/text/DiffSymbolContextTest.javaindex cdc9da46c4..e9924ca26f 100644--- a/server-core/src/test/java/io/onedev/server/web/component/diff/blob/text/DiffSymbolContextTest.java+++ b/server-core/src/test/java/io/onedev/server/web/component/diff/blob/text/DiffSymbolContextTest.java@@ -1,12 +1,12 @@package io.onedev.server.web.component.diff.blob.text;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.util.ArrayList;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.commons.jsymbol.Symbol;import io.onedev.commons.jsymbol.java.JavaExtractor;diff --git a/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.java b/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.javaindex deb4014d94..f3357b6915 100644--- a/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.java+++ b/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.java@@ -2,9 +2,9 @@ package io.onedev.server.web.component.diff.revision;import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.web.component.diff.revision.RevisionDiffPanel.getChildren;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class RevisionDiffPanelTest {diff --git a/server-core/src/test/java/io/onedev/server/web/component/markdown/MarkdownBlobEditorTest.java b/server-core/src/test/java/io/onedev/server/web/component/markdown/MarkdownBlobEditorTest.javaindex f6e4bf6fa7..3ac4d701c2 100644--- a/server-core/src/test/java/io/onedev/server/web/component/markdown/MarkdownBlobEditorTest.java+++ b/server-core/src/test/java/io/onedev/server/web/component/markdown/MarkdownBlobEditorTest.java@@ -1,6 +1,6 @@package io.onedev.server.web.component.markdown;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import static org.mockito.ArgumentMatchers.*;import java.nio.charset.StandardCharsets;@@ -8,7 +8,7 @@ import static org.mockito.Mockito.*;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;diff --git a/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.java b/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.javaindex da2a90ab9a..a148ea3777 100644--- a/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.java+++ b/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.project.wiki;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import static org.mockito.ArgumentMatchers.*;import static org.mockito.Mockito.*;@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.OneDev;import io.onedev.server.git.Blob;diff --git a/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java b/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.javaindex 5645454c72..97e15c871f 100644--- a/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java+++ b/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java@@ -1,6 +1,6 @@package io.onedev.server.web.util;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import static org.mockito.ArgumentMatchers.*;import static org.mockito.Mockito.*;@@ -10,7 +10,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;import org.jsoup.Jsoup;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.model.Project;import io.onedev.server.model.support.wiki.SpecifiedPath;diff --git a/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java b/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.javaindex 1482356fb0..1f4639a58a 100644--- a/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java@@ -1,15 +1,15 @@package io.onedev.server.web.util;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertThrows;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.when;import org.jsoup.Jsoup;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.model.Project;import io.onedev.server.model.support.wiki.SpecifiedPath;@@ -120,8 +120,7 @@ public class WikiUtilsTest {public void confinesPagesToWikiFolder() {assertEquals("docs/wiki/Getting-started.md", WikiUtils.pagePath("docs/wiki", "Getting-started"));for (String invalid : new String[] {"../secret", "/secret", "a/../../secret"}) {- assertThrows(invalid, io.onedev.server.exception.NotAcceptableException.class,- () -> WikiUtils.pagePath("wiki", invalid));+ assertThrows(io.onedev.server.exception.NotAcceptableException.class, () -> WikiUtils.pagePath("wiki", invalid), invalid);}}@@ -138,10 +137,10 @@ public class WikiUtilsTest {child.getWikiSetting().setFolder(null);assertEquals("documentation", child.getWikiFolder().getPath());child.getWikiSetting().setFolder(new RepositoryRoot());- org.junit.Assert.assertNull(child.getWikiFolder().getPath());+ org.junit.jupiter.api.Assertions.assertNull(child.getWikiFolder().getPath());child.getWikiSetting().setFolder(null);parent.getWikiSetting().setFolder(new RepositoryRoot());- org.junit.Assert.assertNull(child.getWikiFolder().getPath());+ org.junit.jupiter.api.Assertions.assertNull(child.getWikiFolder().getPath());parent.getWikiSetting().setFolder(null);assertTrue(parent.getWikiFolder() instanceof SpecifiedPath);assertEquals("wiki", child.getWikiFolder().getPath());@@ -222,7 +221,7 @@ public class WikiUtilsTest {@Testpublic void validatesFolderAsRelativePath() {- try (var factory = javax.validation.Validation.buildDefaultValidatorFactory()) {+ try (var factory = jakarta.validation.Validation.buildDefaultValidatorFactory()) {var setting = new WikiSetting();setting.setFolder(specifiedPath("../outside"));var violations = factory.getValidator().validate(setting);diff --git a/server-core/src/test/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferencesTest.java b/server-core/src/test/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferencesTest.javaindex 0e1a82c2ba..0a17a0dedc 100644--- a/server-core/src/test/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferencesTest.java+++ b/server-core/src/test/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferencesTest.java@@ -3,8 +3,8 @@ package io.onedev.server.web.util.resourcebundle;import org.apache.wicket.markup.head.CssReferenceHeaderItem;import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import org.junit.Assert;-import org.junit.Test;+import org.junit.jupiter.api.Assertions;+import org.junit.jupiter.api.Test;import io.onedev.server.web.resourcebundle.ResourceBundleReferences;import io.onedev.server.web.util.resourcebundle.testdata.a.Js1ResourceReferenceA;@@ -25,8 +25,8 @@ public class ResourceBundleReferencesTest {@Testpublic void testa() {ResourceBundleReferences references = new ResourceBundleReferences(Js1ResourceReferenceA.class);- Assert.assertEquals(1, references.getJavaScriptBundles().size());- Assert.assertEquals(+ Assertions.assertEquals(1, references.getJavaScriptBundles().size());+ Assertions.assertEquals(Lists.newArrayList(JavaScriptReferenceHeaderItem.forReference(new Js1ResourceReferenceA()),JavaScriptReferenceHeaderItem.forReference(new Js2ResourceReferenceA()),@@ -38,13 +38,13 @@ public class ResourceBundleReferencesTest {public void testb() {ResourceBundleReferences references = new ResourceBundleReferences(Js1ResourceReferenceB.class);- Assert.assertEquals(2, references.getJavaScriptBundles().size());- Assert.assertEquals(+ Assertions.assertEquals(2, references.getJavaScriptBundles().size());+ Assertions.assertEquals(Lists.newArrayList(JavaScriptReferenceHeaderItem.forReference(new Js2ResourceReferenceB()),JavaScriptReferenceHeaderItem.forReference(new Js3ResourceReferenceB())),references.getJavaScriptBundles().get(0).getProvidedResources());- Assert.assertEquals(+ Assertions.assertEquals(Lists.newArrayList(JavaScriptReferenceHeaderItem.forReference(new Js1ResourceReferenceB())),references.getJavaScriptBundles().get(1).getProvidedResources());}@@ -53,25 +53,25 @@ public class ResourceBundleReferencesTest {public void testc() {ResourceBundleReferences references = new ResourceBundleReferences(Js1ResourceReferenceC.class);- Assert.assertEquals(2, references.getJavaScriptBundles().size());- Assert.assertEquals(+ Assertions.assertEquals(2, references.getJavaScriptBundles().size());+ Assertions.assertEquals(Lists.newArrayList(JavaScriptReferenceHeaderItem.forReference(new Js3ResourceReferenceC()),JavaScriptReferenceHeaderItem.forReference(new Js4ResourceReferenceC())),references.getJavaScriptBundles().get(0).getProvidedResources());- Assert.assertEquals(+ Assertions.assertEquals(Lists.newArrayList(JavaScriptReferenceHeaderItem.forReference(new Js1ResourceReferenceC()),JavaScriptReferenceHeaderItem.forReference(new Js2ResourceReferenceC())),references.getJavaScriptBundles().get(1).getProvidedResources());- Assert.assertEquals(2, references.getCssBundles().size());- Assert.assertEquals(+ Assertions.assertEquals(2, references.getCssBundles().size());+ Assertions.assertEquals(Lists.newArrayList(CssReferenceHeaderItem.forReference(new CssResourceReference(Js3ResourceReferenceC.class, "3.css")),CssReferenceHeaderItem.forReference(new CssResourceReference(Js4ResourceReferenceC.class, "4.css"))),references.getCssBundles().get(0).getProvidedResources());- Assert.assertEquals(+ Assertions.assertEquals(Lists.newArrayList(CssReferenceHeaderItem.forReference(new CssResourceReference(Js1ResourceReferenceC.class, "1.css")),CssReferenceHeaderItem.forReference(new CssResourceReference(Js2ResourceReferenceC.class, "2.css"))),diff --git a/server-core/src/test/java/io/onedev/server/workspace/WorkspaceRuntimeTest.java b/server-core/src/test/java/io/onedev/server/workspace/WorkspaceRuntimeTest.javaindex cccfe06a37..6ba230f4c6 100644--- a/server-core/src/test/java/io/onedev/server/workspace/WorkspaceRuntimeTest.java+++ b/server-core/src/test/java/io/onedev/server/workspace/WorkspaceRuntimeTest.java@@ -1,12 +1,12 @@package io.onedev.server.workspace;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.LinkedHashMap;import java.util.Map;import org.jspecify.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.agent.workspace.FileData;import io.onedev.agent.workspace.GitExecutionResult;diff --git a/server-core/src/test/java/io/onedev/server/xodus/DefaultCommitInfoServiceTest.java b/server-core/src/test/java/io/onedev/server/xodus/DefaultCommitInfoServiceTest.javaindex 9a38922d60..ed6687da3c 100644--- a/server-core/src/test/java/io/onedev/server/xodus/DefaultCommitInfoServiceTest.java+++ b/server-core/src/test/java/io/onedev/server/xodus/DefaultCommitInfoServiceTest.java@@ -1,12 +1,12 @@package io.onedev.server.xodus;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;import java.util.HashMap;import java.util.List;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.git.command.FileChange;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/test/java/org/apache/wicket/ComponentContextCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/ComponentContextCustomizationTest.javaindex 52a42004b1..9ba35792b3 100644--- a/server-core/src/test/java/org/apache/wicket/ComponentContextCustomizationTest.java+++ b/server-core/src/test/java/org/apache/wicket/ComponentContextCustomizationTest.java@@ -1,16 +1,17 @@package org.apache.wicket;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import org.apache.wicket.behavior.Behavior;import org.apache.wicket.markup.html.WebPage;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.ILinkListener;+import org.apache.wicket.core.request.handler.ListenerRequestHandler;+import org.apache.wicket.core.request.handler.PageAndComponentProvider;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.util.tester.WicketTester;-import org.junit.After;-import org.junit.Before;-import org.junit.Test;+import org.junit.jupiter.api.AfterEach;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;import io.onedev.server.util.ComponentHierarchical;import io.onedev.server.util.HierarchicalContext;@@ -20,17 +21,17 @@ public class ComponentContextCustomizationTest {private WicketTester tester;private HierarchicalContext outer;- @Before+ @BeforeEachpublic void setUp() {tester = new WicketTester();outer = new HierarchicalContext(new ComponentHierarchical(new Label("outer")));HierarchicalContext.push(outer);}- @After+ @AfterEachpublic void tearDown() {try {- assertSame("Callback must restore the enclosing context", outer, HierarchicalContext.get());+ assertSame(outer, HierarchicalContext.get(), "Callback must restore the enclosing context");} finally {HierarchicalContext.pop();tester.destroy();@@ -71,7 +72,7 @@ public class ComponentContextCustomizationTest {private static final long serialVersionUID = 1L;}.add(link);assertSame(failure, assertThrows(WicketRuntimeException.class,- () -> ILinkListener.INTERFACE.invoke(link)));+ () -> new ListenerRequestHandler(new PageAndComponentProvider(link.getPage(), link)).respond(tester.getRequestCycle())));}@Test@@ -79,13 +80,14 @@ public class ComponentContextCustomizationTest {var owner = new Label("owner");var behavior = new Behavior() {@Override- public boolean canCallListenerInterface(Component component, java.lang.reflect.Method method) {+ public boolean canCallListener(Component component) {assertSame(owner, HierarchicalContext.get().findData(Label.class));return false;}};+ new WebPage() { }.add(owner);owner.add(behavior);assertThrows(org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException.class,- () -> ILinkListener.INTERFACE.invoke(owner, behavior));+ () -> new ListenerRequestHandler(new PageAndComponentProvider(owner.getPage(), owner), owner.getBehaviorId(behavior)).respond(tester.getRequestCycle()));}}diff --git a/server-core/src/test/java/org/apache/wicket/InterceptRedirectCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/InterceptRedirectCustomizationTest.javanew file mode 100644index 0000000000..a1b6ee6a5a--- /dev/null+++ b/server-core/src/test/java/org/apache/wicket/InterceptRedirectCustomizationTest.java@@ -0,0 +1,147 @@+package org.apache.wicket;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.*;++import java.time.ZoneId;+import java.util.List;++import io.onedev.server.model.Chat;+import io.onedev.server.web.WebSession;+import org.apache.wicket.markup.html.WebPage;+import org.apache.wicket.mock.MockApplication;+import org.apache.wicket.request.Request;+import org.apache.wicket.request.Response;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.http.handler.RedirectRequestHandler;+import org.apache.wicket.request.mapper.info.ComponentInfo;+import org.apache.wicket.request.mapper.info.PageComponentInfo;+import org.apache.wicket.request.mapper.info.PageInfo;+import org.apache.wicket.session.HttpSessionStore;+import org.apache.wicket.util.tester.WicketTester;+import org.junit.jupiter.api.AfterEach;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;++public class InterceptRedirectCustomizationTest {++ private WicketTester tester;++ @BeforeEach+ public void setUp() {+ tester = new WicketTester(new MockApplication() {+ @Override+ protected void init() {+ super.init();+ // Exercise servlet session invalidation instead of MockSessionStore's+ // unbound callback, which makes WicketTester replace the current session.+ setSessionStoreProvider(HttpSessionStore::new);+ }++ @Override+ public Session newSession(Request request, Response response) {+ return new WebSession(request);+ }+ });+ }++ @AfterEach+ public void tearDown() {+ tester.destroy();+ }++ @Test+ public void expiredBehaviorCallbackReturnsToPageWithoutReplayingCallback() {+ // Generate the metadata using this Wicket version's URL encoding.+ var callback = new PageComponentInfo(new PageInfo(12), new ComponentInfo(3, "form:save", 0));+ var original = Url.parse("http://backend:6610/projects?" + callback + "&tab=files&tab=history");+ var destination = continueAfterIntercept(original);+ assertNull(destination.getQueryParameter(callback.toString()));+ assertEquals(2, destination.getQueryParameters().size());+ assertEquals("files", destination.getQueryParameters().get(0).getValue());+ assertEquals("history", destination.getQueryParameters().get(1).getValue());+ }++ @Test+ public void pageVersionAndOrdinaryParametersSurviveInterception() {+ var original = Url.parse("http://backend:6610/projects?12&tab=files&12-3.0-form-save=ordinary");+ var destination = continueAfterIntercept(original);+ assertNotNull(destination.getQueryParameter("12"));+ assertEquals("ordinary", destination.getQueryParameter("12-3.0-form-save").getValue());+ assertEquals(3, destination.getQueryParameters().size());+ }++ @Test+ public void loginReplacementPreservesOnlyTheInterceptedRequest() {+ tester.getRequest().getPostParameters().addParameterValue("selection", "first");+ tester.getRequest().getPostParameters().addParameterValue("selection", "second");+ intercept(Url.parse("http://backend:6610/projects?tab=files&tab=history"));+ var originalUrl = new Url(RestartResponseAtInterceptPageException.getOriginalUrl());+ var originalPostParameters = RestartResponseAtInterceptPageException.getOriginalPostParameters();+ assertEquals(List.of("first", "second"), originalPostParameters.get("selection").stream()+ .map(Object::toString).toList());++ var session = (WebSession) tester.getSession();+ var unrelatedKey = new MetaDataKey<String>() {};+ session.setMetaData(unrelatedKey, "discard this metadata");+ tester.getRequest().getSession().setAttribute("privateAttribute", "discard this attribute");+ session.setChatInput("discard this draft");+ session.setActiveChatId(1L);+ session.getAnonymousChats().put(1L, new Chat());+ session.setZoneId(ZoneId.of("Asia/Shanghai"));+ session.setSsoLogoutUrl("https://example.com/logout");+ session.setRedirectUrlAfterDelete(WebPage.class, "/previous-page");++ RestartResponseAtInterceptPageException.replaceSessionPreservingOriginalDestination();++ assertSame(session, Session.get());+ assertEquals(originalUrl, RestartResponseAtInterceptPageException.getOriginalUrl());+ assertEquals(originalPostParameters, RestartResponseAtInterceptPageException.getOriginalPostParameters());+ assertNull(session.getMetaData(unrelatedKey));+ assertNull(tester.getRequest().getSession().getAttribute("privateAttribute"));+ assertNull(session.getChatInput());+ assertNull(session.getActiveChatId());+ assertTrue(session.getAnonymousChats().isEmpty());+ assertNull(session.getZoneId());+ assertNull(session.getSsoLogoutUrl());+ assertNull(session.getRedirectUrlAfterDelete(WebPage.class));+ }++ @Test+ public void directLoginDoesNotInventAnInterceptedDestination() {+ var session = (WebSession) tester.getSession();+ session.bind();+ session.setChatInput("discard this draft");+ RestartResponseAtInterceptPageException.replaceSessionPreservingOriginalDestination();+ assertNull(RestartResponseAtInterceptPageException.getOriginalUrl());+ assertNull(RestartResponseAtInterceptPageException.getOriginalPostParameters());+ assertNull(session.getChatInput());+ }++ @Test+ public void ordinarySessionReplacementStillClearsTheInterceptedDestination() {+ intercept(Url.parse("projects?tab=files"));+ tester.getSession().replaceSession();+ assertNull(RestartResponseAtInterceptPageException.getOriginalUrl());+ assertNull(RestartResponseAtInterceptPageException.getOriginalPostParameters());+ }++ private Url continueAfterIntercept(Url original) {+ intercept(original);+ var redirect = assertThrows(NonResettingRestartException.class,+ RestartResponseAtInterceptPageException::continueToOriginalDestination);+ return Url.parse(((RedirectRequestHandler) redirect.getReplacementRequestHandler()).getRedirectUrl());+ }++ private void intercept(Url original) {+ var cycle = tester.getRequestCycle();+ var request = spy(cycle.getRequest().cloneWithUrl(original));+ doReturn(original).when(request).getOriginalUrl();+ cycle.setRequest(request);+ new RestartResponseAtInterceptPageException(WebPage.class);+ var saved = RestartResponseAtInterceptPageException.getOriginalUrl();+ assertNull(saved.getHost());+ assertNull(saved.getPort());+ assertNull(saved.getProtocol());+ }+}diff --git a/server-core/src/test/java/org/apache/wicket/guice/GuiceProxyTargetLocatorTest.java b/server-core/src/test/java/org/apache/wicket/guice/GuiceProxyTargetLocatorTest.javanew file mode 100644index 0000000000..39e80e2e5d--- /dev/null+++ b/server-core/src/test/java/org/apache/wicket/guice/GuiceProxyTargetLocatorTest.java@@ -0,0 +1,48 @@+package org.apache.wicket.guice;++import static org.junit.jupiter.api.Assertions.*;++import java.util.List;++import org.apache.commons.lang3.SerializationUtils;+import org.junit.jupiter.api.Test;++import com.google.inject.AbstractModule;+import com.google.inject.Guice;+import com.google.inject.Key;+import com.google.inject.TypeLiteral;+import com.google.inject.name.Names;++import io.onedev.commons.loader.AppLoader;++public class GuiceProxyTargetLocatorTest {+ private static class Fields {+ List<String> values;+ Runnable missing;+ }++ @Test+ public void resolvesNamedGenericTargetsAfterSerializationWithoutAWicketApplication() throws Exception {+ var previous = AppLoader.injector;+ var values = List.of("one", "two");+ var name = Names.named("values");+ AppLoader.injector = Guice.createInjector(new AbstractModule() {+ @Override+ protected void configure() {+ bind(Key.get(new TypeLiteral<List<String>>() {}, name)).toInstance(values);+ }+ });+ try {+ var locator = new GuiceProxyTargetLocator(Fields.class.getDeclaredField("values"), name, false);+ var fields = new Fields();+ fields.values = SerializationUtils.clone(locator).locateProxyTarget();+ assertSame(values, fields.values);+ assertTrue(locator.isSingletonScope());+ var optional = new GuiceProxyTargetLocator(Fields.class.getDeclaredField("missing"), null, true);+ fields.missing = optional.locateProxyTarget();+ assertNull(fields.missing);+ } finally {+ AppLoader.injector = previous;+ }+ }+}diff --git a/server-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentCustomizationTest.javaindex d4dcccea86..2db047c7a1 100644--- a/server-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentCustomizationTest.java+++ b/server-core/src/test/java/org/apache/wicket/markup/html/form/FormComponentCustomizationTest.java@@ -1,25 +1,25 @@package org.apache.wicket.markup.html.form;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.Model;import org.apache.wicket.util.tester.WicketTester;-import org.junit.After;-import org.junit.Before;-import org.junit.Test;+import org.junit.jupiter.api.AfterEach;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;public class FormComponentCustomizationTest {private WicketTester tester;- @Before+ @BeforeEachpublic void setUp() {tester = new WicketTester();}- @After+ @AfterEachpublic void tearDown() {tester.destroy();}diff --git a/server-core/src/test/java/org/apache/wicket/page/RequestAdapterCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/page/RequestAdapterCustomizationTest.javaindex 590713f9ea..c18a4c21e3 100644--- a/server-core/src/test/java/org/apache/wicket/page/RequestAdapterCustomizationTest.java+++ b/server-core/src/test/java/org/apache/wicket/page/RequestAdapterCustomizationTest.java@@ -1,40 +1,89 @@package org.apache.wicket.page;-import static org.junit.Assert.*;import static org.mockito.Mockito.*;+import static org.junit.jupiter.api.Assertions.*;-import java.util.ArrayList;-import java.util.List;+import java.util.HashMap;+import java.util.function.Supplier;-import org.junit.Test;+import org.apache.wicket.pageStore.IPageContext;+import org.apache.wicket.pageStore.IPageStore;+import org.apache.wicket.pageStore.RequestPageStore;+import org.junit.jupiter.api.Test;public class RequestAdapterCustomizationTest {+ @Test+ public void committedResponseDoesNotRetrySessionCreationDuringDetach() {+ var context = newContext();+ var delegate = mock(IPageStore.class);+ var store = new RequestPageStore(delegate);+ var page = mock(IManageablePage.class);+ store.addPage(context, page);+ when(context.getSessionId(true)).thenThrow(new IllegalStateException("Response is committed"));- @Test- public void commitDoesNotInspectPartiallyInitializedPagesDuringLoginRedirect() {- var stored = new ArrayList<IManageablePage>();- var adapter = new RequestAdapter(mock(IPageManagerContext.class)) {- @Override- protected IManageablePage getPage(int id) {- return null;- }-- @Override- protected void storeTouchedPages(List<IManageablePage> pages) {- stored.addAll(pages);- }-- @Override- protected void newSessionCreated() {- }- };- var page = mock(IManageablePage.class);- when(page.getPageId()).thenReturn(1);- when(page.isPageStateless()).thenThrow(new IllegalStateException("Uninitialized enclosure"));- adapter.touch(page);- adapter.commitRequest();-- assertEquals(List.of(page), stored);- verify(page, never()).isPageStateless();- }+ store.end(context);+ store.detach(context);++ verify(delegate, never()).addPage(any(), any());+ verify(delegate).detach(context);+ verify(context).getSessionId(true);+ }++ @Test+ public void unexpectedSessionAndStorageFailuresStillPropagate() {+ for (String message : new String[] { "Session store unavailable", null }) {+ var context = newContext();+ var delegate = mock(IPageStore.class);+ var store = new RequestPageStore(delegate);+ var page = mock(IManageablePage.class);+ store.addPage(context, page);+ var failure = new IllegalStateException(message);+ when(context.getSessionId(true)).thenThrow(failure);+ assertSame(failure, assertThrows(IllegalStateException.class, () -> store.end(context)));+ doThrow(failure).when(delegate).addPage(context, page);+ assertSame(failure, assertThrows(IllegalStateException.class, () -> store.detach(context)));+ }+ }++ @Test+ public void committedResponseDuringStorageStillDetachesDelegate() {+ var context = newContext();+ var delegate = mock(IPageStore.class);+ var store = new RequestPageStore(delegate);+ var page = mock(IManageablePage.class);+ store.addPage(context, page);+ doThrow(new IllegalStateException("Response is committed")).when(delegate).addPage(context, page);++ store.detach(context);+ store.detach(context);++ verify(delegate).addPage(context, page);+ verify(delegate, times(2)).detach(context);+ }++ private IPageContext newContext() {+ var data = new HashMap<Object, Object>();+ var context = mock(IPageContext.class);+ when(context.getRequestData(any(), any())).thenAnswer(invocation ->+ data.computeIfAbsent(invocation.getArgument(0), key ->+ ((Supplier<?>) invocation.getArgument(1)).get()));+ return context;+ }++ @Test+ public void commitDoesNotInspectPartiallyInitializedPagesDuringLoginRedirect() {+ var context = newContext();+ var delegate = mock(IPageStore.class);+ var store = new RequestPageStore(delegate);+ var page = mock(IManageablePage.class);+ when(page.getPageId()).thenReturn(1);+ when(page.isPageStateless()).thenThrow(new IllegalStateException("Uninitialized enclosure"));+ store.addPage(context, page);+ store.end(context);+ store.detach(context);++ verify(context).getSessionId(true);+ verify(delegate).addPage(context, page);+ verify(page, never()).isPageStateless();+ }}diff --git a/server-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleCustomizationTest.javaindex fdd5de1e30..97a59d6ed7 100644--- a/server-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleCustomizationTest.java+++ b/server-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleCustomizationTest.java@@ -1,6 +1,6 @@package org.apache.wicket.request.cycle;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;import static org.mockito.Mockito.*;import org.apache.wicket.markup.html.WebPage;@@ -11,7 +11,7 @@ import org.apache.wicket.request.Request;import org.apache.wicket.request.Response;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class RequestCycleCustomizationTest {diff --git a/server-core/src/test/java/org/apache/wicket/util/string/StringsCustomizationTest.java b/server-core/src/test/java/org/apache/wicket/util/string/StringsCustomizationTest.javaindex 28aad10922..91ea0704e3 100644--- a/server-core/src/test/java/org/apache/wicket/util/string/StringsCustomizationTest.java+++ b/server-core/src/test/java/org/apache/wicket/util/string/StringsCustomizationTest.java@@ -1,8 +1,8 @@package org.apache.wicket.util.string;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class StringsCustomizationTest {diff --git a/server-core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java b/server-core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.javadeleted file mode 100644index 16eb050671..0000000000--- a/server-core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java+++ /dev/null@@ -1,93 +0,0 @@-package org.eclipse.jgit.revwalk;--import static org.junit.Assert.assertEquals;--import java.util.Map;--import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;-import org.junit.Test;--import io.onedev.server.git.AbstractGitTest;--public class LastCommitsOfChildrenTest extends AbstractGitTest {-- @Test- public void testMergeWithoutTouchingSameFile() throws Exception {- addFileAndCommit("initial", "", "initial commit");- git.checkout().setName("dev").setCreateBranch(true).call();- addFileAndCommit("d", "", "add a file to dev branch");- git.checkout().setName("main").call();- addFileAndCommit("m", "", "add a file to main branch");- git.merge().include(git.getRepository().resolve("dev")).setCommit(true).call();-- LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"));- assertEquals(git.getRepository().resolve("main~1"), lastCommits.get("m").getId());- assertEquals(git.getRepository().resolve("dev"), lastCommits.get("d").getId());- assertEquals(git.getRepository().resolve("main~2"), lastCommits.get("initial").getId());- }-- @Test- public void testMergeTouchingSameFile() throws Exception {- addFileAndCommit("file", "1\n2\n3\n4\n5\n", "initial commit");- git.checkout().setName("dev").setCreateBranch(true).call();- addFileAndCommit("file", "0\n1\n2\n3\n4\n5\n", "add first line");- git.checkout().setName("main").call();- addFileAndCommit("file", "1\n2\n3\n4\n5\n6\n", "add last line");- git.merge().include(git.getRepository().resolve("dev")).setCommit(true).call();-- LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"));- assertEquals(git.getRepository().resolve("main"), lastCommits.get("file").getId());- }-- @Test- public void testDirAndFile() throws Exception {- createDir("dir/dir1/subdir");- createDir("dir/dir2");- addFileAndCommit("dir/dir1/file", "", "commit");- addFileAndCommit("dir/dir2/file", "", "commit");- addFileAndCommit("dir/dir1/subdir/file", "", "commit");- addFileAndCommit("dir/file", "", "commit");-- LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(git.getRepository(), git.getRepository().resolve("main"), "dir");- assertEquals(3, lastCommits.size());- assertEquals(git.getRepository().resolve("main~1"), lastCommits.get("dir1").getId());- assertEquals(git.getRepository().resolve("main~2"), lastCommits.get("dir2").getId());- assertEquals(git.getRepository().resolve("main"), lastCommits.get("file").getId());- }-- @Test- public void testWithCache() throws Exception {- addFileAndCommit("initial", "", "initial commit");- git.checkout().setName("feature1").setCreateBranch(true).call();- addFileAndCommit("feature1", "", "add feature1");- git.checkout().setName("main").call();- addFileAndCommit("main", "", "add main");- git.merge().include(git.getRepository().resolve("feature1")).setCommit(true).call();-- final ObjectId oldId = git.getRepository().resolve("main");- final LastCommitsOfChildren oldLastCommits = new LastCommitsOfChildren(git.getRepository(), oldId);- Cache cache = new Cache() {-- @Override- public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {- if (commitId.equals(oldId))- return oldLastCommits;- else- return null;- }-- };- assertEquals(oldLastCommits, new LastCommitsOfChildren(git.getRepository(), oldId, cache));-- git.checkout().setName("feature2").setCreateBranch(true).call();- addFileAndCommit("initial", "hello", "modify initial");- git.checkout().setName("main").call();- git.merge().include(git.getRepository().resolve("feature2")).setCommit(true).call();-- ObjectId newId = git.getRepository().resolve("main");- assertEquals(new LastCommitsOfChildren(git.getRepository(), newId), new LastCommitsOfChildren(git.getRepository(), newId, cache));- }--}diff --git a/server-core/src/test/java/org/hibernate/cache/spi/support/SimpleTimestamperTest.java b/server-core/src/test/java/org/hibernate/cache/spi/support/SimpleTimestamperTest.javaindex 46eb62ff3b..685cc2d5a1 100644--- a/server-core/src/test/java/org/hibernate/cache/spi/support/SimpleTimestamperTest.java+++ b/server-core/src/test/java/org/hibernate/cache/spi/support/SimpleTimestamperTest.java@@ -1,7 +1,7 @@package org.hibernate.cache.spi.support;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.net.URLClassLoader;import java.util.ArrayList;@@ -11,7 +11,7 @@ import java.util.concurrent.Executors;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicLong;-import org.junit.Test;+import org.junit.jupiter.api.Test;public class SimpleTimestamperTest {@@ -60,7 +60,7 @@ public class SimpleTimestamperTest {var distinct = new HashSet<Long>();for (var result : executor.invokeAll(tasks)) {for (long timestamp : result.get())- assertTrue("Duplicate cache timestamp", distinct.add(timestamp));+ assertTrue(distinct.add(timestamp), "Duplicate cache timestamp");}assertEquals(40000, distinct.size());} finally {diff --git a/server-core/src/test/java/org/hibernate/proxy/pojo/BasicLazyInitializerTest.java b/server-core/src/test/java/org/hibernate/proxy/pojo/BasicLazyInitializerTest.javaindex afb7d064f8..a075660548 100644--- a/server-core/src/test/java/org/hibernate/proxy/pojo/BasicLazyInitializerTest.java+++ b/server-core/src/test/java/org/hibernate/proxy/pojo/BasicLazyInitializerTest.java@@ -1,11 +1,11 @@package org.hibernate.proxy.pojo;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertSame;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertTrue;-import org.junit.Test;+import org.junit.jupiter.api.Test;import io.onedev.server.model.AbstractEntity;@@ -56,12 +56,19 @@ public class BasicLazyInitializerTest {var initializer = new Initializer(42L, true);var proxy = new EntityReference(initializer);assertEquals(42L, initializer.invoke(AbstractEntity.class.getMethod("getId"), new Object[0], proxy));- assertSame(BasicLazyInitializer.INVOKE_IMPLEMENTATION,+ assertSame(Initializer.DELEGATED,initializer.invoke(AbstractEntity.class.getMethod("isNew"), new Object[0], proxy));assertTrue(initializer.isUninitialized());}private static class Initializer extends BasicLazyInitializer {+ private static final Object DELEGATED = new Object();++ @Override+ protected Object call(Object proxy, java.lang.reflect.Method method, Object[] args) {+ return DELEGATED;+ }+private Initializer(Long id, boolean overridesEquals) throws NoSuchMethodException {super(EntityReference.class.getName(), EntityReference.class, id,AbstractEntity.class.getMethod("getId"), AbstractEntity.class.getMethod("setId", Long.class),diff --git a/server-ee b/server-eeindex 1072e5b7a5..0bf2049b37 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 1072e5b7a5017d5b08f309a44b8d3e66224f9993+Subproject commit 0bf2049b37611d8cb08fbd82b32539826dd525c7diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.javaindex 76e9024be9..b2f65eaec5 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java@@ -2,8 +2,8 @@ package io.onedev.server.plugin.authenticator.ldap;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.javaindex 1605d47e0b..d96af1403e 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.authenticator.ldap;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.javaindex 2beb39d4cb..2f8c6e7b1f 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java@@ -19,9 +19,9 @@ import javax.naming.directory.DirContext;import javax.naming.directory.InitialDirContext;import javax.naming.directory.SearchControls;import javax.naming.directory.SearchResult;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import org.apache.commons.lang3.Strings;import org.apache.shiro.authc.IncorrectCredentialsException;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.javaindex 2130e6662f..e43b6ee9d0 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.authenticator.ldap;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java b/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.javaindex 2ad97c977a..ed0d5b1146 100644--- a/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java+++ b/server-plugin/server-plugin-buildspec-python/src/test/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestionTest.java@@ -8,12 +8,12 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.util.IOUtils;import org.eclipse.jgit.lib.ObjectId;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.jspecify.annotations.Nullable;import java.io.IOException;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertTrue;public class PythonJobSuggestionTest {diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex e2961abc9e..3146b61c6a 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -44,8 +44,8 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;-import javax.validation.Valid;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.RandomUtils;import org.apache.commons.lang3.SerializationUtils;@@ -146,8 +146,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,@Editable(order=200, description="Specify registry logins if necessary. For built-in registry, " +"use <code>@server_url@</code> for registry url, <code>@job_token@</code> for user name, and " +"access token for password")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}@@ -255,8 +254,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,}@Editable(order=500, group = "More Settings", description="Optionally specify node selector of the job pods")- @Valid- public List<NodeSelectorEntry> getNodeSelector() {+ public List<@Valid NodeSelectorEntry> getNodeSelector() {return nodeSelector;}@@ -278,8 +276,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,@Editable(order=25000, group="More Settings", description="Optionally specify where to run service pods "+ "specified in job. The first matching locator will be used. If no any locators are found, "+ "node selector of the executor will be used")- @Valid- public List<ServiceLocator> getServiceLocators() {+ public List<@Valid ServiceLocator> getServiceLocators() {return serviceLocators;}diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 31c044fb98..cfd2cf69be 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -26,10 +26,10 @@ import java.util.UUID;import java.util.concurrent.ExecutionException;import java.util.concurrent.atomic.AtomicInteger;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.io.FilenameUtils;import org.apache.commons.lang3.SystemUtils;@@ -122,8 +122,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te@Editable(order=400, description="Specify registry logins if necessary. For built-in registry, " +"use <code>@server_url@</code> for registry url, <code>@job_token@</code> for user name, and " +"access token for password")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex bf690638e4..aefb4e33e4 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -21,8 +21,8 @@ import java.util.Map;import java.util.concurrent.ExecutionException;import java.util.concurrent.atomic.AtomicInteger;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.io.FilenameUtils;import org.apache.commons.lang.SystemUtils;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.javaindex e5168253c0..4f27dacd8b 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.ClassValidating;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.javaindex bf202c3079..cdfa668bab 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java@@ -8,14 +8,14 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.Strings;import org.apache.http.client.utils.URIBuilder;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.javaindex 486b5f05c5..89e7dac977 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.javaindex 9c565ca6c6..4a0a972850 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.javaindex eba29458a7..74b31b0114 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitea;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 9f229d40eb..8e57bf0d00 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -19,13 +19,13 @@ import java.util.Optional;import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.Strings;import org.apache.http.client.utils.URIBuilder;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.javaindex fc5e78d28b..17e0538712 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.javaindex ff114773ab..7244c1ac4a 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.javaindex 4bc268242a..43b791f91f 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.ClassValidating;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.javaindex 3af49e1c81..dda7d0a874 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.github;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex ae19fcea50..829179a1cf 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -16,13 +16,13 @@ import java.util.Optional;import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.Strings;import org.apache.http.client.utils.URIBuilder;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.javaindex 359113beb2..e64a2a8353 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.javaindex f2e2582de8..886d2b0b80 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.javaindex 06e82838ba..daf363de51 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/AccessTokenFilter.java@@ -1,9 +1,9 @@package io.onedev.server.plugin.imports.gitlab;-import javax.annotation.Priority;-import javax.ws.rs.Priorities;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.annotation.Priority;+import jakarta.ws.rs.Priorities;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;@Priority(Priorities.AUTHENTICATION)diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.javaindex b1079bc99b..01b492843a 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitlab;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.javaindex f412bfb5cc..6406461885 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.ClassValidating;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex 82e7adb1f2..b5e35a5888 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -20,13 +20,13 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.regex.Matcher;import java.util.regex.Pattern;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.Strings;import org.apache.http.client.utils.URIBuilder;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.javaindex 38ebe80f60..1c55e59482 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.javaindex b12b7f08a2..8c229163b6 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.javaindex 40d29c6367..8b6a509d59 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.javaindex 17be1196d6..dbb2634cd9 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.jiracloud;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.javaindex 0ee879ddbf..b7b65b954e 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java@@ -5,8 +5,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.ClassValidating;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex a007746150..db6eecd71b 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -23,15 +23,15 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.javaindex 3e6de48ee0..55678f3f62 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.javaindex 9869d2e9fb..c4369d3d41 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.javaindex b6de2ba0d0..af2964197f 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.javaindex d8bddbd145..e3920f0d8f 100644--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java@@ -3,8 +3,8 @@ package io.onedev.server.plugin.imports.url;import java.io.Serializable;import java.net.URISyntaxException;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.Strings;import org.apache.http.client.utils.URIBuilder;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.javaindex e9fbd7817e..b3e8436676 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.youtrack;import java.io.Serializable;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.javaindex 1777454b70..8c4eafe1a3 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java@@ -5,8 +5,8 @@ import java.util.Collection;import java.util.List;import java.util.stream.Collectors;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.Size;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.Size;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.ClassValidating;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex dba60e61fb..2d74d1d7c2 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -19,13 +19,13 @@ import java.util.Set;import java.util.concurrent.atomic.AtomicInteger;import org.jspecify.annotations.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.client.Client;+import jakarta.ws.rs.client.ClientBuilder;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.Response;import org.apache.commons.lang3.tuple.ImmutableTriple;import org.apache.commons.lang3.tuple.Triple;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.javaindex 82d3789c98..c36317fd47 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.javaindex f5c8850f0e..62c8687b31 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.javaindex 50f1ccd86c..fd9b297866 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.javaindex e9d3783198..d99357aa38 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.service.SettingService;diff --git a/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/GmailConnector.java b/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/GmailConnector.javaindex 17a29d5402..7814ed325c 100644--- a/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/GmailConnector.java+++ b/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/GmailConnector.java@@ -15,10 +15,10 @@ import io.onedev.server.util.EditContext;import io.onedev.server.util.oauth.RefreshTokenAccessor;import org.jetbrains.annotations.Nullable;-import javax.mail.Message;-import javax.validation.constraints.Email;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.mail.Message;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import java.util.Collection;import java.util.HashMap;import java.util.Map;diff --git a/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/InboxPollSetting.java b/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/InboxPollSetting.javaindex 14c43978f4..82f9141a40 100644--- a/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/InboxPollSetting.java+++ b/server-plugin/server-plugin-mail-gmail/src/main/java/io/onedev/server/plugin/mail/gmail/InboxPollSetting.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.mail.gmail;import io.onedev.server.annotation.Editable;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import java.io.Serializable;@Editablediff --git a/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/InboxPollSetting.java b/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/InboxPollSetting.javaindex b01b327163..cee9c5f6ea 100644--- a/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/InboxPollSetting.java+++ b/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/InboxPollSetting.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.mail.office365;import io.onedev.server.annotation.Editable;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;import java.io.Serializable;@Editablediff --git a/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/Office365Connector.java b/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/Office365Connector.javaindex 932e6e2af9..a2ca6a6a28 100644--- a/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/Office365Connector.java+++ b/server-plugin/server-plugin-mail-office365/src/main/java/io/onedev/server/plugin/mail/office365/Office365Connector.java@@ -15,10 +15,10 @@ import io.onedev.server.util.EditContext;import io.onedev.server.util.oauth.RefreshTokenAccessor;import org.jetbrains.annotations.Nullable;-import javax.mail.Message;-import javax.validation.constraints.Email;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.mail.Message;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import java.util.Collection;import java.util.HashMap;import java.util.Map;diff --git a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.javaindex 1482a8bb42..5b2ebaa10e 100644--- a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java+++ b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java@@ -5,9 +5,9 @@ import io.onedev.server.annotation.Password;import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;import io.onedev.server.model.support.administration.mailservice.ImapSslSetting;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;@Editablediff --git a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.javaindex 1be354950a..d77ee650b3 100644--- a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java+++ b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java@@ -9,11 +9,11 @@ import io.onedev.server.model.support.administration.mailservice.SmtpExplicitSslimport io.onedev.server.model.support.administration.mailservice.SmtpSslSetting;import org.jetbrains.annotations.Nullable;-import javax.mail.Message;-import javax.validation.constraints.Email;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.mail.Message;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;import java.util.Collection;import java.util.concurrent.Future;import java.util.function.Consumer;diff --git a/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationManager.java b/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationManager.javaindex bb4edd2c22..04b9f3beb6 100644--- a/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationManager.java+++ b/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationManager.java@@ -19,8 +19,8 @@ import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.ContentType;import org.apache.http.entity.StringEntity;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.ArrayList;import java.util.HashSet;import java.util.List;diff --git a/server-plugin/server-plugin-notification-ntfy/src/main/java/io/onedev/server/plugin/notification/ntfy/NtfyNotificationManager.java b/server-plugin/server-plugin-notification-ntfy/src/main/java/io/onedev/server/plugin/notification/ntfy/NtfyNotificationManager.javaindex 5cf7d2ecef..9f677e92aa 100644--- a/server-plugin/server-plugin-notification-ntfy/src/main/java/io/onedev/server/plugin/notification/ntfy/NtfyNotificationManager.java+++ b/server-plugin/server-plugin-notification-ntfy/src/main/java/io/onedev/server/plugin/notification/ntfy/NtfyNotificationManager.java@@ -14,8 +14,8 @@ import io.onedev.server.util.commenttext.PlainText;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import java.util.HashSet;import java.util.Set;diff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.javaindex 6cc506daf5..d5313fc87e 100644--- a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.java+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.java@@ -5,8 +5,8 @@ import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.inject.Inject;-import javax.inject.Singleton;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;import com.fasterxml.jackson.core.JsonProcessingException;import org.apache.http.client.methods.HttpPost;diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.javaindex 1ba9da1291..d383714a99 100644--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java@@ -4,11 +4,11 @@ import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.plugin.pack.cargo.CargoPackSupport.TYPE;import static io.onedev.server.util.UrlUtils.decodePath;import static java.util.Comparator.comparing;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-import static javax.servlet.http.HttpServletResponse.SC_OK;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;import java.io.EOFException;import java.io.IOException;@@ -17,12 +17,12 @@ import java.util.Date;import java.util.List;import java.util.Map;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.javaindex 1e8fa941c8..e18f5dff47 100644--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java@@ -7,7 +7,7 @@ import java.io.IOException;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/BadRequestException.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/BadRequestException.javaindex 8658f1bb50..ef2801bfb1 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/BadRequestException.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/BadRequestException.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.pack.container;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;public class BadRequestException extends ClientException {diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.javaindex 571899f742..829d65b2a9 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java@@ -8,17 +8,17 @@ import io.onedev.server.security.ExceptionHandleFilter;import org.apache.shiro.authc.IncorrectCredentialsException;import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;-import org.apache.shiro.codec.Base64;+import org.apache.shiro.lang.codec.Base64;import org.apache.shiro.util.ThreadContext;import org.apache.shiro.web.util.WebUtils;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.ws.rs.core.HttpHeaders;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.ws.rs.core.HttpHeaders;-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;import static org.apache.commons.lang3.StringUtils.substringAfter;import static org.apache.commons.lang3.StringUtils.substringBefore;import static org.apache.shiro.SecurityUtils.getSubject;diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerModule.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerModule.javaindex dde4a658e7..f05a4b43f9 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerModule.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerModule.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.pack.container;-import org.eclipse.jetty.servlet.ServletHolder;+import org.eclipse.jetty.ee11.servlet.ServletHolder;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.OneDev;diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.javaindex cfe5faeb26..0d881026f9 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.java@@ -6,7 +6,7 @@ import java.io.IOException;import java.util.ArrayList;import java.util.LinkedHashMap;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.apache.commons.io.FileUtils;import org.apache.wicket.Component;@@ -136,8 +136,8 @@ public class ContainerPackPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newArchImagePanel("content", archDigest);- target.add(content);fragment.replace(content);+ target.add(content);}});@@ -223,7 +223,7 @@ public class ContainerPackPanel extends Panel {var labels = new ArrayList<Pair<String, String>>();var labelsNode = config.get("config").get("Labels");if (labelsNode != null) {- for (var it = labelsNode.fields(); it.hasNext();) {+ for (var it = labelsNode.properties().iterator(); it.hasNext();) {var entry = it.next();labels.add(new Pair<>(entry.getKey(), entry.getValue().asText()));}diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.javaindex 1bdbaf9bfc..6fe8e6f647 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java@@ -9,16 +9,16 @@ import static io.onedev.server.util.IOUtils.copyWithMaxSize;import static java.lang.Long.parseLong;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.regex.Pattern.compile;-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;-import static javax.servlet.http.HttpServletResponse.SC_OK;-import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;+import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;+import static jakarta.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;import static org.apache.commons.lang3.StringUtils.substringBefore;import java.io.ByteArrayOutputStream;@@ -31,11 +31,11 @@ import java.util.UUID;import java.util.concurrent.Callable;import java.util.regex.Matcher;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jetty.http.HttpStatus;diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.javaindex a8962d55e3..c496082400 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/NotFoundException.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.pack.container;import org.jspecify.annotations.Nullable;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;public class NotFoundException extends ClientException {diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.javaindex d5fb9ba0ad..43552aa648 100644--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackHandler.java@@ -9,13 +9,13 @@ import static java.lang.Boolean.parseBoolean;import static java.lang.Integer.MAX_VALUE;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.stream.Collectors.toList;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;-import static javax.servlet.http.HttpServletResponse.SC_OK;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;import java.io.BufferedInputStream;import java.io.BufferedOutputStream;@@ -36,17 +36,17 @@ import java.util.zip.DeflaterOutputStream;import java.util.zip.GZIPInputStream;import java.util.zip.GZIPOutputStream;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpUtils;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import org.eclipse.jetty.util.UrlEncoded;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;import org.apache.commons.compress.archivers.tar.TarArchiveEntry;import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;-import org.apache.commons.fileupload.util.Streams;+import org.apache.shiro.authz.UnauthorizedException;import org.jspecify.annotations.Nullable;import org.yaml.snakeyaml.Yaml;@@ -249,9 +249,9 @@ public class GemPackHandler implements PackHandler {String name;String version;try {- var params = HttpUtils.parseQueryString(Streams.asString(request.getInputStream(), UTF_8.name()));- name = params.get("gem_name")[0];- version = params.get("version")[0];+ var params = UrlEncoded.decodeQuery(org.apache.commons.io.IOUtils.toString(request.getInputStream(), UTF_8.name()));+ name = params.getValue("gem_name", 0);+ version = params.getValue("version", 0);} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.javaindex 58900f552a..90a23856b4 100644--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackHandler.java@@ -1,10 +1,10 @@package io.onedev.server.plugin.pack.helm;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;@@ -16,13 +16,12 @@ import java.util.List;import java.util.Map;import java.util.zip.GZIPInputStream;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;-import org.apache.commons.fileupload.FileUploadException;-import org.apache.commons.fileupload.servlet.ServletFileUpload;+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tools.tar.TarEntry;import org.apache.tools.tar.TarInputStream;@@ -157,11 +156,11 @@ public class HelmPackHandler implements PackHandler {var contentType = request.getHeader("Content-Type");if (contentType != null && (contentType.contains("multipart/form-data") || contentType.contains("application/x-www-form-urlencoded"))) {try {- var upload = new ServletFileUpload();+ var upload = new JakartaServletFileUpload<>();var items = upload.getItemIterator(request);if (items.hasNext()) {var item = items.next();- try (var is = item.openStream()) {+ try (var is = item.getInputStream()) {var copied = IOUtils.copyWithMaxSize(is, baos, MAX_FILE_SIZE);if (copied == -1)throw new ClientException(SC_NOT_ACCEPTABLE, "Chart archive exceeds maximum size: " + MAX_FILE_SIZE);@@ -171,7 +170,7 @@ public class HelmPackHandler implements PackHandler {} else {throw new ClientException(SC_BAD_REQUEST, "Chart archive not found");}- } catch (FileUploadException|IOException e) {+ } catch (IOException e) {throw new RuntimeException(e);}} else {diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.javaindex 609edcf47c..6806364284 100644--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java@@ -50,16 +50,16 @@ public class MavenHelpPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newMavenInstructions(bindings);- target.add(content);MavenHelpPanel.this.replace(content);+ target.add(content);}}.setSelected(true));buildToolTabs.add(new AjaxActionTab(Model.of(_T("Gradle"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newGradleInstructions(bindings);- target.add(content);MavenHelpPanel.this.replace(content);+ target.add(content);}});add(new Tabbable("buildToolTabs", buildToolTabs));diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.javaindex c8fdd52e41..5d83413c30 100644--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackHandler.java@@ -8,29 +8,29 @@ import static io.onedev.server.plugin.pack.maven.MavenPackSupport.TYPE;import static io.onedev.server.util.IOUtils.copyWithMaxSize;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.stream.Collectors.toList;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-import static javax.servlet.http.HttpServletResponse.SC_OK;-import static javax.ws.rs.core.HttpHeaders.LAST_MODIFIED;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;+import static jakarta.ws.rs.core.HttpHeaders.LAST_MODIFIED;import java.io.ByteArrayOutputStream;import java.io.IOException;import java.util.Date;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MediaType;import org.apache.shiro.authz.UnauthorizedException;import org.dom4j.Document;import org.dom4j.DocumentHelper;-import org.hibernate.criterion.Restrictions;+import io.onedev.server.persistence.dao.Restrictions;import org.joda.time.DateTime;import org.joda.time.format.DateTimeFormat;import org.joda.time.format.DateTimeFormatter;diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.javaindex 9ba2032d03..4dc0e7b34e 100644--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java@@ -21,8 +21,8 @@ import java.util.List;import java.util.Map;import java.util.Objects;-import javax.inject.Inject;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.ws.rs.core.MediaType;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;@@ -155,16 +155,16 @@ public class MavenPackPanel extends GenericPanel<Pack> {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newMavenInstructions(packaging, bindings, requireSettings);- target.add(content);usageFrag.replace(content);+ target.add(content);}}.setSelected(true));buildToolTabs.add(new AjaxActionTab(Model.of(_T("Gradle"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {Component content = newGradleInstructions(bindings, canAccessAnonymously);- target.add(content);usageFrag.replace(content);+ target.add(content);}});usageFrag.add(new Tabbable("buildToolTabs", buildToolTabs));diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.javaindex dce056abcb..0ee179a308 100644--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackHandler.java@@ -7,13 +7,13 @@ import static io.onedev.server.util.UrlUtils.decodePath;import static io.onedev.server.util.UrlUtils.encodePath;import static java.nio.charset.StandardCharsets.UTF_8;import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-import static javax.servlet.http.HttpServletResponse.SC_OK;+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;import static org.apache.commons.codec.binary.Base64.encodeBase64String;import static org.apache.commons.lang3.StringUtils.substringAfter;import static org.apache.commons.lang3.StringUtils.substringAfterLast;@@ -28,12 +28,12 @@ import java.util.HashMap;import java.util.LinkedHashSet;import java.util.List;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;import org.apache.commons.codec.DecoderException;import org.apache.commons.codec.binary.Base64;@@ -354,7 +354,7 @@ public class NpmPackHandler implements PackHandler {var distTags = new HashMap<String, String>();var distTagsNode = packageMetadata.get("dist-tags");if (distTagsNode != null) {- for (var it = distTagsNode.fields(); it.hasNext(); ) {+ for (var it = distTagsNode.properties().iterator(); it.hasNext(); ) {var field = it.next();distTags.put(field.getKey(), field.getValue().asText());}@@ -363,7 +363,7 @@ public class NpmPackHandler implements PackHandler {var attachments = new HashMap<String, byte[]>();var attachmentsNode = packageMetadata.get("_attachments");if (attachmentsNode != null) {- for (var it = attachmentsNode.fields(); it.hasNext(); ) {+ for (var it = attachmentsNode.properties().iterator(); it.hasNext(); ) {var field = it.next();var fileName = field.getKey();var fileContent = Base64.decodeBase64(field.getValue().get("data").asText());@@ -384,7 +384,7 @@ public class NpmPackHandler implements PackHandler {byte[] packageMetadataBytes = writeJson(packageMetadata);if (versionsNode != null) {- for (var it = versionsNode.fields(); it.hasNext(); ) {+ for (var it = versionsNode.properties().iterator(); it.hasNext(); ) {var field = it.next();var version = field.getKey();var versionMetadata = (ObjectNode) field.getValue();diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.javaindex 6ef6d08982..3b370e53f1 100644--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackHandler.java@@ -9,14 +9,14 @@ import static io.onedev.server.util.UrlUtils.decodeQuery;import static io.onedev.server.util.UrlUtils.encodePath;import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;import static java.util.stream.Collectors.toList;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;-import static javax.servlet.http.HttpServletResponse.SC_CREATED;-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;-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_CONFLICT;+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;+import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;+import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;+import static jakarta.servlet.http.HttpServletResponse.SC_OK;import java.io.BufferedInputStream;import java.io.BufferedOutputStream;@@ -37,13 +37,12 @@ import java.util.Map;import java.util.zip.ZipEntry;import java.util.zip.ZipInputStream;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;-import org.apache.commons.fileupload.FileUploadException;-import org.apache.commons.fileupload.servlet.ServletFileUpload;+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;import org.apache.commons.io.IOUtils;import org.apache.shiro.authz.UnauthorizedException;import org.dom4j.Document;@@ -206,7 +205,7 @@ public class NugetPackHandler implements PackHandler {sessionService.run(() -> {checkProject(projectId, true);});- var upload = new ServletFileUpload();+ var upload = new JakartaServletFileUpload<>();try {var items = upload.getItemIterator(request);if (items.hasNext()) {@@ -214,7 +213,7 @@ public class NugetPackHandler implements PackHandler {var tempFile = FileUtils.createTempFile("upload", "nuget");try {try (- var is = item.openStream();+ var is = item.getInputStream();var os = new BufferedOutputStream(new FileOutputStream(tempFile), BUFFER_SIZE)) {IOUtils.copy(is, os, BUFFER_SIZE);}@@ -326,7 +325,7 @@ public class NugetPackHandler implements PackHandler {} else {throw new ClientException(SC_BAD_REQUEST);}- } catch (FileUploadException | IOException e) {+ } catch (IOException e) {throw new RuntimeException(e);}} else if (isDelete) {diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.javaindex 9fe3b43c24..a16698484b 100644--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java@@ -7,7 +7,7 @@ import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -25,7 +25,7 @@ public class PypiHelpPanel extends Panel {super.onInitialize();var registryUrl = getServerUrl() + "/" + projectPath + "/~" + PypiPackHandler.HANDLER_ID;- add(new CodeSnippetPanel("addRepository", new AbstractReadOnlyModel<>() {+ add(new CodeSnippetPanel("addRepository", new IModel<>() {@Overridepublic String getObject() {return "" +diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackHandler.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackHandler.javaindex ab878ef4a0..fa5ce545d0 100644--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackHandler.java+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackHandler.java@@ -18,16 +18,15 @@ import io.onedev.server.persistence.SessionService;import io.onedev.server.persistence.TransactionService;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.UrlUtils;-import org.apache.commons.fileupload.FileUploadException;-import org.apache.commons.fileupload.servlet.ServletFileUpload;-import org.apache.commons.fileupload.util.Streams;+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;+import org.apache.shiro.authz.UnauthorizedException;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.core.MediaType;+import jakarta.inject.Inject;+import jakarta.inject.Singleton;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.core.MediaType;import java.io.IOException;import java.net.URL;import java.util.*;@@ -38,7 +37,7 @@ import static java.lang.Integer.MAX_VALUE;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.Comparator.comparing;import static java.util.stream.Collectors.toList;-import static javax.servlet.http.HttpServletResponse.*;+import static jakarta.servlet.http.HttpServletResponse.*;@Singletonpublic class PypiPackHandler implements PackHandler {@@ -99,15 +98,15 @@ public class PypiPackHandler implements PackHandler {if (pathSegments.isEmpty()) {if (isPost) {- var upload = new ServletFileUpload();+ var upload = new JakartaServletFileUpload<>();try {var attributes = new LinkedHashMap<String, List<String>>();var items = upload.getItemIterator(request);while (items.hasNext()) {var item = items.next();- try (var is = item.openStream()) {+ try (var is = item.getInputStream()) {if (item.isFormField()) {- var itemValue = Streams.asString(is, UTF_8.name());+ var itemValue = org.apache.commons.io.IOUtils.toString(is, UTF_8.name());if (StringUtils.isNotBlank(itemValue))attributes.computeIfAbsent(item.getFieldName(), k -> new ArrayList<>()).add(itemValue);} else {@@ -184,7 +183,7 @@ public class PypiPackHandler implements PackHandler {}}}- } catch (IOException | FileUploadException e) {+ } catch (IOException e) {throw new RuntimeException(e);}} else {diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.javaindex b2cad06ebe..573d98af74 100644--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java@@ -14,7 +14,7 @@ import io.onedev.server.web.component.markdown.MarkdownViewer;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;+import io.onedev.server.web.component.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;diff --git a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.javaindex 0a9f0f6357..085b3a6015 100644--- a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java+++ b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java@@ -30,9 +30,9 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.stream.Collectors;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.SystemUtils;import org.jspecify.annotations.Nullable;@@ -121,8 +121,7 @@ public class ServerDockerProvisioner extends WorkspaceProvisioner implements Doc@Editable(order=400, description="Specify registry logins if necessary. For built-in registry, " +"use <code>@server_url@</code> for registry url, <code>@job_token@</code> for user name, and " +"access token for password")- @Valid- public List<RegistryLogin> getRegistryLogins() {+ public List<@Valid RegistryLogin> getRegistryLogins() {return registryLogins;}diff --git a/server-plugin/server-plugin-provisioner-servershell/src/main/java/io/onedev/server/plugin/provisioner/servershell/ServerShellProvisioner.java b/server-plugin/server-plugin-provisioner-servershell/src/main/java/io/onedev/server/plugin/provisioner/servershell/ServerShellProvisioner.javaindex a1cf2cb346..251912a583 100644--- a/server-plugin/server-plugin-provisioner-servershell/src/main/java/io/onedev/server/plugin/provisioner/servershell/ServerShellProvisioner.java+++ b/server-plugin/server-plugin-provisioner-servershell/src/main/java/io/onedev/server/plugin/provisioner/servershell/ServerShellProvisioner.java@@ -21,8 +21,8 @@ import java.util.List;import java.util.concurrent.CountDownLatch;import java.util.concurrent.Future;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.io.FilenameUtils;import org.jspecify.annotations.Nullable;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.javaindex 871a129ca2..59d5e230d3 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java@@ -20,7 +20,7 @@ import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.javaindex ed5f8bb448..b0a52911ec 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.report.checkstyle;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.buildspec.step.StepGroup;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/PublishClippyReportStep.java b/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/PublishClippyReportStep.javaindex bc3d77e6c0..eed895a527 100644--- a/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/PublishClippyReportStep.java+++ b/server-plugin/server-plugin-report-clippy/src/main/java/io/onedev/server/plugin/report/clippy/PublishClippyReportStep.java@@ -16,7 +16,7 @@ import io.onedev.server.codequality.CodeProblem;import io.onedev.server.model.Build;import io.onedev.server.plugin.report.problem.PublishProblemReportStep;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.nio.charset.StandardCharsets;diff --git a/server-plugin/server-plugin-report-clippy/src/test/java/io/onedev/server/plugin/report/clippy/ClippyReportParserTest.java b/server-plugin/server-plugin-report-clippy/src/test/java/io/onedev/server/plugin/report/clippy/ClippyReportParserTest.javaindex 07836d724a..a0423c1de2 100644--- a/server-plugin/server-plugin-report-clippy/src/test/java/io/onedev/server/plugin/report/clippy/ClippyReportParserTest.java+++ b/server-plugin/server-plugin-report-clippy/src/test/java/io/onedev/server/plugin/report/clippy/ClippyReportParserTest.java@@ -10,14 +10,14 @@ import io.onedev.server.model.Build;import io.onedev.server.util.IOUtils;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.util.ArrayList;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class ClippyReportParserTest {diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.javaindex 43f1f73aa5..db0e2af03e 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java@@ -19,7 +19,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.javaindex da859120c9..f4bd624ce0 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.report.clover;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.server.buildspec.step.StepGroup;import io.onedev.server.annotation.Editable;diff --git a/server-plugin/server-plugin-report-clover/src/test/java/io/onedev/server/plugin/report/clover/CloverReportParserTest.java b/server-plugin/server-plugin-report-clover/src/test/java/io/onedev/server/plugin/report/clover/CloverReportParserTest.javaindex eb10fa69eb..e9cec45f77 100644--- a/server-plugin/server-plugin-report-clover/src/test/java/io/onedev/server/plugin/report/clover/CloverReportParserTest.java+++ b/server-plugin/server-plugin-report-clover/src/test/java/io/onedev/server/plugin/report/clover/CloverReportParserTest.java@@ -7,11 +7,11 @@ import io.onedev.server.model.Build;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class CloverReportParserTest {diff --git a/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java b/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.javaindex 8195f2e8de..b117fcef6a 100644--- a/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java+++ b/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java@@ -21,7 +21,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.javaindex 747a9cf461..6797c4bce8 100644--- a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java+++ b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java@@ -8,14 +8,14 @@ import io.onedev.server.model.Build;import io.onedev.server.codequality.FileCoverage;import org.apache.commons.io.IOUtils;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.File;import java.io.FileOutputStream;import java.io.IOException;import java.util.HashMap;-import static org.junit.Assert.*;+import static org.junit.jupiter.api.Assertions.*;public class PublishCoberturaReportStepTest {diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoveragePanel.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoveragePanel.javaindex d635df9200..46fab52bc4 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoveragePanel.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoveragePanel.java@@ -5,7 +5,6 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.codequality.Coverage;@@ -22,7 +21,7 @@ import io.onedev.server.codequality.Coverage;var branchContainer = new WebMarkupContainer("branch");add(branchContainer.setVisible(getCoverageInfo().getBranchPercentage() >= 0));- branchContainer.add(new Label("label", new AbstractReadOnlyModel<String>() {+ branchContainer.add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -30,7 +29,7 @@ import io.onedev.server.codequality.Coverage;}}));- branchContainer.add(new PercentageBar("bar", new AbstractReadOnlyModel<>() {+ branchContainer.add(new PercentageBar("bar", new IModel<>() {@Overridepublic Integer getObject() {@@ -41,7 +40,7 @@ import io.onedev.server.codequality.Coverage;var lineContainer = new WebMarkupContainer("line");add(lineContainer.setVisible(getCoverageInfo().getLinePercentage() >= 0));- lineContainer.add(new Label("label", new AbstractReadOnlyModel<String>() {+ lineContainer.add(new Label("label", new IModel<String>() {@Overridepublic String getObject() {@@ -49,7 +48,7 @@ import io.onedev.server.codequality.Coverage;}}));- lineContainer.add(new PercentageBar("bar", new AbstractReadOnlyModel<>() {+ lineContainer.add(new PercentageBar("bar", new IModel<>() {@Overridepublic Integer getObject() {diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.javaindex 65e06d52a3..dfe57cb99b 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java@@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -143,7 +142,7 @@ public class CoverageReportPage extends BuildReportPage {}));- fragment.add(new Label("itemsTitle", new AbstractReadOnlyModel<String>() {+ fragment.add(new Label("itemsTitle", new IModel<String>() {@Overridepublic String getObject() {@@ -174,7 +173,7 @@ public class CoverageReportPage extends BuildReportPage {}});- input.add(AttributeAppender.append("placeholder", new AbstractReadOnlyModel<String>() {+ input.add(AttributeAppender.append("placeholder", new IModel<String>() {@Overridepublic String getObject() {@@ -283,8 +282,8 @@ public class CoverageReportPage extends BuildReportPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target);parseFilterPatterns();target.add(feedback);diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.javaindex 9758b5a070..93f1cc4f19 100644--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java@@ -27,7 +27,7 @@ import org.dom4j.Element;import org.dom4j.io.SAXReader;import org.unbescape.html.HtmlEscape;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/PublishCppcheckReportStep.java b/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/PublishCppcheckReportStep.javaindex 1bb8a0d058..587779c465 100644--- a/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/PublishCppcheckReportStep.java+++ b/server-plugin/server-plugin-report-cppcheck/src/main/java/io/onedev/server/plugin/report/cppcheck/PublishCppcheckReportStep.java@@ -6,7 +6,7 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.dom4j.Document;import org.dom4j.io.SAXReader;diff --git a/server-plugin/server-plugin-report-cppcheck/src/test/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParserTest.java b/server-plugin/server-plugin-report-cppcheck/src/test/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParserTest.javaindex d5b6ca9b18..e39b00c1de 100644--- a/server-plugin/server-plugin-report-cppcheck/src/test/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParserTest.java+++ b/server-plugin/server-plugin-report-cppcheck/src/test/java/io/onedev/server/plugin/report/cppcheck/CppcheckReportParserTest.java@@ -11,13 +11,13 @@ import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertTrue;public class CppcheckReportParserTest {diff --git a/server-plugin/server-plugin-report-gtest/src/main/java/io/onedev/server/plugin/report/gtest/PublishGTestReportStep.java b/server-plugin/server-plugin-report-gtest/src/main/java/io/onedev/server/plugin/report/gtest/PublishGTestReportStep.javaindex 7402963168..6d8e350b5f 100644--- a/server-plugin/server-plugin-report-gtest/src/main/java/io/onedev/server/plugin/report/gtest/PublishGTestReportStep.java+++ b/server-plugin/server-plugin-report-gtest/src/main/java/io/onedev/server/plugin/report/gtest/PublishGTestReportStep.java@@ -17,7 +17,7 @@ import io.onedev.server.util.XmlUtils;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-gtest/src/test/java/io/onedev/server/plugin/report/gtest/GTestReportParserTest.java b/server-plugin/server-plugin-report-gtest/src/test/java/io/onedev/server/plugin/report/gtest/GTestReportParserTest.javaindex e9db019644..14cb3f8ca4 100644--- a/server-plugin/server-plugin-report-gtest/src/test/java/io/onedev/server/plugin/report/gtest/GTestReportParserTest.java+++ b/server-plugin/server-plugin-report-gtest/src/test/java/io/onedev/server/plugin/report/gtest/GTestReportParserTest.java@@ -7,13 +7,13 @@ import io.onedev.server.codequality.UnitTestReport.Status;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;import org.eclipse.jgit.lib.ObjectId;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.internal.util.collections.Sets;import java.io.IOException;import java.io.InputStream;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class GTestReportParserTest {diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.javaindex 57fc496ca9..de51dc8565 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java@@ -13,7 +13,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import java.io.IOException;import java.net.URLEncoder;import java.nio.file.Files;diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.javaindex 8834bca45b..762651b0b1 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java@@ -6,7 +6,7 @@ import java.io.File;import java.io.IOException;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.javaindex 61a3cd38b9..1d2abd2214 100644--- a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java+++ b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java@@ -9,7 +9,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import org.dom4j.Document;import org.dom4j.DocumentException;diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.javaindex 347b55d5d2..951d5b99f5 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java@@ -4,7 +4,7 @@ import java.io.File;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;diff --git a/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportParserTest.java b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportParserTest.javaindex 6d32532838..79b398dd1c 100644--- a/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportParserTest.java+++ b/server-plugin/server-plugin-report-jest/src/test/java/io/onedev/server/plugin/report/jest/JestReportParserTest.java@@ -1,12 +1,12 @@package io.onedev.server.plugin.report.jest;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import java.io.IOException;import java.io.InputStream;import java.util.HashSet;-import org.junit.Test;+import org.junit.jupiter.api.Test;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.javaindex 49879f202b..5eb5c02f7d 100644--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java@@ -17,7 +17,7 @@ import io.onedev.server.util.XmlUtils;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.javaindex 45f9654530..9e1a173b1d 100644--- a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java+++ b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java@@ -5,12 +5,12 @@ import io.onedev.server.codequality.UnitTestReport;import io.onedev.server.codequality.UnitTestReport.Status;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.internal.util.collections.Sets;import java.io.IOException;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class JUnitReportParserTest {diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.javaindex e571b2625c..2aa1c6b094 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java@@ -15,7 +15,7 @@ import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import java.io.*;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.javaindex cbf4660ce9..102fd40991 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java@@ -15,7 +15,7 @@ import io.onedev.server.service.ProjectService;import io.onedev.server.model.Build;import io.onedev.server.persistence.SessionService;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.util.List;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.javaindex 417cf08cc1..15117f2680 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java@@ -14,7 +14,7 @@ import io.onedev.server.service.BuildService;import io.onedev.server.service.ProjectService;import io.onedev.server.persistence.SessionService;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.List;diff --git a/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/PublishMypyReportStep.java b/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/PublishMypyReportStep.javaindex 61390683c3..088b12499a 100644--- a/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/PublishMypyReportStep.java+++ b/server-plugin/server-plugin-report-mypy/src/main/java/io/onedev/server/plugin/report/mypy/PublishMypyReportStep.java@@ -15,7 +15,7 @@ import io.onedev.server.model.Build;import io.onedev.server.plugin.report.problem.PublishProblemReportStep;import io.onedev.server.util.IOUtils;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.FileInputStream;import java.nio.charset.StandardCharsets;diff --git a/server-plugin/server-plugin-report-mypy/src/test/java/io/onedev/server/plugin/report/mypy/MypyReportParserTest.java b/server-plugin/server-plugin-report-mypy/src/test/java/io/onedev/server/plugin/report/mypy/MypyReportParserTest.javaindex dc1e38428b..33a90d40a5 100644--- a/server-plugin/server-plugin-report-mypy/src/test/java/io/onedev/server/plugin/report/mypy/MypyReportParserTest.java+++ b/server-plugin/server-plugin-report-mypy/src/test/java/io/onedev/server/plugin/report/mypy/MypyReportParserTest.java@@ -8,13 +8,13 @@ import io.onedev.server.model.Build;import org.apache.commons.io.IOUtils;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.unbescape.html.HtmlEscape.escapeHtml5;public class MypyReportParserTest {diff --git a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.javaindex fb5b8ca1d5..f7517673dc 100644--- a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java+++ b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PublishPlaywrightReportStep.java@@ -4,7 +4,7 @@ import java.io.File;import java.util.ArrayList;import java.util.List;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;diff --git a/server-plugin/server-plugin-report-playwright/src/test/java/io/onedev/server/plugin/report/playwright/PlaywrightReportParserTest.java b/server-plugin/server-plugin-report-playwright/src/test/java/io/onedev/server/plugin/report/playwright/PlaywrightReportParserTest.javaindex 6f96381d76..4b27e6f06d 100644--- a/server-plugin/server-plugin-report-playwright/src/test/java/io/onedev/server/plugin/report/playwright/PlaywrightReportParserTest.java+++ b/server-plugin/server-plugin-report-playwright/src/test/java/io/onedev/server/plugin/report/playwright/PlaywrightReportParserTest.java@@ -1,10 +1,10 @@package io.onedev.server.plugin.report.playwright;import static io.onedev.server.codequality.UnitTestReport.ARTIFACTS;-import static org.junit.Assert.assertArrayEquals;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertFalse;-import static org.junit.Assert.assertTrue;+import static org.junit.jupiter.api.Assertions.assertArrayEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;import java.io.File;import java.io.IOException;@@ -15,9 +15,8 @@ import java.util.HashSet;import java.util.List;import java.util.Map;-import org.junit.Rule;-import org.junit.Test;-import org.junit.rules.TemporaryFolder;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.io.TempDir;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;@@ -35,8 +34,8 @@ public class PlaywrightReportParserTest {private static final String ARTIFACT_DIR ="confidential-issue-Issue-R-14762-d-view-a-confidential-issue-chromium";- @Rule- public TemporaryFolder temp = new TemporaryFolder();+ @TempDir+ public File temp;@Testpublic void shouldParseReport() {@@ -57,8 +56,8 @@ public class PlaywrightReportParserTest {};- File inputDir = temp.newFolder("input");- File reportDir = temp.newFolder("report");+ File inputDir = Files.createDirectory(temp.toPath().resolve("input")).toFile();+ File reportDir = Files.createDirectory(temp.toPath().resolve("report")).toFile();copyResource(ARTIFACT_DIR + "/test-failed-1.png", inputDir);copyResource(ARTIFACT_DIR + "/error-context.md", inputDir);UnitTestReport report = new UnitTestReport(@@ -124,7 +123,7 @@ public class PlaywrightReportParserTest {((com.fasterxml.jackson.databind.node.ObjectNode) unsafeRootNode.path("suites").get(0).path("specs").get(0).path("tests").get(0).path("results").get(0).path("attachments").get(0)).put("path", "/outside-workdir/screenshot.png");- File unsafeReportDir = temp.newFolder("unsafe-report");+ File unsafeReportDir = Files.createDirectory(temp.toPath().resolve("unsafe-report")).toFile();PlaywrightReportParser.parse(build, unsafeRootNode, inputDir, unsafeReportDir, null);assertFalse(new File(unsafeReportDir,ARTIFACTS + "/" + ARTIFACT_DIR + "/test-failed-1.png").exists());diff --git a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.javaindex 1b5e79d20f..1974bf0127 100644--- a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java+++ b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java@@ -20,7 +20,7 @@ import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.javaindex f9ecc29a28..83c1475073 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.list.PageableListView;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;@@ -172,8 +171,8 @@ public class ProblemReportPage extends BuildReportPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target);parseFilePatterns();target.add(feedback);@@ -236,7 +235,7 @@ public class ProblemReportPage extends BuildReportPage {};toggleLink.add(groupKey.render("key"));- toggleLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ toggleLink.add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.javaindex 20bdc5d7e0..ecb196aed4 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java@@ -21,7 +21,7 @@ import io.onedev.server.persistence.SessionService;import io.onedev.server.persistence.dao.Dao;import org.apache.commons.lang3.SerializationUtils;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.io.*;import java.util.Collection;import java.util.List;diff --git a/server-plugin/server-plugin-report-pylint/src/main/java/io/onedev/server/plugin/report/pylint/PublishPylintReportStep.java b/server-plugin/server-plugin-report-pylint/src/main/java/io/onedev/server/plugin/report/pylint/PublishPylintReportStep.javaindex a8c3d43f56..12cbf2da59 100644--- a/server-plugin/server-plugin-report-pylint/src/main/java/io/onedev/server/plugin/report/pylint/PublishPylintReportStep.java+++ b/server-plugin/server-plugin-report-pylint/src/main/java/io/onedev/server/plugin/report/pylint/PublishPylintReportStep.java@@ -16,7 +16,7 @@ import io.onedev.server.codequality.CodeProblem;import io.onedev.server.model.Build;import io.onedev.server.plugin.report.problem.PublishProblemReportStep;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.ArrayList;import java.util.List;diff --git a/server-plugin/server-plugin-report-pylint/src/test/java/io/onedev/server/plugin/report/pylint/PylintReportParserTest.java b/server-plugin/server-plugin-report-pylint/src/test/java/io/onedev/server/plugin/report/pylint/PylintReportParserTest.javaindex 707764eccf..0e3f05a570 100644--- a/server-plugin/server-plugin-report-pylint/src/test/java/io/onedev/server/plugin/report/pylint/PylintReportParserTest.java+++ b/server-plugin/server-plugin-report-pylint/src/test/java/io/onedev/server/plugin/report/pylint/PylintReportParserTest.java@@ -8,12 +8,12 @@ import io.onedev.server.codequality.BlobTarget;import io.onedev.server.model.Build;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class PylintReportParserTest {diff --git a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.javaindex ef1a789db7..084f824a22 100644--- a/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java+++ b/server-plugin/server-plugin-report-roslynator/src/main/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStep.java@@ -21,7 +21,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.javaindex 9eaf2f9210..8104f44304 100644--- a/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java+++ b/server-plugin/server-plugin-report-roslynator/src/test/java/io/onedev/server/plugin/report/roslynator/PublishRoslynatorReportStepTest.java@@ -9,13 +9,13 @@ import io.onedev.server.model.Build;import org.dom4j.io.SAXReader;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.util.HashMap;import java.util.Optional;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNull;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNull;public class PublishRoslynatorReportStepTest {diff --git a/server-plugin/server-plugin-report-ruff/src/main/java/io/onedev/server/plugin/report/ruff/PublishRuffReportStep.java b/server-plugin/server-plugin-report-ruff/src/main/java/io/onedev/server/plugin/report/ruff/PublishRuffReportStep.javaindex 3a0a471596..4edea63dec 100644--- a/server-plugin/server-plugin-report-ruff/src/main/java/io/onedev/server/plugin/report/ruff/PublishRuffReportStep.java+++ b/server-plugin/server-plugin-report-ruff/src/main/java/io/onedev/server/plugin/report/ruff/PublishRuffReportStep.java@@ -16,7 +16,7 @@ import io.onedev.server.codequality.CodeProblem;import io.onedev.server.model.Build;import io.onedev.server.plugin.report.problem.PublishProblemReportStep;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.util.ArrayList;import java.util.List;diff --git a/server-plugin/server-plugin-report-ruff/src/test/java/io/onedev/server/plugin/report/ruff/RuffReportParserTest.java b/server-plugin/server-plugin-report-ruff/src/test/java/io/onedev/server/plugin/report/ruff/RuffReportParserTest.javaindex 9908177bfb..7faec00db0 100644--- a/server-plugin/server-plugin-report-ruff/src/test/java/io/onedev/server/plugin/report/ruff/RuffReportParserTest.java+++ b/server-plugin/server-plugin-report-ruff/src/test/java/io/onedev/server/plugin/report/ruff/RuffReportParserTest.java@@ -7,12 +7,12 @@ import io.onedev.server.codequality.BlobTarget;import io.onedev.server.model.Build;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import org.junit.Test;+import org.junit.jupiter.api.Test;import java.io.IOException;import java.io.InputStream;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class RuffReportParserTest {diff --git a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.javaindex cec5270d2e..bdb29b94f8 100644--- a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java+++ b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java@@ -22,7 +22,7 @@ import org.dom4j.Element;import org.dom4j.io.SAXReader;import org.jspecify.annotations.Nullable;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/PublishTRXReportStep.java b/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/PublishTRXReportStep.javaindex 5035c9ba11..d1a5b63092 100644--- a/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/PublishTRXReportStep.java+++ b/server-plugin/server-plugin-report-trx/src/main/java/io/onedev/server/plugin/report/trx/PublishTRXReportStep.java@@ -18,7 +18,7 @@ import io.onedev.server.util.XmlUtils;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import javax.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotEmpty;import java.io.File;import java.io.IOException;import java.io.StringReader;diff --git a/server-plugin/server-plugin-report-trx/src/test/java/io/onedev/server/plugin/report/trx/TRXReportParserTest.java b/server-plugin/server-plugin-report-trx/src/test/java/io/onedev/server/plugin/report/trx/TRXReportParserTest.javaindex c9c5281572..8b61059808 100644--- a/server-plugin/server-plugin-report-trx/src/test/java/io/onedev/server/plugin/report/trx/TRXReportParserTest.java+++ b/server-plugin/server-plugin-report-trx/src/test/java/io/onedev/server/plugin/report/trx/TRXReportParserTest.java@@ -4,12 +4,12 @@ import com.google.common.io.Resources;import io.onedev.server.codequality.UnitTestReport;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import org.junit.Test;+import org.junit.jupiter.api.Test;import org.mockito.internal.util.collections.Sets;import java.io.IOException;-import static org.junit.Assert.assertEquals;+import static org.junit.jupiter.api.Assertions.assertEquals;public class TRXReportParserTest {@Testdiff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.javaindex 74fab5e340..0fbc531e9a 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java@@ -10,7 +10,7 @@ import java.nio.file.Paths;import java.util.ArrayList;import java.util.List;-import javax.persistence.EntityNotFoundException;+import jakarta.persistence.EntityNotFoundException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.request.mapper.parameter.PageParameters;diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestStatusBadge.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestStatusBadge.javaindex 7a256ddb7f..c776183759 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestStatusBadge.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestStatusBadge.java@@ -4,7 +4,7 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;import io.onedev.server.codequality.UnitTestReport.Status;import io.onedev.server.web.util.TextUtils;@@ -22,7 +22,7 @@ class TestStatusBadge extends Label {protected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ add(AttributeAppender.append("class", new IModel<String>() {@Overridepublic String getObject() {diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.javaindex 05f5974ef3..0fa849cb50 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java@@ -221,8 +221,8 @@ public class UnitTestCasesPage extends UnitTestReportPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target);testSuitePatterns = parseTestSuitePatterns();if (testSuitePatterns == null)@@ -304,8 +304,8 @@ public class UnitTestCasesPage extends UnitTestReportPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);pushState(target);namePatterns = parseNamePatterns();if (namePatterns == null)diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.javaindex f00de4ecb4..47618f9f0d 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java@@ -206,8 +206,9 @@ public class UnitTestSuitesPage extends UnitTestReportPage {}@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSubmit(AjaxRequestTarget target) {+ Form<?> form = getForm();+ super.onSubmit(target);pushState(target);namePatterns = parseNamePatterns();if (namePatterns == null)diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 4dd5a73c77..f93bbfdde6 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -1,13 +1,13 @@-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">- <modelVersion>4.0.0</modelVersion>- <artifactId>server-plugin-sso-discord</artifactId>- <parent>- <groupId>io.onedev</groupId>- <artifactId>server-plugin</artifactId>- <version>16.6.3</version>- </parent>- <properties>- <moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>- </properties>-</project>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-sso-discord</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>16.6.3</version>+ </parent>+ <properties>+ <moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>+ </properties>+</project>diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.javaindex 84db3ca1e1..02a27f8259 100644--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java@@ -4,8 +4,8 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.IOException;-import javax.servlet.http.HttpServletRequest;-import javax.validation.constraints.NotEmpty;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.validation.constraints.NotEmpty;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authc.AuthenticationException;diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.javaindex cf53be4ff6..37b154a500 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java@@ -6,8 +6,8 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.List;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.core.MediaType;+import jakarta.validation.constraints.NotEmpty;+import jakarta.ws.rs.core.MediaType;import org.apache.shiro.authc.AuthenticationException;diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.javaindex 2fb42f9083..b825fc697d 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java@@ -10,8 +10,8 @@ import java.util.List;import java.util.UUID;import org.jspecify.annotations.Nullable;-import javax.servlet.http.HttpServletRequest;-import javax.validation.constraints.NotEmpty;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.validation.constraints.NotEmpty;import org.apache.http.client.utils.URIBuilder;import org.apache.shiro.authc.AuthenticationException;@@ -387,9 +387,8 @@ public class OpenIdConnector extends SsoConnector {}protected ProviderMetadata discoverProviderMetadata() {- try {- JsonNode json = OneDev.getInstance(ObjectMapper.class).readTree(- new URI(getConfigurationDiscoveryUrl()).toURL());+ try (var input = new URI(getConfigurationDiscoveryUrl()).toURL().openStream()) {+ JsonNode json = OneDev.getInstance(ObjectMapper.class).readTree(input);var endSessionEndpointNode = json.get("end_session_endpoint");return new ProviderMetadata(json.get("issuer").asText(),diff --git a/server-product/helm/templates/_helpers.tpl b/server-product/helm/templates/_helpers.tplindex 0664310a69..160ff4002a 100644--- a/server-product/helm/templates/_helpers.tpl+++ b/server-product/helm/templates/_helpers.tpl@@ -128,7 +128,6 @@ Set dilect and driver env variables based database type{{- $dbTypeMap := dict "mysql" (dict "dialect" "org.hibernate.dialect.MySQL5InnoDBDialect" "driver" "com.mysql.cj.jdbc.Driver")"postgresql" (dict "dialect" "io.onedev.server.persistence.PostgreSQLDialect" "driver" "org.postgresql.Driver")"mariadb" (dict "dialect" "org.hibernate.dialect.MySQL5InnoDBDialect" "driver" "org.mariadb.jdbc.Driver")- "mssql" (dict "dialect" "org.hibernate.dialect.SQLServer2012Dialect" "driver" "com.microsoft.sqlserver.jdbc.SQLServerDriver")-}}{{- with index $dbTypeMap $dbType }}- name: hibernate_dialectdiff --git a/server-product/helm/values.yaml b/server-product/helm/values.yamlindex 76b82a6fed..3cf2d137f6 100644--- a/server-product/helm/values.yaml+++ b/server-product/helm/values.yaml@@ -46,7 +46,7 @@ onedev:database:# database.external -- Set to **true** when using external databaseexternal: false- # database.type-- Required: Set type of external database. Possible values `mysql`, `mariadb`, `postgresql`, `mssql`+ # database.type-- Required: Set type of external database. Possible values `mysql`, `mariadb`, `postgresql`# [external databases](https://docs.onedev.io/installation-guide/run-as-docker-container#use-external-database)type: "mysql"# database.host -- IP address or hostname of databasediff --git a/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.javaindex adc6a40a7a..d9a0b3275b 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java@@ -1,6 +1,6 @@package io.onedev.server.product;-import javax.inject.Inject;+import jakarta.inject.Inject;import org.eclipse.jetty.server.HttpConfiguration;import org.eclipse.jetty.server.HttpConnectionFactory;@@ -28,6 +28,7 @@ public class ProductConfigurator implements ServerConfigurator {@Overridepublic void configure(Server server) {HttpConfiguration configuration = new HttpConfiguration();+ configuration.setRelativeRedirectAllowed(true);configuration.setRequestHeaderSize(REQUEST_HEADER_SIZE);configuration.setSendServerVersion(false);diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex 65e5b3457f..65fc7bc8a9 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -4,18 +4,18 @@ import java.io.File;import java.util.EnumSet;import java.util.Set;-import javax.inject.Inject;-import javax.servlet.DispatcherType;-import javax.servlet.http.HttpSessionEvent;-import javax.servlet.http.HttpSessionListener;+import jakarta.inject.Inject;+import jakarta.servlet.DispatcherType;+import jakarta.servlet.http.HttpSessionEvent;+import jakarta.servlet.http.HttpSessionListener;import org.apache.shiro.web.env.EnvironmentLoader;import org.apache.shiro.web.env.EnvironmentLoaderListener;import org.apache.shiro.web.servlet.ShiroFilter;import org.apache.wicket.protocol.http.WicketServlet;-import org.eclipse.jetty.servlet.FilterHolder;-import org.eclipse.jetty.servlet.ServletContextHandler;-import org.eclipse.jetty.servlet.ServletHolder;+import org.eclipse.jetty.ee11.servlet.FilterHolder;+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;+import org.eclipse.jetty.ee11.servlet.ServletHolder;import org.glassfish.jersey.servlet.ServletContainer;import io.onedev.commons.bootstrap.Bootstrap;diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex e50bd1ebd7..b81e13f2be 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -2,7 +2,7 @@ package io.onedev.server.product;public class Test {- @org.junit.Test+ @org.junit.jupiter.api.Testpublic void test() {}diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.propertiesindex 64829fa3c3..35c0c354eb 100644--- a/server-product/system/conf/hibernate.properties+++ b/server-product/system/conf/hibernate.properties@@ -69,10 +69,10 @@ hibernate.hikari.maximumPoolSize=25hibernate.show_sql=falsehibernate.format_sql=true-javax.persistence.validation.mode=none+jakarta.persistence.validation.mode=nonehibernate.validator.apply_to_ddl=false-hibernate.cache.region.factory_class=com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory+hibernate.cache.region.factory_class=io.onedev.server.persistence.HazelcastLocalCacheRegionFactoryhibernate.cache.use_query_cache=truehibernate.cache.auto_evict_collection_cache=truehibernate.query.plan_cache_max_size=2048