The Unified and Autonomous Development Platform
Add database migration
Robin Shenb0df16559cc3
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex fc0530f523..8db474d3dd 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -36,6 +36,7 @@ import org.apache.wicket.protocol.http.WicketFilter;import org.apache.wicket.protocol.http.WicketServlet;import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.websocket.api.WebSocketPolicy;+import org.eclipse.jgit.lib.ObjectId;import org.glassfish.jersey.server.ResourceConfig;import org.glassfish.jersey.servlet.ServletContainer;import org.hibernate.CallbackException;@@ -80,9 +81,11 @@ import io.onedev.server.cache.DefaultCodeCommentRelationInfoManager;import io.onedev.server.cache.DefaultCommitInfoManager;import io.onedev.server.cache.DefaultUserInfoManager;import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.ci.CISpec;import io.onedev.server.ci.DefaultJobScheduler;import io.onedev.server.ci.JobScheduler;import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.ci.jobexecutor.JobExecutor;import io.onedev.server.ci.jobexecutor.JobExecutorProvider;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;@@ -171,6 +174,8 @@ import io.onedev.server.git.GitPreReceiveCallback;import io.onedev.server.git.config.GitConfig;import io.onedev.server.migration.JpaConverter;import io.onedev.server.migration.PersistentBagConverter;+import io.onedev.server.model.Build2;+import io.onedev.server.model.Project;import io.onedev.server.model.support.authenticator.Authenticator;import io.onedev.server.notification.CommitNotificationManager;import io.onedev.server.notification.CodeCommentNotificationManager;@@ -391,7 +396,34 @@ public class CoreModule extends AbstractPluginModule {contributeFromPackage(Authenticator.class, Authenticator.class);contributeFromPackage(CISpecDetector.class, CISpecDetector.class);+ contribute(CISpecDetector.class, new CISpecDetector() {++ @Override+ public int getPriority() {+ return CISpecDetector.DEFAULT_PRIORITY;+ }++ @Override+ public CISpec detect(Project project, ObjectId commitId) {+ return null;+ }++ });+contributeFromPackage(JobExecutorProvider.class, JobExecutorProvider.class);+ contribute(JobExecutorProvider.class, new JobExecutorProvider() {++ @Override+ public int getPriority() {+ return JobExecutorProvider.DEFAULT_PRIORITY;+ }++ @Override+ public JobExecutor getExecutor(Build2 build) {+ return null;+ }++ });bind(IndexManager.class).to(DefaultIndexManager.class);bind(SearchManager.class).to(DefaultSearchManager.class);diff --git a/core/src/main/java/io/onedev/server/git/command/LogCommand.java b/core/src/main/java/io/onedev/server/git/command/LogCommand.javaindex daffb4ee8b..5eec51f59d 100644--- a/core/src/main/java/io/onedev/server/git/command/LogCommand.java+++ b/core/src/main/java/io/onedev/server/git/command/LogCommand.java@@ -155,7 +155,12 @@ public abstract class LogCommand extends GitCommand<Void> {@Overridepublic void consume(String line) {- logger.error(line);+ if (line.contains("inexact rename detection was skipped")+ || line.contains("you may want to set your diff.renameLimit variable")) {+ logger.trace(line);+ } else {+ logger.error(line);+ }}}).checkReturnCode();diff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javaindex 1fc1497892..b4947f9413 100644--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java@@ -902,4 +902,22 @@ public class DatabaseMigrator {}}+ private void migrate22(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("IssueFieldUnarys.xml")) {+ File renamedFile = new File(dataDir, file.getName().replace("IssueFieldUnarys", "IssueFieldEntitys"));+ try {+ FileUtils.moveFile(file, renamedFile);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ VersionedDocument dom = VersionedDocument.fromFile(renamedFile);+ for (Element element: dom.getRootElement().elements()) {+ element.setName("io.onedev.server.model.IssueFieldEntity");+ }+ dom.writeToFile(renamedFile, false);+ }+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex fcf8cd7ac8..44d442df00 100644--- a/core/src/main/java/io/onedev/server/notification/DefaultMailManager.java+++ b/core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -3,7 +3,6 @@ package io.onedev.server.notification;import java.net.InetAddress;import java.net.UnknownHostException;import java.util.Collection;-import java.util.concurrent.ExecutorService;import javax.inject.Inject;import javax.inject.Singleton;@@ -27,33 +26,18 @@ public class DefaultMailManager implements MailManager {private final SettingManager configManager;- private final ExecutorService executorService;-private final TransactionManager transactionManager;@Inject- public DefaultMailManager(TransactionManager transactionManager, SettingManager configManager,- ExecutorService executorService) {+ public DefaultMailManager(TransactionManager transactionManager, SettingManager configManager) {this.transactionManager = transactionManager;this.configManager = configManager;- this.executorService = executorService;}@Sessional@Overridepublic void sendMailAsync(Collection<String> toList, String subject, String body) {- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- executorService.execute(newSendMailRunnable(toList, subject, body));- }-- });- }-- private Runnable newSendMailRunnable(Collection<String> toList, String subject, String body) {- return new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {@@ -64,7 +48,7 @@ public class DefaultMailManager implements MailManager {}}- };+ });}@Overridediff --git a/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.javaindex 6d0cb7407d..b74de2e2c1 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java@@ -112,8 +112,6 @@ public class DefaultSessionManager implements SessionManager {DefaultSessionManager.this.run(runnable);} catch (Exception e) {logger.error("Error running", e);- } finally {- closeSession();}}