From 14d8e46c327291a48c63625be3c11a6a1fccd805 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 25 May 2012 18:04:31 +0200 Subject: [PATCH] SONAR-2706 refactor org.sonar.core.review.workflow.Comment --- .../core/review/workflow/review/Comment.java | 39 ++---------- .../workflow/review/DefaultComment.java | 59 +++++++++++++++++++ .../review/workflow/review/DefaultReview.java | 2 +- 3 files changed, 65 insertions(+), 35 deletions(-) create mode 100644 sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultComment.java diff --git a/sonar-core/src/main/java/org/sonar/core/review/workflow/review/Comment.java b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/Comment.java index 250e761593f..c648471d8dc 100644 --- a/sonar-core/src/main/java/org/sonar/core/review/workflow/review/Comment.java +++ b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/Comment.java @@ -19,41 +19,12 @@ */ package org.sonar.core.review.workflow.review; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +public interface Comment { + String getMarkdownText(); -public final class Comment implements Cloneable { - private String markdownText; - private Long userId; + Long getUserId(); - Comment() { - } + Comment setMarkdownText(String s); - public String getMarkdownText() { - return markdownText; - } - - public Comment setMarkdownText(String s) { - this.markdownText = s; - return this; - } - - public Long getUserId() { - return userId; - } - - public Comment setUserId(Long l) { - this.userId = l; - return this; - } - - @Override - public String toString() { - return new ReflectionToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).toString(); - } - - @Override - public Comment clone() { - return new Comment().setMarkdownText(markdownText).setUserId(userId); - } + Comment setUserId(Long l); } diff --git a/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultComment.java b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultComment.java new file mode 100644 index 00000000000..47026442e9a --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultComment.java @@ -0,0 +1,59 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Sonar; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 + */ +package org.sonar.core.review.workflow.review; + +import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +public final class DefaultComment implements Comment, Cloneable { + private String markdownText; + private Long userId; + + DefaultComment() { + } + + public String getMarkdownText() { + return markdownText; + } + + public DefaultComment setMarkdownText(String s) { + this.markdownText = s; + return this; + } + + public Long getUserId() { + return userId; + } + + public DefaultComment setUserId(Long l) { + this.userId = l; + return this; + } + + @Override + public String toString() { + return new ReflectionToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).toString(); + } + + @Override + public Comment clone() { + return new DefaultComment().setMarkdownText(markdownText).setUserId(userId); + } +} diff --git a/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultReview.java b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultReview.java index 2c6519e38bc..2eda5a5dc1c 100644 --- a/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultReview.java +++ b/sonar-core/src/main/java/org/sonar/core/review/workflow/review/DefaultReview.java @@ -181,7 +181,7 @@ public final class DefaultReview implements MutableReview { if (newComments == null) { newComments = Lists.newArrayList(); } - Comment comment = new Comment(); + Comment comment = new DefaultComment(); newComments.add(comment); return comment; } -- 2.39.5