Issue 11609 fixes #13216

jdotcms · 2017-12-14T17:12:42Z

No description provided.

…ate table and other minor changes.

…the scheme

…ctions, etc

…, unlocked and both choices

…hemes

dev-dotcms · 2017-12-14T17:19:26Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowAction.java

+	 * @return Set of {@link WorkflowStatus}
+	 */
+	public Set<WorkflowStatus> getShowOn() {
+		return showOn;


Return a copy of "showOn".

dev-dotcms · 2017-12-14T17:19:26Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowAction.java

 	private boolean assignable;
 	private boolean commentable;
 	private int order;
+	private Set<WorkflowStatus> showOn = Collections.emptySet();


Convert this Set to an EnumSet.

dev-dotcms · 2017-12-14T17:19:27Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java

+		try {
+
+			existsScheme = null != this.findScheme(schemeId);
+		} catch (Exception e) {


Either log or rethrow this exception.
Catch a list of specific exception subtypes instead.

dev-dotcms · 2017-12-14T17:19:29Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java

+				new ImmutableList.Builder<>();
+
+		final List<Map<String, Object>> stepIdList =
+				new DotConnect().setSQL(sql.SELECT_STEPS_ID_BY_ACTION)


Change this instance-reference to a static reference.

dev-dotcms · 2017-12-14T17:19:29Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java

+
+		if (null != stepIdList) {
+
+			stepIdList.forEach( mapRow ->  stepsBuilder.add


Specify a type for: 'mapRow'

dev-dotcms · 2017-12-14T17:19:30Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowStatus.java

+     */
+    public static  Set<WorkflowStatus> toSet(Object value) {
+
+        Set<WorkflowStatus> workflowStatusSet = Collections.emptySet();


Convert this Set to an EnumSet.

dev-dotcms · 2017-12-14T17:19:31Z

dotCMS/src/main/java/com/dotcms/workflow/form/WorkflowActionForm.java

+
+
+       public Builder showOn(Set<WorkflowStatus> showOn) {
+           this.showOn = showOn;


Store a copy of "showOn".

jgambarios · 2017-12-14T18:06:45Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java

@@ -310,17 +311,19 @@ public void saveStep(WorkflowStep step) throws DotDataException, AlreadyExistExc
 	@WrapInTransaction
 	public void deleteStep(final WorkflowStep step) throws DotDataException {

+		Savepoint savepoint = null;


I think this variable is not used and can be delete it

dev-dotcms · 2017-12-14T20:38:40Z

dotCMS/src/main/java/com/dotmarketing/common/db/DotDatabaseMetaData.java

+        PreparedStatement preparedStatement = null;
+        try {
+
+            preparedStatement = conn.prepareStatement(ALTER_TABLE + tableName + DROP_FOREIGN_KEY + constraintName);


Use a variable binding mechanism to construct this query instead of concatenation.

dev-dotcms · 2017-12-14T20:38:40Z

dotCMS/src/main/java/com/dotmarketing/common/db/DotDatabaseMetaData.java

+        }
+
+        try {
+            preparedStatement = conn.prepareStatement(sql);


Use a variable binding mechanism to construct this query instead of concatenation.

dev-dotcms · 2017-12-14T20:38:41Z

dotCMS/src/main/java/com/dotcms/workflow/helper/WorkflowHelper.java

@@ -4,6 +4,7 @@
 import com.dotcms.contenttype.business.ContentTypeAPI;
 import com.dotcms.repackage.com.google.common.annotations.VisibleForTesting;
 import com.dotcms.repackage.org.apache.commons.beanutils.BeanUtils;
+import com.dotcms.util.CollectionsUtils;


Remove this unused import 'com.dotcms.util.CollectionsUtils'.

dev-dotcms · 2017-12-14T20:38:41Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java

@@ -60,6 +60,7 @@

 import org.osgi.framework.BundleContext;

+import java.sql.Savepoint;


Remove this unused import 'java.sql.Savepoint'.

dev-dotcms · 2017-12-14T20:38:44Z

SonarQube analysis reported 27 issues

2 blocker
2 critical
5 major
18 minor

Watch the comments in this conversation to review them.

2 extra issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

WorkflowFactoryImpl.java#L188: Define a constant instead of duplicating this literal "stepid" 3 times.
Task04305UpdateWorkflowActionTable.java#L371: Catch a list of specific exception subtypes instead.

jcastro-dotcms and others added 30 commits November 6, 2017 09:41

#11609 : Updating DB scripts. Adding upgrade task to create intermedi…

9525217

…ate table and other minor changes.

#11609 added first draft for add/edit workflow action

f285dc8

#11609 merge done

8a6444a

#11609 almost code done for save/edit workflow actions associated to …

ce25b42

…the scheme

#11609 the add action and action to step are done

60ef0e7

#11609 Added the delete steps and dependencies/minor fixes for transa…

eeb4172

…ctions, etc

#11609 delete action from step done in the ui/ajax and endpoint

0929145

#11609 Added the deletes for the UI

1f17c62

#12960 changes for reorder done

4cd30de

#13104 Added the new field requires lock options that supports locked…

fe70d6c

…, unlocked and both choices

#12960 added the scripts changes for all dbs

677079c

#12960 MERGE MASTER DONE

161c206

#12960 added changes for the workflow, action and step new relationships

ab38919

#12960 merge done

d30507c

#12960 notes and fixes

4992dd9

#12960 fixing the IT test

df465db

#12960 code review feedback

f558a7b

#11691 added changes for the new endpoint for getting content type sc…

329da3e

…hemes

#12960 added changes for h2 and mysql

a0fbd9c

#12960 added the changes for the show_on column

82e3837

#12960 adding changes for the showOn

96c6ceb

#12960 merge done

6a709f4

#12960 changes for show on functionality

c4d12df

resolving the error of the missing schemeid

92347c1

solving issue with content resource test

5ab4a08

Fixing the Task04305UpdateWorkflowActionTable

694375b

Reverting to master configuration

62e4317

#12960 merge done

6caba12

#12960 fixing postgres and oracle UT

43483c8

#11609 fixes for 11609

cc1cde1

dev-dotcms reviewed Dec 14, 2017

View reviewed changes

#11609 configuration rollback

0261f20

jgambarios requested changes Dec 14, 2017

View reviewed changes

#11609 fixes by code review

ff87ab2

dev-dotcms reviewed Dec 14, 2017

View reviewed changes

dotCMS deleted a comment from jdotcms Dec 14, 2017

jgambarios approved these changes Dec 15, 2017

View reviewed changes

jgambarios merged commit 2fe3e6c into master Dec 15, 2017

jgambarios deleted the issue-11609-fixes branch December 15, 2017 15:33

jgambarios mentioned this pull request Dec 15, 2017

DB: Workflow Actions should have a many-to-many relationship with workflow steps #11609

Closed

jdotcms restored the issue-11609-fixes branch December 19, 2017 18:06

jgambarios mentioned this pull request Jan 8, 2018

Issue 11609 fixes #13238

Closed

jgambarios deleted the issue-11609-fixes branch January 8, 2018 19:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 11609 fixes #13216

Issue 11609 fixes #13216

jdotcms commented Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

jdotcms Dec 14, 2017

jgambarios Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms Dec 14, 2017

dev-dotcms commented Dec 14, 2017


		if (null != stepIdList) {

		stepIdList.forEach( mapRow -> stepsBuilder.add



		public Builder showOn(Set<WorkflowStatus> showOn) {
		this.showOn = showOn;

		@@ -60,6 +60,7 @@

		import org.osgi.framework.BundleContext;

		import java.sql.Savepoint;

Issue 11609 fixes #13216

Issue 11609 fixes #13216

Conversation

jdotcms commented Dec 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dev-dotcms commented Dec 14, 2017

2 extra issues