{"action":"created","comment":{"url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/comments/93932133","pull_request_review_id":14463384,"id":93932133,"diff_hunk":"@@ -222,20 +206,49 @@ public PictureConversion clone() {\n         clone.order = order;\n         clone.chainId = chainId;\n         clone.enabled = enabled;\n-        clone.isDefault = isDefault;\n         if (filterIds != null) {\n-            clone.filterIds = new ArrayList<>();\n-            clone.filterIds.addAll(filterIds);\n+            clone.filterIds = new ArrayList<>(filterIds);\n         }\n         clone.rendition = rendition;\n         clone.renditionVisible = renditionVisible;\n         return clone;\n     }\n \n+    public void merge(PictureConversion other) {\n+        if (other.enabled != null) {\n+            enabled = other.enabled;\n+        }\n+        if (!StringUtils.isBlank(other.chainId)) {\n+            chainId = other.chainId;\n+        }\n+        if (!StringUtils.isBlank(other.tag)) {\n+            tag = other.tag;\n+        }\n+        if (!StringUtils.isBlank(other.description)) {\n+            description = other.description;\n+        }\n+        if (other.order != null) {\n+            order = other.order;\n+        }\n+        if (other.maxSize != null) {\n+            maxSize = other.maxSize;\n+        }\n+        List<String> newFilterIds = new ArrayList<>();\n+        newFilterIds.addAll(filterIds);\n+        newFilterIds.addAll(other.filterIds);\n+        filterIds = newFilterIds;\n+        if (other.rendition != null) {\n+            rendition = other.rendition;\n+        }\n+        if (other.renditionVisible != null) {\n+            renditionVisible = other.renditionVisible;\n+        }\n+    }\n+\n     @Override\n     public String toString() {\n         return String.format(\n                 \"PictureConversion [id=%s, description=%s, tag=%s, maxSize=%d, order=%d, chainId=%s, enabled=%s, default=%s]\",","path":"nuxeo-features/nuxeo-platform-imaging/nuxeo-platform-imaging-api/src/main/java/org/nuxeo/ecm/platform/picture/api/PictureConversion.java","position":154,"original_position":154,"commit_id":"1f9449a8d517f54b750c9f35375bf0011d66e340","original_commit_id":"1f9449a8d517f54b750c9f35375bf0011d66e340","user":{"login":"efge","id":592810,"avatar_url":"https://avatars.githubusercontent.com/u/592810?v=3","gravatar_id":"","url":"https://api.github.com/users/efge","html_url":"https://github.com/efge","followers_url":"https://api.github.com/users/efge/followers","following_url":"https://api.github.com/users/efge/following{/other_user}","gists_url":"https://api.github.com/users/efge/gists{/gist_id}","starred_url":"https://api.github.com/users/efge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/efge/subscriptions","organizations_url":"https://api.github.com/users/efge/orgs","repos_url":"https://api.github.com/users/efge/repos","events_url":"https://api.github.com/users/efge/events{/privacy}","received_events_url":"https://api.github.com/users/efge/received_events","type":"User","site_admin":false},"body":"You must also remove the `default=%s`","created_at":"2016-12-27T13:42:43Z","updated_at":"2016-12-27T13:44:10Z","html_url":"https://github.com/nuxeo/nuxeo/pull/412#discussion_r93932133","pull_request_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412","_links":{"self":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/comments/93932133"},"html":{"href":"https://github.com/nuxeo/nuxeo/pull/412#discussion_r93932133"},"pull_request":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412"}}},"pull_request":{"url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412","id":98158783,"html_url":"https://github.com/nuxeo/nuxeo/pull/412","diff_url":"https://github.com/nuxeo/nuxeo/pull/412.diff","patch_url":"https://github.com/nuxeo/nuxeo/pull/412.patch","issue_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/412","number":412,"state":"open","locked":false,"title":"NXP-21311: fix PictureConversion merge","user":{"login":"efge","id":592810,"avatar_url":"https://avatars.githubusercontent.com/u/592810?v=3","gravatar_id":"","url":"https://api.github.com/users/efge","html_url":"https://github.com/efge","followers_url":"https://api.github.com/users/efge/followers","following_url":"https://api.github.com/users/efge/following{/other_user}","gists_url":"https://api.github.com/users/efge/gists{/gist_id}","starred_url":"https://api.github.com/users/efge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/efge/subscriptions","organizations_url":"https://api.github.com/users/efge/orgs","repos_url":"https://api.github.com/users/efge/repos","events_url":"https://api.github.com/users/efge/events{/privacy}","received_events_url":"https://api.github.com/users/efge/received_events","type":"User","site_admin":false},"body":"https://jira.nuxeo.com/browse/NXP-21311","created_at":"2016-12-15T14:19:22Z","updated_at":"2016-12-27T13:44:10Z","closed_at":null,"merged_at":null,"merge_commit_sha":"6fc173bc27e46320040a759743828e1a9172aa6d","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412/commits","review_comments_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412/comments","review_comment_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls/comments{/number}","comments_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/412/comments","statuses_url":"https://api.github.com/repos/nuxeo/nuxeo/statuses/1f9449a8d517f54b750c9f35375bf0011d66e340","head":{"label":"nuxeo:fix-NXP-21311-pictureconversion-merge","ref":"fix-NXP-21311-pictureconversion-merge","sha":"1f9449a8d517f54b750c9f35375bf0011d66e340","user":{"login":"nuxeo","id":460607,"avatar_url":"https://avatars.githubusercontent.com/u/460607?v=3","gravatar_id":"","url":"https://api.github.com/users/nuxeo","html_url":"https://github.com/nuxeo","followers_url":"https://api.github.com/users/nuxeo/followers","following_url":"https://api.github.com/users/nuxeo/following{/other_user}","gists_url":"https://api.github.com/users/nuxeo/gists{/gist_id}","starred_url":"https://api.github.com/users/nuxeo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nuxeo/subscriptions","organizations_url":"https://api.github.com/users/nuxeo/orgs","repos_url":"https://api.github.com/users/nuxeo/repos","events_url":"https://api.github.com/users/nuxeo/events{/privacy}","received_events_url":"https://api.github.com/users/nuxeo/received_events","type":"Organization","site_admin":false},"repo":{"id":2988101,"name":"nuxeo","full_name":"nuxeo/nuxeo","owner":{"login":"nuxeo","id":460607,"avatar_url":"https://avatars.githubusercontent.com/u/460607?v=3","gravatar_id":"","url":"https://api.github.com/users/nuxeo","html_url":"https://github.com/nuxeo","followers_url":"https://api.github.com/users/nuxeo/followers","following_url":"https://api.github.com/users/nuxeo/following{/other_user}","gists_url":"https://api.github.com/users/nuxeo/gists{/gist_id}","starred_url":"https://api.github.com/users/nuxeo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nuxeo/subscriptions","organizations_url":"https://api.github.com/users/nuxeo/orgs","repos_url":"https://api.github.com/users/nuxeo/repos","events_url":"https://api.github.com/users/nuxeo/events{/privacy}","received_events_url":"https://api.github.com/users/nuxeo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/nuxeo/nuxeo","description":"Content management platform to build modern business applications","fork":false,"url":"https://api.github.com/repos/nuxeo/nuxeo","forks_url":"https://api.github.com/repos/nuxeo/nuxeo/forks","keys_url":"https://api.github.com/repos/nuxeo/nuxeo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nuxeo/nuxeo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nuxeo/nuxeo/teams","hooks_url":"https://api.github.com/repos/nuxeo/nuxeo/hooks","issue_events_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/events{/number}","events_url":"https://api.github.com/repos/nuxeo/nuxeo/events","assignees_url":"https://api.github.com/repos/nuxeo/nuxeo/assignees{/user}","branches_url":"https://api.github.com/repos/nuxeo/nuxeo/branches{/branch}","tags_url":"https://api.github.com/repos/nuxeo/nuxeo/tags","blobs_url":"https://api.github.com/repos/nuxeo/nuxeo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nuxeo/nuxeo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nuxeo/nuxeo/git/refs{/sha}","trees_url":"https://api.github.com/repos/nuxeo/nuxeo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nuxeo/nuxeo/statuses/{sha}","languages_url":"https://api.github.com/repos/nuxeo/nuxeo/languages","stargazers_url":"https://api.github.com/repos/nuxeo/nuxeo/stargazers","contributors_url":"https://api.github.com/repos/nuxeo/nuxeo/contributors","subscribers_url":"https://api.github.com/repos/nuxeo/nuxeo/subscribers","subscription_url":"https://api.github.com/repos/nuxeo/nuxeo/subscription","commits_url":"https://api.github.com/repos/nuxeo/nuxeo/commits{/sha}","git_commits_url":"https://api.github.com/repos/nuxeo/nuxeo/git/commits{/sha}","comments_url":"https://api.github.com/repos/nuxeo/nuxeo/comments{/number}","issue_comment_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/comments{/number}","contents_url":"https://api.github.com/repos/nuxeo/nuxeo/contents/{+path}","compare_url":"https://api.github.com/repos/nuxeo/nuxeo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nuxeo/nuxeo/merges","archive_url":"https://api.github.com/repos/nuxeo/nuxeo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nuxeo/nuxeo/downloads","issues_url":"https://api.github.com/repos/nuxeo/nuxeo/issues{/number}","pulls_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls{/number}","milestones_url":"https://api.github.com/repos/nuxeo/nuxeo/milestones{/number}","notifications_url":"https://api.github.com/repos/nuxeo/nuxeo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nuxeo/nuxeo/labels{/name}","releases_url":"https://api.github.com/repos/nuxeo/nuxeo/releases{/id}","deployments_url":"https://api.github.com/repos/nuxeo/nuxeo/deployments","created_at":"2011-12-15T14:35:41Z","updated_at":"2016-12-13T10:36:09Z","pushed_at":"2016-12-27T11:48:02Z","git_url":"git://github.com/nuxeo/nuxeo.git","ssh_url":"git@github.com:nuxeo/nuxeo.git","clone_url":"https://github.com/nuxeo/nuxeo.git","svn_url":"https://github.com/nuxeo/nuxeo","homepage":"http://www.nuxeo.com","size":201916,"stargazers_count":134,"watchers_count":134,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":96,"mirror_url":null,"open_issues_count":21,"forks":96,"open_issues":21,"watchers":134,"default_branch":"master"}},"base":{"label":"nuxeo:master","ref":"master","sha":"b844090c46fe19a622745f2fcb09c1eeb029ec8a","user":{"login":"nuxeo","id":460607,"avatar_url":"https://avatars.githubusercontent.com/u/460607?v=3","gravatar_id":"","url":"https://api.github.com/users/nuxeo","html_url":"https://github.com/nuxeo","followers_url":"https://api.github.com/users/nuxeo/followers","following_url":"https://api.github.com/users/nuxeo/following{/other_user}","gists_url":"https://api.github.com/users/nuxeo/gists{/gist_id}","starred_url":"https://api.github.com/users/nuxeo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nuxeo/subscriptions","organizations_url":"https://api.github.com/users/nuxeo/orgs","repos_url":"https://api.github.com/users/nuxeo/repos","events_url":"https://api.github.com/users/nuxeo/events{/privacy}","received_events_url":"https://api.github.com/users/nuxeo/received_events","type":"Organization","site_admin":false},"repo":{"id":2988101,"name":"nuxeo","full_name":"nuxeo/nuxeo","owner":{"login":"nuxeo","id":460607,"avatar_url":"https://avatars.githubusercontent.com/u/460607?v=3","gravatar_id":"","url":"https://api.github.com/users/nuxeo","html_url":"https://github.com/nuxeo","followers_url":"https://api.github.com/users/nuxeo/followers","following_url":"https://api.github.com/users/nuxeo/following{/other_user}","gists_url":"https://api.github.com/users/nuxeo/gists{/gist_id}","starred_url":"https://api.github.com/users/nuxeo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nuxeo/subscriptions","organizations_url":"https://api.github.com/users/nuxeo/orgs","repos_url":"https://api.github.com/users/nuxeo/repos","events_url":"https://api.github.com/users/nuxeo/events{/privacy}","received_events_url":"https://api.github.com/users/nuxeo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/nuxeo/nuxeo","description":"Content management platform to build modern business applications","fork":false,"url":"https://api.github.com/repos/nuxeo/nuxeo","forks_url":"https://api.github.com/repos/nuxeo/nuxeo/forks","keys_url":"https://api.github.com/repos/nuxeo/nuxeo/keys{/key_id}","collaborators_url":"https://api.github.com/repos/nuxeo/nuxeo/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/nuxeo/nuxeo/teams","hooks_url":"https://api.github.com/repos/nuxeo/nuxeo/hooks","issue_events_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/events{/number}","events_url":"https://api.github.com/repos/nuxeo/nuxeo/events","assignees_url":"https://api.github.com/repos/nuxeo/nuxeo/assignees{/user}","branches_url":"https://api.github.com/repos/nuxeo/nuxeo/branches{/branch}","tags_url":"https://api.github.com/repos/nuxeo/nuxeo/tags","blobs_url":"https://api.github.com/repos/nuxeo/nuxeo/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/nuxeo/nuxeo/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/nuxeo/nuxeo/git/refs{/sha}","trees_url":"https://api.github.com/repos/nuxeo/nuxeo/git/trees{/sha}","statuses_url":"https://api.github.com/repos/nuxeo/nuxeo/statuses/{sha}","languages_url":"https://api.github.com/repos/nuxeo/nuxeo/languages","stargazers_url":"https://api.github.com/repos/nuxeo/nuxeo/stargazers","contributors_url":"https://api.github.com/repos/nuxeo/nuxeo/contributors","subscribers_url":"https://api.github.com/repos/nuxeo/nuxeo/subscribers","subscription_url":"https://api.github.com/repos/nuxeo/nuxeo/subscription","commits_url":"https://api.github.com/repos/nuxeo/nuxeo/commits{/sha}","git_commits_url":"https://api.github.com/repos/nuxeo/nuxeo/git/commits{/sha}","comments_url":"https://api.github.com/repos/nuxeo/nuxeo/comments{/number}","issue_comment_url":"https://api.github.com/repos/nuxeo/nuxeo/issues/comments{/number}","contents_url":"https://api.github.com/repos/nuxeo/nuxeo/contents/{+path}","compare_url":"https://api.github.com/repos/nuxeo/nuxeo/compare/{base}...{head}","merges_url":"https://api.github.com/repos/nuxeo/nuxeo/merges","archive_url":"https://api.github.com/repos/nuxeo/nuxeo/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/nuxeo/nuxeo/downloads","issues_url":"https://api.github.com/repos/nuxeo/nuxeo/issues{/number}","pulls_url":"https://api.github.com/repos/nuxeo/nuxeo/pulls{/number}","milestones_url":"https://api.github.com/repos/nuxeo/nuxeo/milestones{/number}","notifications_url":"https://api.github.com/repos/nuxeo/nuxeo/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/nuxeo/nuxeo/labels{/name}","releases_url":"https://api.github.com/repos/nuxeo/nuxeo/releases{/id}","deployments_url":"https://api.github.com/repos/nuxeo/nuxeo/deployments","created_at":"2011-12-15T14:35:41Z","updated_at":"2016-12-13T10:36:09Z","pushed_at":"2016-12-27T11:48:02Z","git_url":"git://github.com/nuxeo/nuxeo.git","ssh_url":"git@github.com:nuxeo/nuxeo.git","clone_url":"https://github.com/nuxeo/nuxeo.git","svn_url":"https://github.com/nuxeo/nuxeo","homepage":"http://www.nuxeo.com","size":201916,"stargazers_count":134,"watchers_count":134,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":96,"mirror_url":null,"open_issues_count":21,"forks":96,"open_issues":21,"watchers":134,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412"},"html":{"href":"https://github.com/nuxeo/nuxeo/pull/412"},"issue":{"href":"https://api.github.com/repos/nuxeo/nuxeo/issues/412"},"comments":{"href":"https://api.github.com/repos/nuxeo/nuxeo/issues/412/comments"},"review_comments":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412/comments"},"review_comment":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/nuxeo/nuxeo/pulls/412/commits"},"statuses":{"href":"https://api.github.com/repos/nuxeo/nuxeo/statuses/1f9449a8d517f54b750c9f35375bf0011d66e340"}}}}
{"actor":{"display_login":"efge"}}