Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Commit fa2127c

Browse files
l-wegnerl-wegner
committed
Resolve conflicts and formatting
Signed-off-by: Lars Wegner <lars.wegner2@de.bosch.com>
1 parent 4deda76 commit fa2127c

File tree

5 files changed

+82
-83
lines changed

5 files changed

+82
-83
lines changed

‎backend/business-partner-agent/src/main/java/org/hyperledger/bpa/config/ActivityLogConfig.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ public class ActivityLogConfig {
4444
ConnectionState.PING_RESPONSE,
4545
ConnectionState.PING_NO_RESPONSE);
4646

47-
private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_TASKS = List.of(PresentationExchangeState.REQUEST_RECEIVED);
47+
private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_TASKS = List
48+
.of(PresentationExchangeState.REQUEST_RECEIVED);
4849

49-
private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_COMPLETED = List.of(PresentationExchangeState.VERIFIED,
50+
private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_COMPLETED = List.of(
51+
PresentationExchangeState.VERIFIED,
5052
PresentationExchangeState.PRESENTATION_ACKED);
5153

5254
private List<ConnectionState> connectionStatesForActivities;
@@ -63,7 +65,8 @@ public class ActivityLogConfig {
6365
this.acaPyConfig = acaPyConfig;
6466
// 1. set the tasks lists first as they depend on aca py configuration
6567
connectionStatesForTasks = this.isConnectionRequestTask() ? CONNECTION_STATES_TASKS : List.of();
66-
presentationExchangeStatesForTasks = this.isPresentationExchangeTask() ? PRESENTATION_EXCHANGE_STATES_TASKS : List.of();
68+
presentationExchangeStatesForTasks = this.isPresentationExchangeTask() ? PRESENTATION_EXCHANGE_STATES_TASKS
69+
: List.of();
6770

6871
// 2. set the completed state lists
6972
connectionStatesForCompleted = CONNECTION_STATES_COMPLETED;

‎backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/ActivityManager.java‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -114,23 +114,23 @@ public void completePartnerRequestTask(@NonNull Partner partner) {
114114
activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
115115
ActivityType.CONNECTION_REQUEST,
116116
ActivityRole.CONNECTION_REQUEST_RECIPIENT).ifPresentOrElse(activity -> {
117-
// set to completed and mark accepted
118-
activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
119-
activity.setCompleted(true);
120-
activityRepository.update(activity);
121-
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
122-
}, () -> {
123-
// add in a completed activity
124-
Activity a = Activity.builder()
125-
.linkId(partner.getId())
126-
.partner(partner)
127-
.type(ActivityType.CONNECTION_REQUEST)
128-
.role(ActivityRole.CONNECTION_REQUEST_RECIPIENT)
129-
.state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
130-
.completed(true)
131-
.build();
132-
activityRepository.save(a);
133-
});
117+
// set to completed and mark accepted
118+
activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
119+
activity.setCompleted(true);
120+
activityRepository.update(activity);
121+
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
122+
}, () -> {
123+
// add in a completed activity
124+
Activity a = Activity.builder()
125+
.linkId(partner.getId())
126+
.partner(partner)
127+
.type(ActivityType.CONNECTION_REQUEST)
128+
.role(ActivityRole.CONNECTION_REQUEST_RECIPIENT)
129+
.state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
130+
.completed(true)
131+
.build();
132+
activityRepository.save(a);
133+
});
134134
}
135135

136136
public void deletePartnerActivities(@NonNull Partner partner) {
@@ -158,21 +158,21 @@ public void addPartnerAcceptedActivity(@NonNull Partner partner) {
158158
activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
159159
ActivityType.CONNECTION_REQUEST,
160160
ActivityRole.CONNECTION_REQUEST_SENDER).ifPresentOrElse(activity -> {
161-
activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
162-
activity.setCompleted(true);
163-
activityRepository.update(activity);
164-
}, () -> {
165-
// add in a completed activity
166-
Activity a = Activity.builder()
167-
.linkId(partner.getId())
168-
.partner(partner)
169-
.type(ActivityType.CONNECTION_REQUEST)
170-
.role(ActivityRole.CONNECTION_REQUEST_SENDER)
171-
.state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
172-
.completed(true)
173-
.build();
174-
activityRepository.save(a);
175-
});
161+
activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
162+
activity.setCompleted(true);
163+
activityRepository.update(activity);
164+
}, () -> {
165+
// add in a completed activity
166+
Activity a = Activity.builder()
167+
.linkId(partner.getId())
168+
.partner(partner)
169+
.type(ActivityType.CONNECTION_REQUEST)
170+
.role(ActivityRole.CONNECTION_REQUEST_SENDER)
171+
.state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
172+
.completed(true)
173+
.build();
174+
activityRepository.save(a);
175+
});
176176
}
177177

178178
public void addPresentationExchangeTask(@NonNull PartnerProof partnerProof) {
@@ -213,24 +213,24 @@ public void completePresentationExchangeTask(@NonNull PartnerProof partnerProof)
213213
activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
214214
ActivityType.PRESENTATION_EXCHANGE,
215215
role).ifPresentOrElse(activity -> {
216-
// set to completed and mark accepted
217-
activity.setState(state);
218-
activity.setCompleted(true);
219-
activityRepository.update(activity);
216+
// set to completed and mark accepted
217+
activity.setState(state);
218+
activity.setCompleted(true);
219+
activityRepository.update(activity);
220220

221-
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
222-
}, () -> {
223-
// add in a completed activity
224-
Activity a = Activity.builder()
225-
.linkId(partnerProof.getId())
226-
.partner(partner)
227-
.type(ActivityType.PRESENTATION_EXCHANGE)
228-
.role(role)
229-
.state(state)
230-
.completed(true)
231-
.build();
232-
activityRepository.save(a);
233-
});
221+
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
222+
}, () -> {
223+
// add in a completed activity
224+
Activity a = Activity.builder()
225+
.linkId(partnerProof.getId())
226+
.partner(partner)
227+
.type(ActivityType.PRESENTATION_EXCHANGE)
228+
.role(role)
229+
.state(state)
230+
.completed(true)
231+
.build();
232+
activityRepository.save(a);
233+
});
234234
});
235235
}
236236

@@ -242,11 +242,11 @@ public void declinePresentationExchangeTask(@NonNull PartnerProof partnerProof)
242242
activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
243243
ActivityType.PRESENTATION_EXCHANGE,
244244
role).ifPresent(activity -> {
245-
activity.setState(ActivityState.PRESENTATION_EXCHANGE_DECLINED);
246-
activity.setCompleted(true);
247-
activityRepository.update(activity);
248-
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
249-
});
245+
activity.setState(ActivityState.PRESENTATION_EXCHANGE_DECLINED);
246+
activity.setCompleted(true);
247+
activityRepository.update(activity);
248+
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
249+
});
250250
});
251251
}
252252

@@ -255,9 +255,9 @@ public void deletePresentationExchangeTask(@NonNull PartnerProof partnerProof) {
255255
activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
256256
ActivityType.PRESENTATION_EXCHANGE,
257257
role).ifPresent(activity -> {
258-
activityRepository.delete(activity);
259-
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
260-
});
258+
activityRepository.delete(activity);
259+
eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
260+
});
261261
}
262262

263263
private ActivityItem convert(Activity activity) {
@@ -275,23 +275,23 @@ private ActivityItem convert(Activity activity) {
275275

276276
private ActivityState getPresentationExchangeState(PartnerProof partnerProof) {
277277
switch (partnerProof.getState()) {
278-
case VERIFIED:
279-
case PRESENTATION_ACKED:
280-
return ActivityState.PRESENTATION_EXCHANGE_ACCEPTED;
281-
case REQUEST_SENT:
282-
case PRESENTATIONS_SENT:
283-
return ActivityState.PRESENTATION_EXCHANGE_SENT;
284-
case REQUEST_RECEIVED:
285-
case PRESENTATION_RECEIVED:
278+
case VERIFIED:
279+
case PRESENTATION_ACKED:
280+
return ActivityState.PRESENTATION_EXCHANGE_ACCEPTED;
281+
case REQUEST_SENT:
282+
case PRESENTATIONS_SENT:
283+
return ActivityState.PRESENTATION_EXCHANGE_SENT;
284+
case REQUEST_RECEIVED:
285+
case PRESENTATION_RECEIVED:
286+
return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
287+
default:
288+
switch (partnerProof.getRole()) {
289+
case VERIFIER:
286290
return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
291+
case PROVER:
287292
default:
288-
switch (partnerProof.getRole()) {
289-
case VERIFIER:
290-
return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
291-
case PROVER:
292-
default:
293-
return ActivityState.PRESENTATION_EXCHANGE_SENT;
294-
}
293+
return ActivityState.PRESENTATION_EXCHANGE_SENT;
294+
}
295295
}
296296
}
297297

‎backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/ProofManager.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import javax.validation.Valid;
5858
import javax.validation.constraints.NotNull;
5959
import java.io.IOException;
60-
import java.util.ArrayList;
6160
import java.util.List;
6261
import java.util.Optional;
6362
import java.util.UUID;
@@ -102,7 +101,7 @@ public class ProofManager {
102101

103102
@Inject
104103
ProofTemplateConversion proofTemplateConversion;
105-
104+
106105
public void sendPresentProofRequest(@NonNull UUID partnerId, @NonNull @Valid BPAProofTemplate proofTemplate) {
107106
try {
108107
PresentProofRequest proofRequest = proofTemplateConversion.proofRequestViaVisitorFrom(partnerId,
@@ -117,7 +116,7 @@ public void sendPresentProofRequest(@NonNull UUID partnerId, @NonNull @Valid BPA
117116
throw new NetworkException(ACA_PY_ERROR_MSG, e);
118117
}
119118
}
120-
119+
121120
// request proof from partner
122121
public void sendPresentProofRequest(@NonNull UUID partnerId, @NonNull RequestProofRequest req) {
123122
try {
@@ -146,7 +145,7 @@ public void sendPresentProofRequest(@NonNull UUID partnerId, @NonNull RequestPro
146145
}
147146

148147
private Consumer<PresentationExchangeRecord> persistProof(@NonNull UUID partnerId, @Nullable String issuerId,
149-
@Nullable String schemaId, @Nullable BPAProofTemplate proofTemplate) {
148+
@Nullable String schemaId, @Nullable BPAProofTemplate proofTemplate) {
150149
return exchange -> {
151150
final PartnerProof pp = PartnerProof
152151
.builder()

backend/business-partner-agent/src/main/resources/databasemigrations/V1.17__add-proof-template-table.sql renamed to backend/business-partner-agent/src/main/resources/databasemigrations/V1.18__add-proof-template-table.sql

File renamed without changes.

‎backend/business-partner-agent/src/test/java/org/hyperledger/bpa/controller/ProofTemplateControllerTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import java.text.SimpleDateFormat;
4242
import java.util.*;
4343
import java.util.function.Consumer;
44-
import java.util.function.Predicate;
4544
import java.util.regex.Matcher;
4645
import java.util.regex.Pattern;
4746

@@ -118,9 +117,7 @@ void testThatListProofTemplatesReturnTheCorrectDateFormat() {
118117
ProofTemplate.class);
119118
Assertions.assertEquals(1, repository.count());
120119

121-
122-
Consumer<String> assertDateFormat = (dateString) ->
123-
{
120+
Consumer<String> assertDateFormat = (dateString) -> {
124121
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
125122
try {
126123
Assertions.assertNotNull(sdf.parse(dateString));

0 commit comments

Comments
 (0)