From 451d2fc63d3b4a24ce3a7b590f078babfe497990 Mon Sep 17 00:00:00 2001 From: BerndBreier <33351391+BerndBreier@users.noreply.github.com> Date: Mon, 12 Feb 2018 11:56:17 +0100 Subject: [PATCH] TSK-104 make constructor of impl classes package private --- .../TaskanaEngineConfiguration.java | 2 +- .../taskana/impl/AttachmentSummaryImpl.java | 4 ++++ .../taskana/impl/ClassificationQueryImpl.java | 4 ++-- .../impl/ClassificationServiceImpl.java | 21 ++++++++++++------- .../impl/ClassificationSummaryImpl.java | 4 ++++ .../pro/taskana/impl/MinimalTaskSummary.java | 4 ++++ .../impl/ObjectReferenceQueryImpl.java | 2 +- .../taskana/impl/TaskMonitorServiceImpl.java | 2 +- .../java/pro/taskana/impl/TaskQueryImpl.java | 2 +- .../pro/taskana/impl/TaskServiceImpl.java | 2 +- .../pro/taskana/impl/TaskSummaryImpl.java | 4 ++++ .../pro/taskana/impl/TaskanaEngineImpl.java | 6 +++++- .../impl/WorkbasketAccessItemQueryImpl.java | 2 +- .../pro/taskana/impl/WorkbasketQueryImpl.java | 2 +- .../taskana/impl/WorkbasketServiceImpl.java | 2 +- .../taskana/impl/WorkbasketSummaryImpl.java | 4 ++++ .../TaskServiceImplIntAutocommitTest.java | 3 ++- 17 files changed, 51 insertions(+), 19 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java index bb42ba06e..5c61bbc28 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java @@ -66,7 +66,7 @@ public class TaskanaEngineConfiguration { * @return the TaskanaEngine */ public TaskanaEngine buildTaskanaEngine() { - return new TaskanaEngineImpl(this); + return TaskanaEngineImpl.createTaskanaEngine(this); } /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java index 8202c6845..8f7d5573b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java @@ -17,6 +17,10 @@ public class AttachmentSummaryImpl implements AttachmentSummary { private ClassificationSummary classificationSummary; private Instant received; + AttachmentSummaryImpl() { + + } + /* * (non-Javadoc) * @see pro.taskana.impl.AttachmentSummary#getId() diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java index cc8fae0da..04f21cce6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java @@ -59,7 +59,7 @@ public class ClassificationQueryImpl implements ClassificationQuery { private String[] custom8In; private String[] custom8Like; - public ClassificationQueryImpl(TaskanaEngine taskanaEngine) { + ClassificationQueryImpl(TaskanaEngine taskanaEngine) { this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; } @@ -159,7 +159,7 @@ public class ClassificationQueryImpl implements ClassificationQuery { return this; } - @Override + @Override public ClassificationQuery custom1Like(String... custom1Like) { this.custom1Like = custom1Like; return this; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java index a6d10a79a..c98d6dd8a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java @@ -33,7 +33,7 @@ public class ClassificationServiceImpl implements ClassificationService { private ClassificationMapper classificationMapper; private TaskanaEngineImpl taskanaEngineImpl; - public ClassificationServiceImpl(TaskanaEngine taskanaEngine, ClassificationMapper classificationMapper) { + ClassificationServiceImpl(TaskanaEngine taskanaEngine, ClassificationMapper classificationMapper) { super(); this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; this.classificationMapper = classificationMapper; @@ -295,15 +295,17 @@ public class ClassificationServiceImpl implements ClassificationService { } @Override - public void deleteClassification(String classificationKey, String domain) throws ClassificationInUseException, ClassificationNotFoundException { + public void deleteClassification(String classificationKey, String domain) + throws ClassificationInUseException, ClassificationNotFoundException { try { taskanaEngineImpl.openConnection(); if (this.classificationMapper.findByKeyAndDomain(classificationKey, domain) == null) { - throw new ClassificationNotFoundException("The classification " + classificationKey + "wasn't found in the domain " + domain); + throw new ClassificationNotFoundException( + "The classification " + classificationKey + "wasn't found in the domain " + domain); } if (domain.equals("")) { - //master mode - delete all associated classifications in every domain. + // master mode - delete all associated classifications in every domain. List domains = this.classificationMapper.getDomainsForClassification(classificationKey); domains.remove(""); for (String classificationDomain : domains) { @@ -313,12 +315,17 @@ public class ClassificationServiceImpl implements ClassificationService { TaskServiceImpl taskService = (TaskServiceImpl) taskanaEngineImpl.getTaskService(); try { - List classificationTasks = taskService.createTaskQuery().classificationKeyIn(classificationKey).domainIn(domain).list(); + List classificationTasks = taskService.createTaskQuery() + .classificationKeyIn(classificationKey) + .domainIn(domain) + .list(); if (!classificationTasks.isEmpty()) { - throw new ClassificationInUseException("There are " + classificationTasks.size() + " Tasks which belong to this classification or a child classification. Please complete them and try again."); + throw new ClassificationInUseException("There are " + classificationTasks.size() + + " Tasks which belong to this classification or a child classification. Please complete them and try again."); } } catch (NotAuthorizedException e) { - LOGGER.error("ClassificationQuery unexpectedly returned NotauthorizedException. Throwing SystemException "); + LOGGER.error( + "ClassificationQuery unexpectedly returned NotauthorizedException. Throwing SystemException "); throw new SystemException("ClassificationQuery unexpectedly returned NotauthorizedException."); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationSummaryImpl.java index 11df556e7..87ae455e6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationSummaryImpl.java @@ -14,6 +14,10 @@ public class ClassificationSummaryImpl implements ClassificationSummary { private String domain; private String name; + ClassificationSummaryImpl() { + + } + @Override public String getId() { return id; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java index 857ee06a1..24bd3783f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java @@ -11,6 +11,10 @@ public class MinimalTaskSummary { private String workbasketKey; private TaskState taskState; + MinimalTaskSummary() { + + } + public String getTaskId() { return taskId; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java index aa73c4d33..c34e18ae3 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java @@ -33,7 +33,7 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { private String[] type; private String[] value; - public ObjectReferenceQueryImpl(TaskanaEngine taskanaEngine) { + ObjectReferenceQueryImpl(TaskanaEngine taskanaEngine) { this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java index 00c746f05..bb81f855f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java @@ -26,7 +26,7 @@ public class TaskMonitorServiceImpl implements TaskMonitorService { private TaskanaEngineImpl taskanaEngineImpl; private TaskMonitorMapper taskMonitorMapper; - public TaskMonitorServiceImpl(TaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) { + TaskMonitorServiceImpl(TaskanaEngine taskanaEngine, TaskMonitorMapper taskMonitorMapper) { super(); this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; this.taskMonitorMapper = taskMonitorMapper; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java index 5a52bdaa3..a69dc9dec 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java @@ -54,7 +54,7 @@ public class TaskQueryImpl implements TaskQuery { private String porValueLike; private List orderBy; - public TaskQueryImpl(TaskanaEngine taskanaEngine) { + TaskQueryImpl(TaskanaEngine taskanaEngine) { this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; this.taskService = (TaskServiceImpl) taskanaEngineImpl.getTaskService(); this.orderBy = new ArrayList<>(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java index c1fcdab56..69e964d02 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java @@ -64,7 +64,7 @@ public class TaskServiceImpl implements TaskService { private TaskMapper taskMapper; private AttachmentMapper attachmentMapper; - public TaskServiceImpl(TaskanaEngine taskanaEngine, TaskMapper taskMapper, + TaskServiceImpl(TaskanaEngine taskanaEngine, TaskMapper taskMapper, AttachmentMapper attachmentMapper) { super(); this.taskanaEngine = taskanaEngine; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java index bb6d0b869..9339a8f76 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java @@ -49,6 +49,10 @@ public class TaskSummaryImpl implements TaskSummary { private String custom9; private String custom10; + TaskSummaryImpl() { + + } + /* * (non-Javadoc) * @see pro.taskana.impl.TaskSummary#getId() diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java index 35f4a4634..883a8024e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java @@ -53,7 +53,11 @@ public class TaskanaEngineImpl implements TaskanaEngine { protected ConnectionManagementMode mode = ConnectionManagementMode.PARTICIPATE; protected java.sql.Connection connection = null; - public TaskanaEngineImpl(TaskanaEngineConfiguration taskanaEngineConfiguration) { + public static TaskanaEngine createTaskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration) { + return new TaskanaEngineImpl(taskanaEngineConfiguration); + } + + protected TaskanaEngineImpl(TaskanaEngineConfiguration taskanaEngineConfiguration) { this.taskanaEngineConfiguration = taskanaEngineConfiguration; createTransactionFactory(taskanaEngineConfiguration.getUseManagedTransactions()); this.sessionManager = createSqlSessionManager(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java index 46cc996fa..494128b5b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java @@ -32,7 +32,7 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery private TaskanaEngineImpl taskanaEngineImpl; private List orderBy; - public WorkbasketAccessItemQueryImpl(TaskanaEngine taskanaEngine) { + WorkbasketAccessItemQueryImpl(TaskanaEngine taskanaEngine) { this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; orderBy = new ArrayList<>(); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java index 2a82b5656..5c548fbaa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java @@ -51,7 +51,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery { private TaskanaEngineImpl taskanaEngineImpl; private List orderBy; - public WorkbasketQueryImpl(TaskanaEngine taskanaEngine) { + WorkbasketQueryImpl(TaskanaEngine taskanaEngine) { this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; orderBy = new ArrayList<>(); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java index f93978d3a..e05980c8f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java @@ -47,7 +47,7 @@ public class WorkbasketServiceImpl implements WorkbasketService { public WorkbasketServiceImpl() { } - public WorkbasketServiceImpl(TaskanaEngine taskanaEngine, WorkbasketMapper workbasketMapper, + WorkbasketServiceImpl(TaskanaEngine taskanaEngine, WorkbasketMapper workbasketMapper, DistributionTargetMapper distributionTargetMapper, WorkbasketAccessMapper workbasketAccessMapper) { this.taskanaEngine = (TaskanaEngineImpl) taskanaEngine; this.workbasketMapper = workbasketMapper; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java index 9af2a58ea..a4ed053d1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java @@ -22,6 +22,10 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary { private String orgLevel3; private String orgLevel4; + WorkbasketSummaryImpl() { + + } + /* * (non-Javadoc) * @see pro.taskana.impl.WorkbasketSummary#getId() diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java index 0855a3de7..7b3420acd 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java @@ -240,7 +240,8 @@ public class TaskServiceImplIntAutocommitTest { dummyTask = (TaskImpl) taskServiceImpl.createTask(dummyTask); List expectedTaskSumamries = new ArrayList<>(); - TaskSummaryImpl taskSummary = new TaskSummaryImpl(); + TaskSummaryImpl taskSummary = (TaskSummaryImpl) taskServiceImpl.newTask(dummyTask.getWorkbasketKey()) + .asSummary(); taskSummary.setTaskId(dummyTask.getId()); taskSummary.setName(dummyTask.getName()); expectedTaskSumamries.add(taskSummary);