Permalink
Browse files

Merge branch 'refactoring/COLAB-2926-remove-service-namespace' into d…

…evelop

# Conflicts:
#	microservices/clients/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClient.java
#	view/src/main/webapp/WEB-INF/tags/layout.tagx
  • Loading branch information...
jobachhu committed Nov 30, 2018
2 parents 0737cad + 78c929d commit 2c568d497ade16c035e18a8cd82f771de42d8925
Showing with 1,827 additions and 3,600 deletions.
  1. +4 −13 ...rvices/clients/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClient.java
  2. +2 −4 ...es/clients/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClientUtil.java
  3. +5 −0 ...ices/clients/activities-client/src/main/java/org/xcolab/client/activities/pojo/ActivityEntry.java
  4. +5 −0 ...ients/activities-client/src/main/java/org/xcolab/client/activities/pojo/ActivitySubscription.java
  5. +2 −10 microservices/clients/admin-client/src/main/java/org/xcolab/client/admin/EmailTemplateClient.java
  6. +1 −3 ...oservices/clients/admin-client/src/main/java/org/xcolab/client/admin/EmailTemplateClientUtil.java
  7. +11 −24 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/CategoryClient.java
  8. +10 −21 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/CommentClient.java
  9. +28 −59 ...ervices/clients/comment-client/src/main/java/org/xcolab/client/comment/CommentServiceWrapper.java
  10. +10 −22 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/ThreadClient.java
  11. +12 −18 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/Category.java
  12. +0 −26 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CategoryDto.java
  13. +12 −18 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CategoryGroup.java
  14. +0 −27 ...ervices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CategoryGroupDto.java
  15. +11 −13 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/Comment.java
  16. +0 −26 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CommentDto.java
  17. +15 −31 microservices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CommentThread.java
  18. +0 −27 ...ervices/clients/comment-client/src/main/java/org/xcolab/client/comment/pojo/CommentThreadDto.java
  19. +0 −44 ...vices/clients/comment-client/src/main/java/org/xcolab/client/comment/util/CategoryClientUtil.java
  20. +0 −58 ...rvices/clients/comment-client/src/main/java/org/xcolab/client/comment/util/CommentClientUtil.java
  21. +0 −50 ...ervices/clients/comment-client/src/main/java/org/xcolab/client/comment/util/ThreadClientUtil.java
  22. +109 −130 ...ervices/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/ContestClient.java
  23. +1 −7 ...ces/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/ContestClientUtil.java
  24. +12 −28 ...ients/contestproposal-client/src/main/java/org/xcolab/client/contest/ContestTeamMemberClient.java
  25. +1 −3 ...s/contestproposal-client/src/main/java/org/xcolab/client/contest/ContestTeamMemberClientUtil.java
  26. +15 −33 ...services/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/ImpactClient.java
  27. +1 −3 ...ices/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/ImpactClientUtil.java
  28. +53 −77 ...rvices/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/OntologyClient.java
  29. +1 −3 ...es/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/OntologyClientUtil.java
  30. +29 −48 ...lients/contestproposal-client/src/main/java/org/xcolab/client/contest/ProposalTemplateClient.java
  31. +1 −3 ...ts/contestproposal-client/src/main/java/org/xcolab/client/contest/ProposalTemplateClientUtil.java
  32. +92 −49 ...services/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/Contest.java
  33. +17 −4 ...ts/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestCollectionCard.java
  34. +0 −32 ...contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestCollectionCardDto.java
  35. +15 −5 ...lients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestDiscussion.java
  36. +0 −28 ...nts/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestDiscussionDto.java
  37. +15 −10 ...vices/clients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestDto.java
  38. +16 −5 .../clients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestSchedule.java
  39. +0 −33 ...ients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestScheduleDto.java
  40. +15 −7 ...ients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestTranslation.java
  41. +0 −34 ...ts/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ContestTranslationDto.java
  42. +16 −4 ...ntestproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactDefaultSeries.java
  43. +17 −4 ...tproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactDefaultSeriesData.java
  44. +0 −33 ...oposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactDefaultSeriesDataDto.java
  45. +0 −34 ...stproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactDefaultSeriesDto.java
  46. +17 −4 ...s/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactIteration.java
  47. +0 −34 ...ontestproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactIterationDto.java
  48. +18 −4 ...posal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateFocusAreaList.java
  49. +0 −34 ...al-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateFocusAreaListDto.java
  50. +18 −4 ...oposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateMaxFocusArea.java
  51. +0 −34 ...sal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateMaxFocusAreaDto.java
  52. +18 −4 ...testproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateSeries.java
  53. +0 −34 ...tproposal-client/src/main/java/org/xcolab/client/contest/pojo/impact/ImpactTemplateSeriesDto.java
  54. +11 −2 ...ients/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/FocusArea.java
  55. +0 −33 ...ts/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/FocusAreaDto.java
  56. +17 −4 ...tproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/FocusAreaOntologyTerm.java
  57. +0 −35 ...oposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/FocusAreaOntologyTermDto.java
  58. +14 −4 ...s/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/OntologySpace.java
  59. +0 −33 ...ontestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/OntologySpaceDto.java
  60. +14 −3 ...ts/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/OntologyTerm.java
  61. +0 −33 ...contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/ontology/OntologyTermDto.java
  62. +16 −13 ...ents/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhase.java
  63. +0 −32 ...s/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhaseDto.java
  64. +16 −4 ...stproposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhaseRibbonType.java
  65. +0 −33 ...roposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhaseRibbonTypeDto.java
  66. +15 −4 .../contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhaseType.java
  67. +0 −34 ...ntestproposal-client/src/main/java/org/xcolab/client/contest/pojo/phases/ContestPhaseTypeDto.java
  68. +16 −3 ...s/contestproposal-client/src/main/java/org/xcolab/client/contest/pojo/team/ContestTeamMember.java
  69. +0 −33 ...ontestproposal-client/src/main/java/org/xcolab/client/contest/pojo/team/ContestTeamMemberDto.java
  70. +16 −4 ...ntestproposal-client/src/main/java/org/xcolab/client/contest/pojo/team/ContestTeamMemberRole.java
  71. +0 −34 ...stproposal-client/src/main/java/org/xcolab/client/contest/pojo/team/ContestTeamMemberRoleDto.java
  72. +16 −4 ...ntestproposal-client/src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplate.java
  73. +0 −34 ...stproposal-client/src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplateDto.java
  74. +18 −4 ...oposal-client/src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplateSection.java
  75. +15 −26 ...ent/src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplateSectionDefinition.java
  76. +0 −34 .../src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplateSectionDefinitionDto.java
  77. +0 −34 ...sal-client/src/main/java/org/xcolab/client/contest/pojo/templates/ProposalTemplateSectionDto.java
  78. +15 −29 ...es/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/MembershipClient.java
  79. +1 −3 ...lients/contestproposal-client/src/main/java/org/xcolab/client/proposals/MembershipClientUtil.java
  80. +19 −35 ...rvices/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/PointsClient.java
  81. +1 −3 ...es/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/PointsClientUtil.java
  82. +48 −62 ...nts/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalAttributeClient.java
  83. +1 −3 ...contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalAttributeClientUtil.java
  84. +51 −67 ...ices/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalClient.java
  85. +1 −3 .../clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalClientUtil.java
  86. +25 −42 ...s/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalJudgeRatingClient.java
  87. +1 −3 ...ntestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalJudgeRatingClientUtil.java
  88. +33 −49 .../contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalMemberRatingClient.java
  89. +1 −3 ...testproposal-client/src/main/java/org/xcolab/client/proposals/ProposalMemberRatingClientUtil.java
  90. +8 −21 .../clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalMoveClient.java
  91. +1 −3 ...ents/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalMoveClientUtil.java
  92. +25 −42 ...clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalPhaseClient.java
  93. +1 −3 ...nts/contestproposal-client/src/main/java/org/xcolab/client/proposals/ProposalPhaseClientUtil.java
  94. +110 −73 ...vices/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/Proposal.java
  95. +16 −15 ...es/clients/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/ProposalDto.java
  96. +16 −1 ...nts/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/ProposalTeamMember.java
  97. +17 −5 ...lients/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/ProposalVersion.java
  98. +0 −34 ...nts/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/ProposalVersionDto.java
  99. +16 −4 ...ents/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/SupportedProposal.java
  100. +0 −53 ...s/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/SupportedProposalDto.java
  101. +17 −4 ...tproposal-client/src/main/java/org/xcolab/client/proposals/pojo/attributes/ProposalAttribute.java
  102. +0 −34 ...oposal-client/src/main/java/org/xcolab/client/proposals/pojo/attributes/ProposalAttributeDto.java
  103. +5 −0 ...ent/src/main/java/org/xcolab/client/proposals/pojo/attributes/ProposalAttributeHelperDataDto.java
  104. +17 −4 ...lient/src/main/java/org/xcolab/client/proposals/pojo/attributes/ProposalUnversionedAttribute.java
  105. +0 −34 ...nt/src/main/java/org/xcolab/client/proposals/pojo/attributes/ProposalUnversionedAttributeDto.java
  106. +7 −1 ...n/java/org/xcolab/client/proposals/pojo/attributes/ProposalUnversionedAttributeHelperDataDto.java
  107. +14 −4 ...posal-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRating.java
  108. +0 −34 ...al-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRatingDto.java
  109. +17 −4 ...l-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRatingType.java
  110. +0 −34 ...lient/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRatingTypeDto.java
  111. +16 −4 ...-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRatingValue.java
  112. +0 −34 ...ient/src/main/java/org/xcolab/client/proposals/pojo/evaluation/judges/ProposalRatingValueDto.java
  113. +16 −4 ...l-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/members/ProposalSupporter.java
  114. +0 −34 ...lient/src/main/java/org/xcolab/client/proposals/pojo/evaluation/members/ProposalSupporterDto.java
  115. +17 −4 ...oposal-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/members/ProposalVote.java
  116. +0 −34 ...sal-client/src/main/java/org/xcolab/client/proposals/pojo/evaluation/members/ProposalVoteDto.java
  117. +16 −3 .../contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/phases/Proposal2Phase.java
  118. +0 −35 ...ntestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/phases/Proposal2PhaseDto.java
  119. +18 −11 ...l-client/src/main/java/org/xcolab/client/proposals/pojo/phases/ProposalContestPhaseAttribute.java
  120. +0 −34 ...lient/src/main/java/org/xcolab/client/proposals/pojo/phases/ProposalContestPhaseAttributeDto.java
  121. +16 −4 ...estproposal-client/src/main/java/org/xcolab/client/proposals/pojo/phases/ProposalMoveHistory.java
  122. +0 −34 ...proposal-client/src/main/java/org/xcolab/client/proposals/pojo/phases/ProposalMoveHistoryDto.java
  123. +15 −3 ...ients/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/points/PointType.java
  124. +0 −33 ...ts/contestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/points/PointTypeDto.java
  125. +17 −4 ...client/src/main/java/org/xcolab/client/proposals/pojo/points/PointsDistributionConfiguration.java
  126. +0 −34 ...ent/src/main/java/org/xcolab/client/proposals/pojo/points/PointsDistributionConfigurationDto.java
  127. +8 −2 ...testproposal-client/src/main/java/org/xcolab/client/proposals/pojo/proposals/ProposalRatings.java
  128. +14 −12 ...ntestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/proposals/ProposalRibbon.java
  129. +18 −4 ...sal-client/src/main/java/org/xcolab/client/proposals/pojo/team/ProposalTeamMembershipRequest.java
  130. +0 −34 ...-client/src/main/java/org/xcolab/client/proposals/pojo/team/ProposalTeamMembershipRequestDto.java
  131. +17 −4 ...ontestproposal-client/src/main/java/org/xcolab/client/proposals/pojo/tiers/ProposalReference.java
  132. +0 −34 ...estproposal-client/src/main/java/org/xcolab/client/proposals/pojo/tiers/ProposalReferenceDto.java
  133. +61 −70 microservices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/ModelingClient.java
  134. +0 −181 ...services/clients/modeling-client/src/main/java/org/xcolab/client/modeling/ModelingClientUtil.java
  135. +20 −20 ...odeling-client/src/main/java/org/xcolab/client/modeling/models/ui/ModelInputGroupDisplayItem.java
  136. +8 −8 ...ng-client/src/main/java/org/xcolab/client/modeling/models/ui/ModelInputIndividualDisplayItem.java
  137. +6 −6 ...ling-client/src/main/java/org/xcolab/client/modeling/models/ui/ModelOutputIndexedDisplayItem.java
  138. +8 −8 ...eling-client/src/main/java/org/xcolab/client/modeling/models/ui/ModelOutputSeriesDisplayItem.java
  139. +6 −6 ...es/clients/modeling-client/src/main/java/org/xcolab/client/modeling/models/ui/ModelUIFactory.java
  140. +8 −1 microservices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/Model.java
  141. +16 −3 ...services/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelCategory.java
  142. +0 −29 ...vices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelCategoryDto.java
  143. +16 −4 ...rvices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelDiscussion.java
  144. +0 −29 ...ces/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelDiscussionDto.java
  145. +16 −4 .../clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelGlobalPreference.java
  146. +0 −30 ...ients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelGlobalPreferenceDto.java
  147. +16 −4 ...rvices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelInputGroup.java
  148. +0 −29 ...ces/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelInputGroupDto.java
  149. +16 −4 ...ervices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelInputItem.java
  150. +0 −29 ...ices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelInputItemDto.java
  151. +16 −4 .../clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelOutputChartOrder.java
  152. +0 −30 ...ients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelOutputChartOrderDto.java
  153. +16 −4 ...rvices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelOutputItem.java
  154. +0 −29 ...ces/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelOutputItemDto.java
  155. +16 −4 ...services/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelPosition.java
  156. +0 −29 ...vices/clients/modeling-client/src/main/java/org/xcolab/client/modeling/pojo/ModelPositionDto.java
  157. +4 −4 ...vices/contest-service/src/main/java/org/xcolab/service/contest/domain/contest/ContestDaoImpl.java
  158. +4 −6 ...ervice/src/main/java/org/xcolab/service/contest/service/collectioncard/CollectionCardService.java
  159. +2 −2 ...s/contest-service/src/main/java/org/xcolab/service/proposal/service/proposal/ProposalService.java
  160. +3 −3 ...src/main/java/org/xcolab/service/proposal/service/proposalattribute/ProposalAttributeService.java
  161. +1 −1 .../services/contest-service/src/test/java/org/xcolab/service/contest/web/ContestControllerTest.java
  162. +4 −4 ...ervices/moderation-service/src/main/java/org/xcolab/service/flagging/service/FlaggingService.java
  163. +2 −1 util/entity-utils/src/main/java/org/xcolab/entity/utils/helper/ProposalJudgingCommentHelper.java
  164. +3 −10 util/xcolab-utils/src/main/java/org/xcolab/util/http/client/VirtualRestResource.java
  165. +0 −10 util/xcolab-utils/src/main/java/org/xcolab/util/http/dto/DataTransferObject.java
  166. +0 −29 util/xcolab-utils/src/main/java/org/xcolab/util/http/dto/DtoUtil.java
  167. +2 −3 view/src/main/java/org/xcolab/view/activityentry/discussion/DiscussionBaseActivityEntry.java
  168. +4 −4 view/src/main/java/org/xcolab/view/caching/ContestCacheValidator.java
  169. +3 −3 view/src/main/java/org/xcolab/view/pages/contestmanagement/beans/ContestDescriptionBean.java
  170. +3 −2 view/src/main/java/org/xcolab/view/pages/contestmanagement/beans/ContestTranslationBean.java
  171. +2 −2 view/src/main/java/org/xcolab/view/pages/contestmanagement/wrappers/FlaggingReportWrapper.java
  172. +2 −2 view/src/main/java/org/xcolab/view/pages/discussion/discussions/views/BaseDiscussionController.java
  173. +3 −3 view/src/main/java/org/xcolab/view/pages/discussion/discussions/views/CategoryController.java
  174. +6 −6 view/src/main/java/org/xcolab/view/pages/discussion/discussions/views/ThreadController.java
  175. +5 −5 view/src/main/java/org/xcolab/view/pages/modeling/admin/ModelsAdminController.java
  176. +5 −5 view/src/main/java/org/xcolab/view/pages/modeling/admin/actions/AddUpdateModelInputGroupAction.java
  177. +3 −3 ...rc/main/java/org/xcolab/view/pages/modeling/admin/actions/ToggleCustomModelInputWidgetAction.java
  178. +8 −8 .../src/main/java/org/xcolab/view/pages/modeling/admin/actions/UpdateModelDisplayFromJSONAction.java
  179. +3 −3 ...main/java/org/xcolab/view/pages/modeling/admin/actions/UpdateModelIndividualInputGroupAction.java
  180. +3 −3 view/src/main/java/org/xcolab/view/pages/modeling/admin/actions/UpdateModelInputWidgetsAction.java
  181. +2 −2 view/src/main/java/org/xcolab/view/pages/modeling/admin/form/UpdateModelInputWidgetsBean.java
  182. +2 −2 view/src/main/java/org/xcolab/view/pages/profile/utils/ActivitySubscriptionNameGenerator.java
  183. +0 −26 view/src/main/java/org/xcolab/view/pages/proposals/utils/context/ClientHelper.java
  184. +3 −3 view/src/main/java/org/xcolab/view/pages/proposals/view/proposal/json/ModelingJsonController.java
  185. +4 −4 ...main/java/org/xcolab/view/pages/proposals/view/proposal/tabs/ProposalEvaluationTabController.java
  186. +2 −2 view/src/main/java/org/xcolab/view/pages/search/items/DiscussionSearchItem.java
  187. +3 −8 view/src/main/java/org/xcolab/view/taglibs/xcolab/jspTags/discussion/LoadThreadStartTag.java
  188. +3 −7 ...g/xcolab/view/taglibs/xcolab/jspTags/discussion/actions/AddDiscussionMessageActionController.java
  189. +2 −4 ...colab/view/taglibs/xcolab/jspTags/discussion/actions/DeleteDiscussionMessageActionController.java
  190. +2 −4 .../xcolab/view/taglibs/xcolab/jspTags/discussion/actions/EditDiscussionMessageActionController.java
  191. +3 −3 view/src/main/java/org/xcolab/view/util/entity/activityEntry/ActivitySubscriptionEmailHelper.java
@@ -1,39 +1,34 @@
package org.xcolab.client.activities;

import org.xcolab.util.activities.enums.ActivityType;
import org.xcolab.client.activities.exceptions.ActivityEntryNotFoundException;
import org.xcolab.client.activities.exceptions.ActivitySubscriptionNotFoundException;
import org.xcolab.client.activities.pojo.ActivityEntry;
import org.xcolab.client.activities.pojo.ActivitySubscription;
import org.xcolab.commons.IdListUtil;
import org.xcolab.util.activities.enums.ActivityCategory;
import org.xcolab.util.activities.enums.ActivityType;
import org.xcolab.util.http.caching.CacheKeys;
import org.xcolab.util.http.caching.CacheName;
import org.xcolab.util.http.client.RestResource;
import org.xcolab.util.http.client.RestResource1;
import org.xcolab.util.http.client.enums.ServiceNamespace;
import org.xcolab.util.http.exceptions.EntityNotFoundException;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public final class ActivitiesClient {

private static final Map<ServiceNamespace, ActivitiesClient> instances = new HashMap<>();

private final RestResource<ActivityEntry, Long> activityEntryResource;

private final RestResource<ActivitySubscription, Long> activitySubscriptionResource;


private ActivitiesClient(ServiceNamespace serviceNamespace) {
public ActivitiesClient() {
activityEntryResource = new RestResource1<>(ActivityResource.ACTIVITY_ENTRY,
ActivityEntry.TYPES, serviceNamespace);
ActivityEntry.TYPES);
activitySubscriptionResource = new RestResource1<>(ActivityResource.ACTIVITY_SUBSCRIPTION,
ActivitySubscription.TYPES, serviceNamespace);
ActivitySubscription.TYPES);
}

public ActivityEntry createActivityEntry(ActivityType activityType, long userId,
@@ -186,8 +181,4 @@ public boolean isSubscribedToActivity(Long receiverId, ActivityCategory activity
.queryParam("categoryId", categoryId)
.execute();
}

public static ActivitiesClient fromNamespace(ServiceNamespace serviceNamespace) {
return instances.computeIfAbsent(serviceNamespace, ActivitiesClient::new);
}
}
@@ -1,20 +1,18 @@
package org.xcolab.client.activities;

import org.xcolab.util.activities.enums.ActivityType;
import org.xcolab.client.activities.exceptions.ActivityEntryNotFoundException;
import org.xcolab.client.activities.exceptions.ActivitySubscriptionNotFoundException;
import org.xcolab.client.activities.pojo.ActivityEntry;
import org.xcolab.client.activities.pojo.ActivitySubscription;
import org.xcolab.util.activities.enums.ActivityCategory;
import org.xcolab.util.http.client.enums.ServiceNamespace;
import org.xcolab.util.activities.enums.ActivityType;

import java.util.Date;
import java.util.List;

public class ActivitiesClientUtil {

private static final ActivitiesClient activitiesClient = ActivitiesClient.fromNamespace(
ServiceNamespace.instance());
private static final ActivitiesClient activitiesClient = new ActivitiesClient();

public static ActivitiesClient getClient() {
return activitiesClient;
@@ -1,6 +1,9 @@
package org.xcolab.client.activities.pojo;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.springframework.core.ParameterizedTypeReference;

@@ -13,6 +16,8 @@
import java.util.List;
import java.util.Objects;

@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(Include.NON_NULL)
public class ActivityEntry implements Serializable {

public static final TypeProvider<ActivityEntry> TYPES = new TypeProvider<>(ActivityEntry.class,
@@ -1,6 +1,9 @@
package org.xcolab.client.activities.pojo;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.springframework.core.ParameterizedTypeReference;

@@ -12,6 +15,8 @@
import java.util.List;
import java.util.Objects;

@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(Include.NON_NULL)
public class ActivitySubscription implements Serializable {

public static final TypeProvider<ActivitySubscription> TYPES =
@@ -4,21 +4,17 @@
import org.xcolab.client.admin.pojo.EmailTemplate;
import org.xcolab.util.http.client.RestResource;
import org.xcolab.util.http.client.RestResource1;
import org.xcolab.util.http.client.enums.ServiceNamespace;
import org.xcolab.util.http.exceptions.EntityNotFoundException;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public final class EmailTemplateClient {

private static final Map<ServiceNamespace, EmailTemplateClient> instances = new HashMap<>();
private final RestResource<EmailTemplate, String> emailTemplatesResource;

private EmailTemplateClient(ServiceNamespace serviceNamespace) {
public EmailTemplateClient() {
emailTemplatesResource = new RestResource1<>(
AdminResource.EMAIL_TEMPLATE, EmailTemplate.TYPES, serviceNamespace);
AdminResource.EMAIL_TEMPLATE, EmailTemplate.TYPES);
}

public List<EmailTemplate> listAllContestEmailTemplates() {
@@ -41,8 +37,4 @@ public void updateContestEmailTemplate(EmailTemplate contestEmailTemplate) {
public EmailTemplate createEmailTemplate(EmailTemplate template) {
return emailTemplatesResource.create(template).execute();
}

public static EmailTemplateClient fromNamespace(ServiceNamespace serviceNamespace) {
return instances.computeIfAbsent(serviceNamespace, EmailTemplateClient::new);
}
}
@@ -1,14 +1,12 @@
package org.xcolab.client.admin;

import org.xcolab.client.admin.pojo.EmailTemplate;
import org.xcolab.util.http.client.enums.ServiceNamespace;

import java.util.List;

public class EmailTemplateClientUtil {

private static final EmailTemplateClient emailTemplateClient = EmailTemplateClient.fromNamespace(
ServiceNamespace.instance());
private static final EmailTemplateClient emailTemplateClient = new EmailTemplateClient();

public static List<EmailTemplate> listAllContestEmailTemplates() {
return emailTemplateClient.listAllContestEmailTemplates();
@@ -3,55 +3,42 @@
import org.xcolab.client.comment.exceptions.CategoryGroupNotFoundException;
import org.xcolab.client.comment.exceptions.CategoryNotFoundException;
import org.xcolab.client.comment.pojo.Category;
import org.xcolab.client.comment.pojo.CategoryDto;
import org.xcolab.client.comment.pojo.CategoryGroup;
import org.xcolab.util.http.caching.CacheName;
import org.xcolab.util.http.client.enums.ServiceNamespace;
import org.xcolab.util.http.dto.DtoUtil;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class CategoryClient {

private final CommentServiceWrapper commentServiceWrapper;
private final ServiceNamespace serviceNamespace;
// Default instance when used statically
private static final CategoryClient INSTANCE = new CategoryClient();

private static final Map<ServiceNamespace, CategoryClient> instances = new HashMap<>();
private final CommentServiceWrapper commentServiceWrapper = new CommentServiceWrapper();

public CategoryClient(ServiceNamespace serviceNamespace) {
commentServiceWrapper = CommentServiceWrapper.fromService(serviceNamespace);
this.serviceNamespace = serviceNamespace;
public static CategoryClient instance() {
return INSTANCE;
}

public List<Category> listCategories(int start, int last, long groupId) {
return DtoUtil.toPojos(commentServiceWrapper
.listCategories(start, last, "sort", null, groupId, CacheName.MISC_LONG),
serviceNamespace);
return commentServiceWrapper
.listCategories(start, last, "sort", null, groupId, CacheName.MISC_LONG);
}

public Category getCategory(long categoryId) throws CategoryNotFoundException {
return commentServiceWrapper.getCategory(categoryId, CacheName.MISC_RUNTIME)
.toPojo(serviceNamespace);
return commentServiceWrapper.getCategory(categoryId, CacheName.MISC_RUNTIME);
}

public boolean updateCategory(Category category) {
return commentServiceWrapper.updateCategory(new CategoryDto(category));
return commentServiceWrapper.updateCategory(category);
}

public Category createCategory(Category category) {
return commentServiceWrapper.createCategory(new CategoryDto(category))
.toPojo(serviceNamespace);
return commentServiceWrapper.createCategory(category);
}

public CategoryGroup getCategoryGroup(long groupId)
throws CategoryGroupNotFoundException {
return commentServiceWrapper.getCategoryGroup(groupId, CacheName.MISC_RUNTIME)
.toPojo(serviceNamespace);
return commentServiceWrapper.getCategoryGroup(groupId, CacheName.MISC_RUNTIME);
}

public static CategoryClient fromService(ServiceNamespace serviceNamespace) {
return instances.computeIfAbsent(serviceNamespace, CategoryClient::new);
}
}
@@ -4,36 +4,29 @@

import org.xcolab.client.comment.exceptions.CommentNotFoundException;
import org.xcolab.client.comment.pojo.Comment;
import org.xcolab.client.comment.pojo.CommentDto;
import org.xcolab.util.http.caching.CacheName;
import org.xcolab.util.http.client.enums.ServiceNamespace;
import org.xcolab.util.http.dto.DtoUtil;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class CommentClient {

private final CommentServiceWrapper commentServiceWrapper;
private final ServiceNamespace serviceNamespace;
private static final Map<ServiceNamespace, CommentClient> instances = new HashMap<>();
// Default instance when used statically
private static final CommentClient INSTANCE = new CommentClient();

public CommentClient(ServiceNamespace serviceNamespace) {
commentServiceWrapper = CommentServiceWrapper.fromService(serviceNamespace);
this.serviceNamespace = serviceNamespace;
private final CommentServiceWrapper commentServiceWrapper = new CommentServiceWrapper();

public static CommentClient instance() {
return INSTANCE;
}

public List<Comment> listComments(int start, int last) {
return listComments(start, last, null);
}

public List<Comment> listComments(int start, int last, Long threadId) {
return DtoUtil.toPojos(
commentServiceWrapper.listComments(start, last, "createdAt", null, threadId, null),
serviceNamespace);
return commentServiceWrapper.listComments(start, last, "createdAt", null, threadId, null);
}

public int countComments(Long threadId) {
@@ -60,23 +53,19 @@ public Comment getComment(long commentId) throws CommentNotFoundException {

public Comment getComment(long commentId, boolean includeDeleted)
throws CommentNotFoundException {
return commentServiceWrapper.getComment(commentId, includeDeleted, CacheName.MISC_REQUEST)
.toPojo(serviceNamespace);
return commentServiceWrapper.getComment(commentId, includeDeleted, CacheName.MISC_REQUEST);
}

public boolean updateComment(Comment comment) {
return commentServiceWrapper.updateComment(new CommentDto(comment));
return commentServiceWrapper.updateComment(new Comment(comment));
}

public Comment createComment(Comment comment) {
return commentServiceWrapper.createComment(new CommentDto(comment)).toPojo(serviceNamespace);
return commentServiceWrapper.createComment(new Comment(comment));
}

public boolean deleteComment(long commentId) {
return commentServiceWrapper.deleteComment(commentId);
}

public static CommentClient fromService(ServiceNamespace serviceNamespace) {
return instances.computeIfAbsent(serviceNamespace, CommentClient::new);
}
}
Oops, something went wrong.

0 comments on commit 2c568d4

Please sign in to comment.