fix: Unable to delete obsolete project directories on Windows with Java 25 (OD-2574)

This commit is contained in:
Robin Shen 2025-10-08 16:28:58 +08:00
parent 618dbaf297
commit 25e3991ba9
912 changed files with 944 additions and 934 deletions

View File

@ -9,7 +9,7 @@
<version>1.2.3</version>
</parent>
<artifactId>server</artifactId>
<version>13.0.7</version>
<version>13.0.8</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@ -320,7 +320,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
<version>33.5.0-jre</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@ -646,8 +646,8 @@
</repository>
</repositories>
<properties>
<commons.version>3.0.14</commons.version>
<agent.version>2.2.19</agent.version>
<commons.version>3.0.15</commons.version>
<agent.version>2.2.20</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>13.0.7</version>
<version>13.0.8</version>
</parent>
<build>
<plugins>

View File

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;

View File

@ -3,7 +3,7 @@ package io.onedev.server;
import io.onedev.server.annotation.NoDBAccess;
import org.apache.wicket.Component;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public interface SubscriptionService {

View File

@ -14,7 +14,7 @@ import java.util.Stack;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.ConstraintViolation;
import javax.validation.Valid;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public interface BuildSpecAware {

View File

@ -10,7 +10,7 @@ import java.util.List;
import java.util.Stack;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.ConstraintViolation;
import javax.validation.ValidationException;

View File

@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.Min;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspec.ParamSpecAware;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;

View File

@ -10,7 +10,7 @@ import io.onedev.server.model.PullRequest;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;

View File

@ -6,7 +6,7 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.ValidationException;
import javax.validation.constraints.NotEmpty;

View File

@ -14,7 +14,7 @@ import static io.onedev.server.model.Build.NAME_TAG;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_BRANCH;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_BRANCH;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_PROJECT;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_TAG;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.action.condition;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
import static io.onedev.server.model.Build.NAME_TAG;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.action.condition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;

View File

@ -5,7 +5,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.job.log.StyleBuilder;
import io.onedev.server.web.asset.emoji.Emojis;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.projectdependency;
import java.io.Serializable;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;

View File

@ -17,7 +17,7 @@ import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.WicketUtils;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -1,6 +1,6 @@
package io.onedev.server.buildspec.job.retrycondition;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -10,7 +10,7 @@ import static io.onedev.server.model.Build.NAME_LOG;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import io.onedev.server.model.Build;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public class RetryContext {

View File

@ -16,7 +16,7 @@ import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.util.List;

View File

@ -20,7 +20,7 @@ import io.onedev.server.web.util.WicketUtils;
import org.apache.wicket.Component;
import org.eclipse.jgit.revwalk.RevCommit;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.ArrayList;

View File

@ -15,7 +15,7 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
import org.eclipse.jgit.lib.Repository;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.List;

View File

@ -17,7 +17,7 @@ import org.apache.commons.lang.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import java.io.Serializable;
import java.util.*;

View File

@ -4,7 +4,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.instance;
import java.io.Serializable;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import io.onedev.server.annotation.Multiline;

View File

@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import org.eclipse.jgit.lib.AnyObjectId;

View File

@ -7,7 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;

View File

@ -4,7 +4,7 @@ import java.io.File;
import java.util.Collection;
import java.util.HashSet;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.KubernetesHelper;

View File

@ -10,7 +10,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import java.io.File;
import java.io.UnsupportedEncodingException;

View File

@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.List;
import java.util.Map;

View File

@ -3,7 +3,7 @@ package io.onedev.server.buildspecmodel.inputspec;
import java.io.Serializable;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import org.apache.commons.lang3.builder.EqualsBuilder;

View File

@ -2,7 +2,7 @@ package io.onedev.server.buildspecmodel.inputspec;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.web.util.WicketUtils;

View File

@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;

View File

@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Size;

View File

@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import com.google.common.collect.Lists;

View File

@ -6,7 +6,7 @@ import com.hazelcast.cp.IAtomicLong;
import io.onedev.server.annotation.NoDBAccess;
import io.onedev.server.replica.ProjectReplica;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;

View File

@ -7,7 +7,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.util.*;
import static java.util.Comparator.comparingInt;

View File

@ -2,7 +2,7 @@ package io.onedev.server.codequality;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.server.model.Build;

View File

@ -1,6 +1,6 @@
package io.onedev.server.codequality;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public enum CoverageStatus {

View File

@ -2,7 +2,7 @@ package io.onedev.server.codequality;
import java.util.Map;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.server.model.Build;

View File

@ -35,6 +35,7 @@ import java.util.concurrent.Callable;
import static io.onedev.server.persistence.PersistenceUtils.*;
import static java.lang.Integer.parseInt;
import static java.lang.String.valueOf;
import static java.lang.System.lineSeparator;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.io.FileUtils.writeStringToFile;
import static org.hibernate.cfg.AvailableSettings.DIALECT;
@ -124,11 +125,12 @@ public class Upgrade extends AbstractPlugin {
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.text=ALL-UNNAMED",
"--add-opens=java.desktop/java.awt.font=ALL-UNNAMED",
"--add-modules=java.se",
"--add-modules=java.se",
"--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
"-Djdk.io.File.allowDeleteReadOnlyFiles=true",
"-classpath", "*", bootstrapClass,
command);
cmdline.addArgs(commandArgs);
@ -944,6 +946,10 @@ public class Upgrade extends AbstractPlugin {
wrapperConf = wrapperConf.replace(
"wrapperConfwrapper.java.additional.30=--add-modules=java.se",
"wrapper.java.additional.30=--add-modules=java.se");
if (!wrapperConf.contains("-Djdk.io.File.allowDeleteReadOnlyFiles=true")) {
wrapperConf += lineSeparator() + "wrapper.java.additional.150=-Djdk.io.File.allowDeleteReadOnlyFiles=true";
}
var lines = Splitter.on('\n').trimResults().splitToList(wrapperConf);
if (lines.stream().noneMatch(it -> it.contains("-XX:MaxRAMPercentage"))) {

View File

@ -4,7 +4,7 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.util.init.ManualConfig;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.File;
import java.sql.Connection;
import java.util.List;

View File

@ -35,7 +35,7 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.inject.Singleton;
import org.apache.commons.io.IOUtils;

View File

@ -9,7 +9,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.ObjectUtils.Null;

View File

@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public class BuildReference extends EntityReference {

View File

@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import java.io.Serializable;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.validation.ValidationException;
import org.apache.commons.lang3.builder.EqualsBuilder;

View File

@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public class IssueReference extends EntityReference {

View File

@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import java.util.function.BiFunction;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.unbescape.html.HtmlEscape;

View File

@ -2,7 +2,7 @@ package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public class PullRequestReference extends EntityReference {

View File

@ -1,6 +1,6 @@
package io.onedev.server.entityreference;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;

View File

@ -12,7 +12,7 @@ import java.util.Set;
import java.util.function.BiFunction;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.jsoup.nodes.Document;
import org.jsoup.select.NodeTraversor;

View File

@ -1,6 +1,6 @@
package io.onedev.server.entityreference;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.CodeComment;

View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.websocket.PageKey;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public abstract class Event {

View File

@ -11,7 +11,7 @@ import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.web.UrlService;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.Date;
import java.util.Optional;

View File

@ -2,7 +2,7 @@ package io.onedev.server.event.project;
import java.util.Date;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;

View File

@ -13,7 +13,7 @@ import io.onedev.server.model.User;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public abstract class BuildEvent extends ProjectEvent implements CommitAware {

View File

@ -1,6 +1,6 @@
package io.onedev.server.event.project.codecomment;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.CodeCommentStatusChangeService;

View File

@ -13,7 +13,7 @@ import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
import io.onedev.server.web.UrlService;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.Map;

View File

@ -1,6 +1,6 @@
package io.onedev.server.event.project.pullrequest;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.eclipse.jgit.lib.ObjectId;

View File

@ -1,6 +1,6 @@
package io.onedev.server.event.project.pullrequest;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.CodeCommentStatusChangeService;

View File

@ -2,7 +2,7 @@ package io.onedev.server.event.project.pullrequest;
import java.util.Date;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.PullRequestService;

View File

@ -3,7 +3,7 @@ package io.onedev.server.event.project.pullrequest;
import java.text.MessageFormat;
import java.util.Date;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.service.UserService;

View File

@ -4,7 +4,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.exception.handler.ExceptionHandler;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.MultivaluedMap;
import java.io.IOException;

View File

@ -1,6 +1,6 @@
package io.onedev.server.exception;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.util.Map;

View File

@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.tika.mime.MediaType;
import org.eclipse.jgit.lib.ObjectId;

View File

@ -13,7 +13,7 @@ import io.onedev.server.web.util.DiffPlanarRange;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.ObjectId;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@ -134,13 +134,11 @@ public abstract class BlobChange implements Serializable {
return getProject().getBlob(newBlobIdent, true);
}
@Nullable
public Blob.Text getOldText() {
public Blob.@Nullable Text getOldText() {
return getOldBlob().getText();
}
@Nullable
public Blob.Text getNewText() {
public Blob.@Nullable Text getNewText() {
return getNewBlob().getText();
}

View File

@ -3,7 +3,7 @@ package io.onedev.server.git;
import java.io.Serializable;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

View File

@ -31,7 +31,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BooleanSupplier;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.Filter;

View File

@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;

View File

@ -16,7 +16,7 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.shiro.util.ThreadContext;
import org.apache.sshd.common.channel.ChannelOutputStream;

View File

@ -3,7 +3,7 @@ package io.onedev.server.git.command;
import java.io.File;
import java.io.OutputStream;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
import org.apache.commons.collections4.map.ReferenceMap;

View File

@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.server.util.FileExtension;
import io.onedev.commons.utils.match.Matcher;

View File

@ -13,7 +13,7 @@ import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.git.CommandUtils;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
public class GetRawTagCommand {

View File

@ -6,7 +6,7 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;

View File

@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
import javax.annotation.Nullable;
import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;

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