Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(clients): Add useCreateTime to Java Client #3919

Merged
merged 30 commits into from
Dec 15, 2023
Merged

chore(clients): Add useCreateTime to Java Client #3919

merged 30 commits into from
Dec 15, 2023

Conversation

psavidis
Copy link
Contributor

@psavidis psavidis commented Nov 7, 2023 •
edited
Loading

Related-to: #3896

@psavidis psavidis added the ci:all-as Runs the builds for all application servers. label Nov 7, 2023
@psavidis psavidis requested a review from mboskamp November 7, 2023 22:39
@psavidis psavidis changed the title 3896 java client chore(clients): Add useCreateTime to Java Client Nov 7, 2023
This was referenced Nov 7, 2023
Closed
Closed
@psavidis psavidis self-assigned this Nov 8, 2023
psavidis added 10 commits November 9, 2023 18:05
@psavidis
chore(engine): Adjust Persistence Layer for CreationDate
73953bd 
- MyBatis Adjustments
- ExternalTask is saved & Creation Date is persisted
- orderByCreationDate works with ASC & DESC Order
- HistoryExternalTaskLog uses creation date
@psavidis
test(model-api): Add Tests for Multi-Level Sorting
a0d3ac6 
Creation-Date & Priority
@psavidis
refactor(engine): Rename CREATION_DATE to CreateTime
6a8919c
@psavidis
chore(engine): Adjust Fetch And Lock API
056b746 
- Add parameter useCreationDate to ExternalTaskService
- The parameter passes-through until FetchExternalTasksCmd where it is not currently utilized
@psavidis
tests(engine): Adjust Tests
8987e7f 
Adjust test usage of externalTaskService#fetchAndLock to use `useCreationDate` with false value
@psavidis
chore(engine-rest): Adjust Fetch & Lock API
246423f 
- Configuring creationDate fro ExternalTaskService#fetchAndLock is performed using `CreationDateConfig` enum
- ExternalTaskRestService uses `CreationDateConfig` DTO to pass direction and enablement /disablement of `useCreationDate` param
- Unit Tests for creationDate DESC, ASC order using ExternalTaskService

- Pending are the multi-level sorting tests for both priority and creationDate
@psavidis
chore(engine): Add Multi-Level Sorting Tests
f552e14 
- Remove Tests and rewrite them:

testFetchWithCreationDateASC
testFetchWithCreationDateDESC

Replaced by:

shouldFetchWithCreationDateDESCWithoutPriority
shouldFetchWithCreationDateASCWithoutPriority

- Externalise CreationDate to `LockedExternalTaskImpl`
@psavidis
test(engine): Add Tests for Null Or Empty Configs
ab748fc
@psavidis
Rename CreationDate to CreateTime
a10d35d
@psavidis
refactor(engine): Fix Tests for null & Empty createTimeConfig
05e9de6
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from 5d7a359 to 05e9de6 Compare November 9, 2023 16:11
@psavidis psavidis mentioned this pull request Nov 14, 2023
Closed
21 tasks
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from 021e508 to c7df2d7 Compare November 14, 2023 16:29
@psavidis
chore(engine, engine-rest): Replace CreateTimeConfig with Builder
5033882 
- Apply Code Review points
- Use Sortings for fetch And Lock API
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from c7df2d7 to 5033882 Compare November 15, 2023 07:33
@psavidis
chore(engine, engine-rest): Adjust ExternalTaskServiceTest tests
c4832e2
@psavidis
chore(engine, engine-rest): Refactor builder
382800e 
Refactor FetchAndLockBuilder not to extend ExternalTaskQueryTopicBuilder but rather return it
@psavidis
chore(engine, engine-rest): Fix Tests
417c251 
- Fix constructors to initialize internally dependencies that do not belong outside their scope
- ExternalTaskQueryTopicBuilderImpl copy constructor copies currentInstruction
mboskamp
mboskamp requested changes Nov 27, 2023
View reviewed changes
clients/java/client/src/main/java/org/camunda/bpm/client/ExternalTaskClientBuilder.java Outdated Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/ExternalTaskClientBuilder.java Outdated Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/ExternalTaskClientBuilder.java Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/task/CreateTimeConfig.java Outdated Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/task/CreateTimeConfig.java Outdated Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Outdated Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Outdated Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Outdated Show resolved Hide resolved
@psavidis psavidis force-pushed the 3896-java-client branch 3 times, most recently from 3e8106f to 63c129b Compare November 30, 2023 14:47
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from db5d9e3 to 3818ff3 Compare November 30, 2023 15:23
@psavidis
refactor(engine): Code Review points
cea05c6 
- Remove execute method from FetchAndLockBuilder
- Refactor FetchAndLockBuilderImpl to use a List instead of a Map and make it similar to the QueryAPI for the sake of consistency
- Add tests for covering invalid usages of fetchAndLock API
- Infer useCreateTime
- Correct JavaDoc
- Generify Sorting of FetchAndLock Impl
- Remove var
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from 3818ff3 to cea05c6 Compare December 1, 2023 14:23
@psavidis
chore(engine): Apply Code Review Points
497055d 
- Generify Fetch and Lock Sorting
- Apply Suggestions
- Make ExternalTaskClientBuilder API similar to the engine's using Fluent API, asc & desc methods
- useCreateTime as a method with sensible default for the user
@psavidis
refactor(engine): Code Review points
c50657a 
- Remove execute method from FetchAndLockBuilder
- Refactor FetchAndLockBuilderImpl to use a List instead of a Map and make it similar to the QueryAPI for the sake of consistency
- Add tests for covering invalid usages of fetchAndLock API
- Infer useCreateTime
- Correct JavaDoc
- Generify Sorting of FetchAndLock Impl
- Remove var
@psavidis psavidis force-pushed the 3896-fetch-and-lock branch from cea05c6 to c50657a Compare December 1, 2023 14:57
@psavidis
chore(engine): Make OrderingConfig Similar to the Backend
0f9008e 
- Add tests for invalid usages of ExternalTaskClient
- Remove override annotations
- Refactor OrderConfig to Use a List instead of a Map
@psavidis
Merge branch '3896-fetch-and-lock' into 3896-java-client
606dac4 
# Conflicts:
#	engine/src/main/java/org/camunda/bpm/engine/externaltask/FetchAndLockBuilder.java
@psavidis
chore(spring-boot-starter): Add Spring Boot External Client Config
dae9afb 
- Validate against misusing orderByCreateTime and useCreateTime configurations together
- Validate against wrong orderByCreateTime values
@psavidis psavidis requested review from mboskamp and tasso94 December 5, 2023 07:22
mboskamp
mboskamp approved these changes Dec 13, 2023
View reviewed changes
Copy link
Member

@mboskamp mboskamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Only found minor things. Well done!

clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Outdated Show resolved Hide resolved
...nts/java/client/src/main/java/org/camunda/bpm/client/impl/ExternalTaskClientBuilderImpl.java Outdated Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/task/OrderingConfig.java Outdated Show resolved Hide resolved
clients/java/client/src/main/java/org/camunda/bpm/client/task/OrderingConfig.java Outdated Show resolved Hide resolved
.../spring/src/main/java/org/camunda/bpm/client/spring/annotation/EnableExternalTaskClient.java Outdated Show resolved Hide resolved
...ter-client/spring/src/main/java/org/camunda/bpm/client/spring/impl/client/ClientFactory.java Outdated Show resolved Hide resolved
clients/java/client/src/it/java/org/camunda/bpm/client/client/ClientIT.java Show resolved Hide resolved
@psavidis
Use assertThatThrownBy and Assert Messages
22f7e88 
baseUrl had to configured so that the method tests the right message & exception
Base automatically changed from 3896-fetch-and-lock to 3896-feature December 13, 2023 16:36
psavidis and others added 4 commits December 13, 2023 18:50
@psavidis
Merge branch '3896-feature' into 3896-java-client
b4cbd96
@psavidis
chore(spring-boot-starter|clients): Cover Code Review Points
91a5e9b 
- Avoid Null Check
- Improve JavaDoc
- Move orderingConfig validation up
- Group ExternalTaskClientException creation in ExternalTaskClientLogger
- Simplify validateOrderingProperties
@psavidis
Merge remote-tracking branch 'origin/3896-java-client' into 3896-java…
f796459 
…-client
@psavidis
Restore DateValueMapperTest
5f02f58
@psavidis psavidis merged commit 8c1000e into 3896-feature Dec 15, 2023
1 of 2 checks passed
@psavidis psavidis deleted the 3896-java-client branch December 15, 2023 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mboskamp mboskamp mboskamp approved these changes

@tasso94 tasso94 Awaiting requested review from tasso94

Assignees

@psavidis psavidis

Labels
ci:all-as Runs the builds for all application servers.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@psavidis @tasso94 @mboskamp