Skip to content

Commit 36bfbef

Browse files
authored
Merge pull request #13500 from SORMAS-Foundation/task-#13497_wrong_java_package_in_some_files
#13497 - Corrected wrong Java package in AbstractDoctorDeclarationMes…
2 parents 201aaf9 + 9744e93 commit 36bfbef

File tree

2 files changed

+70
-35
lines changed

2 files changed

+70
-35
lines changed

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/doctordeclaration/AbstractDoctorDeclarationMessageProcessingFlow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1414
*/
1515

16-
package de.symeda.sormas.api.externalmessage.processing.labmessage;
16+
package de.symeda.sormas.api.externalmessage.processing.doctordeclaration;
1717

1818
import java.util.ArrayList;
1919
import java.util.Date;

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/doctordeclaration/DoctorDeclarationMessageProcessingFlow.java

Lines changed: 69 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import de.symeda.sormas.api.externalmessage.processing.ExternalMessageMapper;
5151
import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingFacade;
5252
import de.symeda.sormas.api.externalmessage.processing.PickOrCreateEventResult;
53-
import de.symeda.sormas.api.externalmessage.processing.labmessage.AbstractDoctorDeclarationMessageProcessingFlow;
53+
import de.symeda.sormas.api.externalmessage.processing.doctordeclaration.AbstractDoctorDeclarationMessageProcessingFlow;
5454
import de.symeda.sormas.api.feature.FeatureType;
5555
import de.symeda.sormas.api.i18n.Captions;
5656
import de.symeda.sormas.api.i18n.I18nProperties;
@@ -85,9 +85,12 @@ public class DoctorDeclarationMessageProcessingFlow extends AbstractDoctorDeclar
8585
/**
8686
* Constructor for initializing the processing flow with the required dependencies.
8787
*
88-
* @param externalMessage The external message to be processed.
89-
* @param mapper The mapper for mapping external message data.
90-
* @param processingFacade The facade for handling external message processing operations.
88+
* @param externalMessage
89+
* The external message to be processed.
90+
* @param mapper
91+
* The mapper for mapping external message data.
92+
* @param processingFacade
93+
* The facade for handling external message processing operations.
9194
*/
9295
public DoctorDeclarationMessageProcessingFlow(
9396
ExternalMessageDto externalMessage,
@@ -111,7 +114,8 @@ protected CompletionStage<Boolean> handleMissingDisease() {
111114
/**
112115
* Handles related forwarded messages for the external message.
113116
*
114-
* @return A {@link CompletionStage} that resolves to a boolean indicating whether the related forwarded messages were handled successfully.
117+
* @return A {@link CompletionStage} that resolves to a boolean indicating whether the related forwarded messages were handled
118+
* successfully.
115119
*/
116120
@Override
117121
protected CompletionStage<Boolean> handleRelatedForwardedMessages() {
@@ -122,8 +126,10 @@ protected CompletionStage<Boolean> handleRelatedForwardedMessages() {
122126
/**
123127
* Displays a window to pick or create a person associated with the external message.
124128
*
125-
* @param person The person to be picked or created.
126-
* @param callback The callback to handle the result of the operation.
129+
* @param person
130+
* The person to be picked or created.
131+
* @param callback
132+
* The callback to handle the result of the operation.
127133
*/
128134
@Override
129135
protected void handlePickOrCreatePerson(PersonDto person, HandlerCallback<EntitySelection<PersonDto>> callback) {
@@ -134,11 +140,16 @@ protected void handlePickOrCreatePerson(PersonDto person, HandlerCallback<Entity
134140
/**
135141
* Handles the selection or creation of an entry (case, contact, or event participant) based on the external message.
136142
*
137-
* @param similarCases A list of similar cases.
138-
* @param similarContacts A list of similar contacts.
139-
* @param similarEventParticipants A list of similar event participants.
140-
* @param externalMessage The external message being processed.
141-
* @param callback The callback to handle the result of the operation.
143+
* @param similarCases
144+
* A list of similar cases.
145+
* @param similarContacts
146+
* A list of similar contacts.
147+
* @param similarEventParticipants
148+
* A list of similar event participants.
149+
* @param externalMessage
150+
* The external message being processed.
151+
* @param callback
152+
* The callback to handle the result of the operation.
142153
*/
143154
@Override
144155
protected void handlePickOrCreateEntry(
@@ -147,12 +158,15 @@ protected void handlePickOrCreateEntry(
147158
List<SimilarEventParticipantDto> similarEventParticipants,
148159
ExternalMessageDto externalMessage,
149160
HandlerCallback<PickOrCreateEntryResult> callback) {
150-
LOGGER.debug("Handling pick or create entry for externalMessage: {}, similarCases: {}, similarContacts: {}, similarEventParticipants: {}",
151-
externalMessage, similarCases, similarContacts, similarEventParticipants);
161+
LOGGER.debug(
162+
"Handling pick or create entry for externalMessage: {}, similarCases: {}, similarContacts: {}, similarEventParticipants: {}",
163+
externalMessage,
164+
similarCases,
165+
similarContacts,
166+
similarEventParticipants);
152167

153168
// Build options for selecting or creating an entry (case, contact, or event participant)
154-
EntrySelectionField.Options.Builder optionsBuilder = new EntrySelectionField.Options.Builder()
155-
.addSelectCase(similarCases) // Add similar cases to the options
169+
EntrySelectionField.Options.Builder optionsBuilder = new EntrySelectionField.Options.Builder().addSelectCase(similarCases) // Add similar cases to the options
156170
.addSelectContact(similarContacts) // Add similar contacts to the options
157171
.addSelectEventParticipant(similarEventParticipants) // Add similar event participants to the options
158172
.addCreateEntry(EntrySelectionField.OptionType.CREATE_CASE, FeatureType.CASE_SURVEILANCE, UserRight.CASE_CREATE, UserRight.CASE_EDIT) // Option to create a new case
@@ -179,10 +193,14 @@ protected void handlePickOrCreateEntry(
179193
/**
180194
* Handles the creation of a case based on the external message.
181195
*
182-
* @param caze The case data to be created.
183-
* @param person The person associated with the case.
184-
* @param externalMessage The external message being processed.
185-
* @param callback The callback to handle the result of the operation.
196+
* @param caze
197+
* The case data to be created.
198+
* @param person
199+
* The person associated with the case.
200+
* @param externalMessage
201+
* The external message being processed.
202+
* @param callback
203+
* The callback to handle the result of the operation.
186204
*/
187205
@Override
188206
protected void handleCreateCase(CaseDataDto caze, PersonDto person, ExternalMessageDto externalMessage, HandlerCallback<CaseDataDto> callback) {
@@ -224,10 +242,14 @@ public void cancel() {
224242
/**
225243
* Handles the creation of a contact based on the external message.
226244
*
227-
* @param contact The contact data to be created.
228-
* @param person The person associated with the contact.
229-
* @param externalMessage The external message being processed.
230-
* @param callback The callback to handle the result of the operation.
245+
* @param contact
246+
* The contact data to be created.
247+
* @param person
248+
* The person associated with the contact.
249+
* @param externalMessage
250+
* The external message being processed.
251+
* @param callback
252+
* The callback to handle the result of the operation.
231253
*/
232254
@Override
233255
protected void handleCreateContact(
@@ -260,8 +282,10 @@ protected void handleCreateContact(
260282
/**
261283
* Displays a window to pick or create an event associated with the external message.
262284
*
263-
* @param externalMessage The external message being processed.
264-
* @param callback The callback to handle the result of the operation.
285+
* @param externalMessage
286+
* The external message being processed.
287+
* @param callback
288+
* The callback to handle the result of the operation.
265289
*/
266290
@Override
267291
protected void handlePickOrCreateEvent(ExternalMessageDto externalMessage, HandlerCallback<PickOrCreateEventResult> callback) {
@@ -302,8 +326,10 @@ protected void handlePickOrCreateEvent(ExternalMessageDto externalMessage, Handl
302326
/**
303327
* Handles the creation of an event based on the external message.
304328
*
305-
* @param event The event data to be created.
306-
* @param callback The callback to handle the result of the operation.
329+
* @param event
330+
* The event data to be created.
331+
* @param callback
332+
* The callback to handle the result of the operation.
307333
*/
308334
@Override
309335
protected void handleCreateEvent(EventDto event, HandlerCallback<EventDto> callback) {
@@ -341,18 +367,26 @@ protected void handleCreateEvent(EventDto event, HandlerCallback<EventDto> callb
341367
/**
342368
* Handles the creation of an event participant based on the external message.
343369
*
344-
* @param eventParticipant The event participant data to be created.
345-
* @param event The event associated with the participant.
346-
* @param externalMessage The external message being processed.
347-
* @param callback The callback to handle the result of the operation.
370+
* @param eventParticipant
371+
* The event participant data to be created.
372+
* @param event
373+
* The event associated with the participant.
374+
* @param externalMessage
375+
* The external message being processed.
376+
* @param callback
377+
* The callback to handle the result of the operation.
348378
*/
349379
@Override
350380
protected void handleCreateEventParticipant(
351381
EventParticipantDto eventParticipant,
352382
EventDto event,
353383
ExternalMessageDto externalMessage,
354384
HandlerCallback<EventParticipantDto> callback) {
355-
LOGGER.debug("Handling create event participant for eventParticipant: {}, event: {}, externalMessage: {}", eventParticipant, event, externalMessage);
385+
LOGGER.debug(
386+
"Handling create event participant for eventParticipant: {}, event: {}, externalMessage: {}",
387+
eventParticipant,
388+
event,
389+
externalMessage);
356390

357391
Window window = VaadinUiUtil.createPopupWindow();
358392

@@ -382,7 +416,8 @@ protected void handleCreateEventParticipant(
382416
/**
383417
* Confirms whether to pick an existing event participant.
384418
*
385-
* @return A {@link CompletionStage} that resolves to a boolean indicating whether the user chose to continue with the existing participant.
419+
* @return A {@link CompletionStage} that resolves to a boolean indicating whether the user chose to continue with the existing
420+
* participant.
386421
*/
387422
@Override
388423
protected CompletionStage<Boolean> confirmPickExistingEventParticipant() {

0 commit comments

Comments
 (0)