Commit @42911dba952f600f24a981172d1b17f8eb289ae2

doortts 2016-01-31

mariadb-compatible: Apply fix and changes for MariaDB

MariaDB/MySQL compatible fixes and patches. Patch codes
are based on mainly works of Yi EungJun and yobi developers.
Thanks to their efforts, database migration and test was accomplished
easily.

Tested target DB and version

- MariaDB 10.1.10
- MySQM 5.6.28

@42911dba952f600f24a981172d1b17f8eb289ae2

45d6850

42911db

app/actors/PullRequestActor.java

--- app/actors/PullRequestActor.java

+++ app/actors/PullRequestActor.java


 import models.enumeration.EventType;
 import models.enumeration.State;
 
-import java.util.List;
-
 public abstract class PullRequestActor extends UntypedActor {
 
     protected void processPullRequestMerging(PullRequestEventMessage message, PullRequest pullRequest) {

                 }
             } else {
                 mergeResult.setMergedStateOfPullRequest(message.getSender());
-                NotificationEvent notiEvent = NotificationEvent.afterPullRequestUpdated(message.getSender(),
-                        pullRequest, pullRequest.state, State.MERGED);
-                PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
+                if (pullRequest.state != State.MERGED) {
+                    NotificationEvent notiEvent = NotificationEvent.afterPullRequestUpdated(message.getSender(),
+                            pullRequest, pullRequest.state, State.MERGED);
+                    PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
+                }
             }
 
             if (!wasConflict && mergeResult.conflicts()) {

45d6850

42911db

app/actors/PullRequestMergingActor.java

--- app/actors/PullRequestMergingActor.java

+++ app/actors/PullRequestMergingActor.java


         }
 
         PullRequestEventMessage message = (PullRequestEventMessage) object;
-        PullRequest pullRequest = message.getPullRequest();
+        PullRequest pullRequest = PullRequest.findById(message.getPullRequest().id);
 
         pullRequest.startMerge();
         pullRequest.update();

45d6850

42911db

app/controllers/LabelApp.java

--- app/controllers/LabelApp.java

+++ app/controllers/LabelApp.java


                     .createSqlQuery(sqlString)
                     .setParameter("category", "%" + query.toLowerCase() + "%");
             sqlCountQuery = Ebean
-                    .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ")")
+                    .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ") categories")
                     .setParameter("category", "%" + query.toLowerCase() + "%");
         } else {
             String sqlString =

             sqlQuery = Ebean
                     .createSqlQuery(sqlString);
             sqlCountQuery = Ebean
-                    .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ")");
+                    .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ") categories");
         }
 
         int cnt = sqlCountQuery.findUnique().getInteger("cnt");

45d6850

42911db

app/controllers/PullRequestApp.java

--- app/controllers/PullRequestApp.java

+++ app/controllers/PullRequestApp.java


 import controllers.annotation.IsAllowed;
 import controllers.annotation.IsCreatable;
 import controllers.annotation.IsOnlyGitAvailable;
-import errors.PullRequestException;
 import models.*;
 import models.enumeration.Operation;
 import models.enumeration.ResourceType;

 import play.libs.Json;
 import play.mvc.Controller;
 import play.mvc.Result;
-import play.mvc.Result;
 import playRepository.GitBranch;
 import playRepository.GitRepository;
 import playRepository.RepositoryService;

 import views.html.error.notfound;
 import views.html.git.*;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @IsOnlyGitAvailable
 @AnonymousCheck

 
     private static String findDestination(String forkOwner) {
         Organization organization = Organization.findByName(forkOwner);
-        if (OrganizationUser.isAdmin(organization, UserApp.currentUser())) {
+        if (UserApp.currentUser().isAdminOf(organization)) {
             return forkOwner;
         }
         return UserApp.currentUser().loginId;

         Project selectedProject = project;
         if(isToProject && project.isForkedFromOrigin() && project.originalProject.menuSetting.code
                 && project.originalProject.menuSetting.pullRequest) {
-                selectedProject = project.originalProject;
+            selectedProject = project.originalProject;
         }
 
         if(StringUtils.isNumeric(projectId)) {

                 mergeResult.conflicts()));
     }
 
-    @Transactional
+    static class PullRequestCreationResult {
+        PullRequestCreationResult(@Nonnull Result result, PullRequestEventMessage message) {
+            this.result = Objects.requireNonNull(result);
+            this.message = message;
+        }
+
+        // This should be called after creation of a pull request
+        void runMergingActor() {
+            if (message != null) {
+                Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
+            }
+        }
+
+        @Nonnull Result result;
+        @Nullable private PullRequestEventMessage message;
+    }
+
     @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
     @IsCreatable(ResourceType.FORK)
     public static Result newPullRequest(String userName, String projectName) throws IOException, GitAPIException {
+        PullRequestCreationResult result = createPullRequest(userName, projectName);
+        result.runMergingActor();
+        return result.result;
+    }
+
+    @Transactional
+    private static PullRequestCreationResult createPullRequest(String userName, String projectName) throws IOException, GitAPIException {
         Project project = Project.findByOwnerAndProjectName(userName, projectName);
 
         ValidationResult validation = validateBeforePullRequest(project);
         if(validation.hasError()) {
-            return validation.getResult();
+            return new PullRequestCreationResult(validation.getResult(), null);
         }
 
         Form<PullRequest> form = new Form<>(PullRequest.class).bindFromRequest();

         if(form.hasErrors()) {
             List<GitBranch> fromBranches = new GitRepository(project).getBranches();
             List<GitBranch> toBranches = new GitRepository(project.originalProject).getBranches();
-            return ok(create.render("title.newPullRequest", new Form<>(PullRequest.class), project, null, null, null, fromBranches, toBranches, null));
+            return new PullRequestCreationResult(
+                    ok(create.render("title.newPullRequest", new Form<>(PullRequest.class), project, null, null, null, fromBranches, toBranches, null)),
+                    null);
         }
 
         PullRequest pullRequest = form.get();
 
         if (pullRequest.body == null) {
-            return status(REQUEST_ENTITY_TOO_LARGE,
-                    ErrorViews.RequestTextEntityTooLarge.render());
+            return new PullRequestCreationResult(
+                    status(REQUEST_ENTITY_TOO_LARGE, ErrorViews.RequestTextEntityTooLarge.render()),
+                    null);
         }
 
         pullRequest.created = JodaDateUtil.now();

 
         PullRequest sentRequest = PullRequest.findDuplicatedPullRequest(pullRequest);
         if(sentRequest != null) {
-            return redirect(routes.PullRequestApp.pullRequest(pullRequest.toProject.owner, pullRequest.toProject.name, sentRequest.number));
+            return new PullRequestCreationResult(
+                    redirect(routes.PullRequestApp.pullRequest(pullRequest.toProject.owner, pullRequest.toProject.name, sentRequest.number)),
+                    null);
         }
 
         pullRequest.save();

         PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
 
         PullRequestEventMessage message = new PullRequestEventMessage(UserApp.currentUser(), request(), pullRequest, notiEvent.eventType);
-        Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
 
-        return redirect(pullRequestCall);
+        return new PullRequestCreationResult(redirect(pullRequestCall), message);
     }
 
     private static void validateForm(Form<PullRequest> form) {

 
     @IsAllowed(value = Operation.READ, resourceType = ResourceType.PULL_REQUEST)
     public static Result specificChange(String userName, String projectName,
-                                            long pullRequestNumber, String commitId) {
+                                        long pullRequestNumber, String commitId) {
         Project project = Project.findByOwnerAndProjectName(userName, projectName);
         PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
         return ok(views.html.git.viewChanges.render(project, pullRequest, commitId));

     @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
     @IsAllowed(value = Operation.ACCEPT, resourceType = ResourceType.PULL_REQUEST)
     public static Promise<Result> accept(final String userName, final String projectName,
-                                final long pullRequestNumber) {
+                                         final long pullRequestNumber) {
         Project project = Project.findByOwnerAndProjectName(userName, projectName);
         final PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
 

 
         State beforeState = pullRequest.state;
         pullRequest.close();
+        pullRequest.update();
 
         Call call = routes.PullRequestApp.pullRequest(userName, projectName, pullRequestNumber);
         addNotification(pullRequest, beforeState, State.CLOSED);

 
         State beforeState = pullRequest.state;
         pullRequest.reopen();
+        pullRequest.update();
 
         Call call = routes.PullRequestApp.pullRequest(userName, projectName, pullRequestNumber);
         addNotification(pullRequest, beforeState, State.OPEN);

45d6850

42911db

app/mailbox/CreationViaEmail.java

--- app/mailbox/CreationViaEmail.java

+++ app/mailbox/CreationViaEmail.java


         Issue issue = new Issue(project, sender, subject, parsedMessage.body);
         issue.save();
 
-        NotificationEvent event = NotificationEvent.forNewIssue(issue, sender);
-
         Map<String, Attachment> relatedAttachments = saveAttachments(
                 parsedMessage.attachments,
                 issue.asResource());
 
         if (new ContentType(parsedMessage.type).match(MimeType.HTML)) {
+            issue.refresh();
             issue.body = postprocessForHTML(issue.body, relatedAttachments);
             issue.update();
         }

         new OriginalEmail(messageId, issue.asResource()).save();
 
         // Add the event
+        NotificationEvent event = NotificationEvent.forNewIssue(issue, sender);
         addEvent(event, recipients, sender);
 
         return issue;

45d6850

42911db

app/models/Attachment.java

--- app/models/Attachment.java

+++ app/models/Attachment.java


 import play.libs.Akka;
 import scala.concurrent.duration.Duration;
 import utils.AttachmentCache;
-import utils.Config;
 import utils.FileUtil;
 import utils.JodaDateUtil;
 

 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.NotDirectoryException;
-import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;

         // the problem. If you do that, blocking of project deletion causes
         // that all requests to attachments (even a user avatars you can see in
         // most of pages) are blocked.
+        boolean isSafelyDeleted;
         if (!exists(this.hash)) {
             try {
-                Files.delete(Paths.get(uploadDirectory, this.hash));
+                isSafelyDeleted = Files.deleteIfExists(getFile().toPath());
+                if(!isSafelyDeleted){
+                    play.Logger.error("tried to delete already deleted: " + this);
+                }
             } catch (Exception e) {
                 play.Logger.error("Failed to delete: " + this, e);
             }

45d6850

42911db

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


     public Set<User> voters = new HashSet<>();
 
     @Transient
-    @Formula(select = "case when due_date is null then cast('0001-01-01 00:00:00' as timestamp) else due_date end")
+    @Formula(select = "case when due_date is null then cast('0001-01-01 00:00:00' as datetime) else due_date end")
     public Date dueDateDesc;
 
     @Transient
-    @Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as timestamp) else due_date end")
+    @Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as datetime) else due_date end")
     public Date dueDateAsc;
 
     public Issue(Project project, User author, String title, String body) {

         return finder.where()
                 .eq("project", project)
                 .eq("labels", label)
+                .eq("state", State.OPEN)
                 .findRowCount();
     }
 

         return finder.where()
                 .eq("project", project)
                 .eq("assignee", assignee)
+                .eq("state", State.OPEN)
                 .findRowCount();
     }
 

         return finder.where()
                 .eq("project", project)
                 .eq("milestone", milestone)
+                .eq("state", State.OPEN)
                 .findRowCount();
     }
 

45d6850

42911db

app/models/Project.java

--- app/models/Project.java

+++ app/models/Project.java


         Issue issue = Issue.finder.where().eq("project.id", id).order().desc("number").findList().get(0);
         issue.refresh();
 
-        return issue.number == null ? 0l : issue.number;
+        return issue.number == null ? 0L : issue.number;
     }
 
     private void setLastIssueNumber(Long number) {

         Posting posting = Posting.finder.where().eq("project.id", id).order().desc("number").findList().get(0);
         posting.refresh();
 
-        return posting.number == null ? 0l : posting.number;
+        return posting.number == null ? 0L : posting.number;
     }
 
     private void setLastPostingNumber(Long number) {

45d6850

42911db

app/models/PullRequest.java

--- app/models/PullRequest.java

+++ app/models/PullRequest.java


 import utils.Constants;
 import utils.JodaDateUtil;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.*;
 import javax.persistence.OrderBy;

         this.state = state;
         this.received = JodaDateUtil.now();
         this.receiver = updater;
-        this.update();
     }
 
     public void reopen() {

45d6850

42911db

app/models/User.java

--- app/models/User.java

+++ app/models/User.java

...	...	@@ -106,6 +106,9 @@
106	106	@Transient
107	107	private Map<Long, Boolean> projectMembersMemo = new HashMap<>();
108	108
	109	+ @Transient
	110	+ private Map<String, Boolean> orgMembersMemo = new HashMap<>();
	111	+
109	112	/**
110	113	* used for enabling remember me feature
111	114	*
...	...	@@ -184,6 +187,35 @@
184	187
185	188	public User(Long id) {
186	189	this.id = id;
	190	+ }
	191	+
	192	+ public boolean isMemberOf(Organization organization) {
	193	+ return isMemberOf(organization, RoleType.ORG_MEMBER);
	194	+ }
	195	+
	196	+ public boolean isAdminOf(Organization organization) {
	197	+ return isMemberOf(organization, RoleType.ORG_ADMIN);
	198	+ }
	199	+
	200	+ public boolean isMemberOf(Organization org, RoleType roleType) {
	201	+ if (org == null) {
	202	+ return false;
	203	+ }
	204	+
	205	+ String key = org.id + ":" + roleType.toString();
	206	+
	207	+ Boolean value = orgMembersMemo.get(key);
	208	+
	209	+ if (value == null) {
	210	+ int rowCount = OrganizationUser.find.where().eq("organization.id", org.id)
	211	+ .eq("user.id", id)
	212	+ .eq("role.id", Role.findByRoleType(roleType).id)
	213	+ .findRowCount();
	214	+ value = rowCount > 0;
	215	+ orgMembersMemo.put(key, value);
	216	+ }
	217	+
	218	+ return value;
187	219	}
188	220
189	221	public String getPreferredLanguage() {
...	...	@@ -572,6 +604,7 @@
572	604	}
573	605
574	606	public void changeState(UserState state) {
	607	+ refresh();
575	608	this.state = state;
576	609	lastStateModifiedDate = new Date();
577	610

45d6850

42911db

app/utils/Config.java

--- app/utils/Config.java

+++ app/utils/Config.java


                 Configuration config = Configuration.root();
 
                 if (config.getInt("application.port") != null
-                        && config.getInt("application.hostname") == null) {
+                        && config.getString("application.hostname") == null) {
                     return "application.port may be ignored because " +
                             "application.hostname is not configured.";
                 } else {

Add a comment

Open 0
Closed 0

List

...	...	@@ -35,7 +35,7 @@
35	35	}
36	36
37	37	PullRequestEventMessage message = (PullRequestEventMessage) object;
38		- PullRequest pullRequest = message.getPullRequest();
	38	+ PullRequest pullRequest = PullRequest.findById(message.getPullRequest().id);
39	39
40	40	pullRequest.startMerge();
41	41	pullRequest.update();

...	...	@@ -28,7 +28,6 @@
28	28	import controllers.annotation.IsAllowed;
29	29	import controllers.annotation.IsCreatable;
30	30	import controllers.annotation.IsOnlyGitAvailable;
31		-import errors.PullRequestException;
32	31	import models.*;
33	32	import models.enumeration.Operation;
34	33	import models.enumeration.ResourceType;
...	...	@@ -47,7 +46,6 @@
47	46	import play.libs.Json;
48	47	import play.mvc.Controller;
49	48	import play.mvc.Result;
50		-import play.mvc.Result;
51	49	import playRepository.GitBranch;
52	50	import playRepository.GitRepository;
53	51	import playRepository.RepositoryService;
...	...	@@ -55,6 +53,8 @@
55	53	import views.html.error.notfound;
56	54	import views.html.git.*;
57	55
	56	+import javax.annotation.Nonnull;
	57	+import javax.annotation.Nullable;
58	58	import javax.servlet.ServletException;
59	59	import java.io.IOException;
60	60	import java.io.UnsupportedEncodingException;
...	...	@@ -63,6 +63,7 @@
63	63	import java.util.ArrayList;
64	64	import java.util.List;
65	65	import java.util.Map;
	66	+import java.util.Objects;
66	67
67	68	@IsOnlyGitAvailable
68	69	@AnonymousCheck
...	...	@@ -81,7 +82,7 @@
81	82
82	83	private static String findDestination(String forkOwner) {
83	84	Organization organization = Organization.findByName(forkOwner);
84		- if (OrganizationUser.isAdmin(organization, UserApp.currentUser())) {
	85	+ if (UserApp.currentUser().isAdminOf(organization)) {
85	86	return forkOwner;
86	87	}
87	88	return UserApp.currentUser().loginId;
...	...	@@ -195,7 +196,7 @@
195	196	Project selectedProject = project;
196	197	if(isToProject && project.isForkedFromOrigin() && project.originalProject.menuSetting.code
197	198	&& project.originalProject.menuSetting.pullRequest) {
198		- selectedProject = project.originalProject;
	199	+ selectedProject = project.originalProject;
199	200	}
200	201
201	202	if(StringUtils.isNumeric(projectId)) {
...	...	@@ -232,15 +233,38 @@
232	233	mergeResult.conflicts()));
233	234	}
234	235
235		- @Transactional
	236	+ static class PullRequestCreationResult {
	237	+ PullRequestCreationResult(@Nonnull Result result, PullRequestEventMessage message) {
	238	+ this.result = Objects.requireNonNull(result);
	239	+ this.message = message;
	240	+ }
	241	+
	242	+ // This should be called after creation of a pull request
	243	+ void runMergingActor() {
	244	+ if (message != null) {
	245	+ Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
	246	+ }
	247	+ }
	248	+
	249	+ @Nonnull Result result;
	250	+ @Nullable private PullRequestEventMessage message;
	251	+ }
	252	+
236	253	@AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
237	254	@IsCreatable(ResourceType.FORK)
238	255	public static Result newPullRequest(String userName, String projectName) throws IOException, GitAPIException {
	256	+ PullRequestCreationResult result = createPullRequest(userName, projectName);
	257	+ result.runMergingActor();
	258	+ return result.result;
	259	+ }
	260	+
	261	+ @Transactional
	262	+ private static PullRequestCreationResult createPullRequest(String userName, String projectName) throws IOException, GitAPIException {
239	263	Project project = Project.findByOwnerAndProjectName(userName, projectName);
240	264
241	265	ValidationResult validation = validateBeforePullRequest(project);
242	266	if(validation.hasError()) {
243		- return validation.getResult();
	267	+ return new PullRequestCreationResult(validation.getResult(), null);
244	268	}
245	269
246	270	Form<PullRequest> form = new Form<>(PullRequest.class).bindFromRequest();
...	...	@@ -248,14 +272,17 @@
248	272	if(form.hasErrors()) {
249	273	List<GitBranch> fromBranches = new GitRepository(project).getBranches();
250	274	List<GitBranch> toBranches = new GitRepository(project.originalProject).getBranches();
251		- return ok(create.render("title.newPullRequest", new Form<>(PullRequest.class), project, null, null, null, fromBranches, toBranches, null));
	275	+ return new PullRequestCreationResult(
	276	+ ok(create.render("title.newPullRequest", new Form<>(PullRequest.class), project, null, null, null, fromBranches, toBranches, null)),
	277	+ null);
252	278	}
253	279
254	280	PullRequest pullRequest = form.get();
255	281
256	282	if (pullRequest.body == null) {
257		- return status(REQUEST_ENTITY_TOO_LARGE,
258		- ErrorViews.RequestTextEntityTooLarge.render());
	283	+ return new PullRequestCreationResult(
	284	+ status(REQUEST_ENTITY_TOO_LARGE, ErrorViews.RequestTextEntityTooLarge.render()),
	285	+ null);
259	286	}
260	287
261	288	pullRequest.created = JodaDateUtil.now();
...	...	@@ -267,7 +294,9 @@
267	294
268	295	PullRequest sentRequest = PullRequest.findDuplicatedPullRequest(pullRequest);
269	296	if(sentRequest != null) {
270		- return redirect(routes.PullRequestApp.pullRequest(pullRequest.toProject.owner, pullRequest.toProject.name, sentRequest.number));
	297	+ return new PullRequestCreationResult(
	298	+ redirect(routes.PullRequestApp.pullRequest(pullRequest.toProject.owner, pullRequest.toProject.name, sentRequest.number)),
	299	+ null);
271	300	}
272	301
273	302	pullRequest.save();
...	...	@@ -282,9 +311,8 @@
282	311	PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
283	312
284	313	PullRequestEventMessage message = new PullRequestEventMessage(UserApp.currentUser(), request(), pullRequest, notiEvent.eventType);
285		- Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
286	314
287		- return redirect(pullRequestCall);
	315	+ return new PullRequestCreationResult(redirect(pullRequestCall), message);
288	316	}
289	317
290	318	private static void validateForm(Form<PullRequest> form) {
...	...	@@ -376,7 +404,7 @@
376	404
377	405	@IsAllowed(value = Operation.READ, resourceType = ResourceType.PULL_REQUEST)
378	406	public static Result specificChange(String userName, String projectName,
379		- long pullRequestNumber, String commitId) {
	407	+ long pullRequestNumber, String commitId) {
380	408	Project project = Project.findByOwnerAndProjectName(userName, projectName);
381	409	PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
382	410	return ok(views.html.git.viewChanges.render(project, pullRequest, commitId));
...	...	@@ -386,7 +414,7 @@
386	414	@AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)
387	415	@IsAllowed(value = Operation.ACCEPT, resourceType = ResourceType.PULL_REQUEST)
388	416	public static Promise<Result> accept(final String userName, final String projectName,
389		- final long pullRequestNumber) {
	417	+ final long pullRequestNumber) {
390	418	Project project = Project.findByOwnerAndProjectName(userName, projectName);
391	419	final PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
392	420
...	...	@@ -437,6 +465,7 @@
437	465
438	466	State beforeState = pullRequest.state;
439	467	pullRequest.close();
	468	+ pullRequest.update();
440	469
441	470	Call call = routes.PullRequestApp.pullRequest(userName, projectName, pullRequestNumber);
442	471	addNotification(pullRequest, beforeState, State.CLOSED);
...	...	@@ -457,6 +486,7 @@
457	486
458	487	State beforeState = pullRequest.state;
459	488	pullRequest.reopen();
	489	+ pullRequest.update();
460	490
461	491	Call call = routes.PullRequestApp.pullRequest(userName, projectName, pullRequestNumber);
462	492	addNotification(pullRequest, beforeState, State.OPEN);

...	...	@@ -33,7 +33,6 @@
33	33	import play.libs.Akka;
34	34	import scala.concurrent.duration.Duration;
35	35	import utils.AttachmentCache;
36		-import utils.Config;
37	36	import utils.FileUtil;
38	37	import utils.JodaDateUtil;
39	38
...	...	@@ -42,7 +41,6 @@
42	41	import java.io.*;
43	42	import java.nio.file.Files;
44	43	import java.nio.file.NotDirectoryException;
45		-import java.nio.file.Paths;
46	44	import java.security.MessageDigest;
47	45	import java.security.NoSuchAlgorithmException;
48	46	import java.util.Arrays;
...	...	@@ -325,9 +323,13 @@
325	323	// the problem. If you do that, blocking of project deletion causes
326	324	// that all requests to attachments (even a user avatars you can see in
327	325	// most of pages) are blocked.
	326	+ boolean isSafelyDeleted;
328	327	if (!exists(this.hash)) {
329	328	try {
330		- Files.delete(Paths.get(uploadDirectory, this.hash));
	329	+ isSafelyDeleted = Files.deleteIfExists(getFile().toPath());
	330	+ if(!isSafelyDeleted){
	331	+ play.Logger.error("tried to delete already deleted: " + this);
	332	+ }
331	333	} catch (Exception e) {
332	334	play.Logger.error("Failed to delete: " + this, e);
333	335	}

...	...	@@ -96,11 +96,11 @@
96	96	public Set<User> voters = new HashSet<>();
97	97
98	98	@Transient
99		- @Formula(select = "case when due_date is null then cast('0001-01-01 00:00:00' as timestamp) else due_date end")
	99	+ @Formula(select = "case when due_date is null then cast('0001-01-01 00:00:00' as datetime) else due_date end")
100	100	public Date dueDateDesc;
101	101
102	102	@Transient
103		- @Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as timestamp) else due_date end")
	103	+ @Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as datetime) else due_date end")
104	104	public Date dueDateAsc;
105	105
106	106	public Issue(Project project, User author, String title, String body) {
...	...	@@ -535,6 +535,7 @@
535	535	return finder.where()
536	536	.eq("project", project)
537	537	.eq("labels", label)
	538	+ .eq("state", State.OPEN)
538	539	.findRowCount();
539	540	}
540	541
...	...	@@ -542,6 +543,7 @@
542	543	return finder.where()
543	544	.eq("project", project)
544	545	.eq("assignee", assignee)
	546	+ .eq("state", State.OPEN)
545	547	.findRowCount();
546	548	}
547	549
...	...	@@ -549,6 +551,7 @@
549	551	return finder.where()
550	552	.eq("project", project)
551	553	.eq("milestone", milestone)
	554	+ .eq("state", State.OPEN)
552	555	.findRowCount();
553	556	}
554	557

...	...	@@ -335,7 +335,7 @@
335	335	Issue issue = Issue.finder.where().eq("project.id", id).order().desc("number").findList().get(0);
336	336	issue.refresh();
337	337
338		- return issue.number == null ? 0l : issue.number;
	338	+ return issue.number == null ? 0L : issue.number;
339	339	}
340	340
341	341	private void setLastIssueNumber(Long number) {
...	...	@@ -354,7 +354,7 @@
354	354	Posting posting = Posting.finder.where().eq("project.id", id).order().desc("number").findList().get(0);
355	355	posting.refresh();
356	356
357		- return posting.number == null ? 0l : posting.number;
	357	+ return posting.number == null ? 0L : posting.number;
358	358	}
359	359
360	360	private void setLastPostingNumber(Long number) {

...	...	@@ -25,8 +25,6 @@
25	25	import models.enumeration.EventType;
26	26	import models.enumeration.State;
27	27
28		-import java.util.List;
29		-
30	28	public abstract class PullRequestActor extends UntypedActor {
31	29
32	30	protected void processPullRequestMerging(PullRequestEventMessage message, PullRequest pullRequest) {
...	...	@@ -49,9 +47,11 @@
49	47	}
50	48	} else {
51	49	mergeResult.setMergedStateOfPullRequest(message.getSender());
52		- NotificationEvent notiEvent = NotificationEvent.afterPullRequestUpdated(message.getSender(),
53		- pullRequest, pullRequest.state, State.MERGED);
54		- PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
	50	+ if (pullRequest.state != State.MERGED) {
	51	+ NotificationEvent notiEvent = NotificationEvent.afterPullRequestUpdated(message.getSender(),
	52	+ pullRequest, pullRequest.state, State.MERGED);
	53	+ PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
	54	+ }
55	55	}
56	56
57	57	if (!wasConflict && mergeResult.conflicts()) {

...	...	@@ -87,7 +87,7 @@
87	87	.createSqlQuery(sqlString)
88	88	.setParameter("category", "%" + query.toLowerCase() + "%");
89	89	sqlCountQuery = Ebean
90		- .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ")")
	90	+ .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ") categories")
91	91	.setParameter("category", "%" + query.toLowerCase() + "%");
92	92	} else {
93	93	String sqlString =
...	...	@@ -95,7 +95,7 @@
95	95	sqlQuery = Ebean
96	96	.createSqlQuery(sqlString);
97	97	sqlCountQuery = Ebean
98		- .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ")");
	98	+ .createSqlQuery("SELECT COUNT(*) AS cnt FROM (" + sqlString + ") categories");
99	99	}
100	100
101	101	int cnt = sqlCountQuery.findUnique().getInteger("cnt");

...	...	@@ -183,13 +183,12 @@
183	183	Issue issue = new Issue(project, sender, subject, parsedMessage.body);
184	184	issue.save();
185	185
186		- NotificationEvent event = NotificationEvent.forNewIssue(issue, sender);
187		-
188	186	Map<String, Attachment> relatedAttachments = saveAttachments(
189	187	parsedMessage.attachments,
190	188	issue.asResource());
191	189
192	190	if (new ContentType(parsedMessage.type).match(MimeType.HTML)) {
	191	+ issue.refresh();
193	192	issue.body = postprocessForHTML(issue.body, relatedAttachments);
194	193	issue.update();
195	194	}
...	...	@@ -197,6 +196,7 @@
197	196	new OriginalEmail(messageId, issue.asResource()).save();
198	197
199	198	// Add the event
	199	+ NotificationEvent event = NotificationEvent.forNewIssue(issue, sender);
200	200	addEvent(event, recipients, sender);
201	201
202	202	return issue;

...	...	@@ -59,7 +59,6 @@
59	59	import utils.Constants;
60	60	import utils.JodaDateUtil;
61	61
62		-import javax.annotation.Nonnull;
63	62	import javax.annotation.Nullable;
64	63	import javax.persistence.*;
65	64	import javax.persistence.OrderBy;
...	...	@@ -677,7 +676,6 @@
677	676	this.state = state;
678	677	this.received = JodaDateUtil.now();
679	678	this.receiver = updater;
680		- this.update();
681	679	}
682	680
683	681	public void reopen() {

...	...	@@ -46,7 +46,7 @@
46	46	Configuration config = Configuration.root();
47	47
48	48	if (config.getInt("application.port") != null
49		- && config.getInt("application.hostname") == null) {
	49	+ && config.getString("application.hostname") == null) {
50	50	return "application.port may be ignored because " +
51	51	"application.hostname is not configured.";
52	52	} else {

Delete comment