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

Commit fec58df

Browse files
committed
Checkstyle and doc link problems
1 parent 220b41b commit fec58df

File tree

6 files changed

+129
-129
lines changed

6 files changed

+129
-129
lines changed

core/common/boot/src/main/java/org/eclipse/dataspaceconnector/boot/system/injection/lifecycle/ExtensionLifecycleManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
* {@link ServiceExtension} implementors should not be constructed by just invoking their constructors, instead they need to go through
2626
* a lifecycle, which is what this class aims at doing. There are three major phases for initialization:
2727
* <ol>
28-
* <li>inject dependencies: all fields annotated with {@link org.eclipse.dataspaceconnector.spi.system.Inject} are set</li>
28+
* <li>inject dependencies: all fields annotated with {@link org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject} are set</li>
2929
* <li>initialize: invokes the {@link ServiceExtension#initialize(ServiceExtensionContext)} method</li>
30-
* <li>provide: invokes all methods annotated with {@link org.eclipse.dataspaceconnector.spi.system.Provider} to register more services into the context</li>
30+
* <li>provide: invokes all methods annotated with {@link org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider} to register more services into the context</li>
3131
* </ol>
3232
* <p>
3333
* The sequence of these phases is actually important.
@@ -62,7 +62,7 @@ public static RegistrationPhase initialize(InitializePhase phase) {
6262
}
6363

6464
/**
65-
* Scans the {@linkplain ServiceExtension} for methods annotated with {@linkplain org.eclipse.dataspaceconnector.spi.system.Provider}
65+
* Scans the {@linkplain ServiceExtension} for methods annotated with {@linkplain org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider}
6666
* with the {@link Provider#isDefault()} flag set to {@code false}, invokes them and registers the bean into the {@link ServiceExtensionContext} if necessary.
6767
*/
6868
public static PreparePhase provide(RegistrationPhase phase) {

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/negotiation/ConsumerContractNegotiationManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ private boolean processConsumerApproving(ContractNegotiation negotiation) {
361361

362362
var policy = lastOffer.getPolicy();
363363
var agreement = ContractAgreement.Builder.newInstance()
364-
.id(ContractId.createContractId(definitionId,lastOffer.getAsset().getId()))
364+
.id(ContractId.createContractId(definitionId, lastOffer.getAsset().getId()))
365365
.contractStartDate(clock.instant().getEpochSecond())
366366
.contractEndDate(clock.instant().plus(365, ChronoUnit.DAYS).getEpochSecond()) // TODO Make configurable (issue #722)
367367
.contractSigningDate(clock.instant().getEpochSecond())

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/negotiation/ProviderContractNegotiationManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ private boolean processConfirming(ContractNegotiation negotiation) {
351351
policy = lastOffer.getPolicy();
352352
//TODO move to own service
353353
agreement = ContractAgreement.Builder.newInstance()
354-
.id(ContractId.createContractId(definitionId,lastOffer.getAsset().getId()))
354+
.id(ContractId.createContractId(definitionId, lastOffer.getAsset().getId()))
355355
.contractStartDate(clock.instant().getEpochSecond())
356356
.contractEndDate(clock.instant().plus(365, ChronoUnit.DAYS).getEpochSecond()) // TODO Make configurable (issue #722)
357357
.contractSigningDate(clock.instant().getEpochSecond())

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333

3434
import java.net.URI;
3535
import java.util.Optional;
36+
import java.util.regex.Pattern;
3637
import java.util.stream.Stream;
3738

38-
import java.util.regex.Pattern;
3939

4040
/**
4141
* Implementation of the {@link ContractOfferService}.
@@ -67,10 +67,10 @@ public Stream<ContractOffer> queryContractOffers(ContractOfferQuery query, Range
6767
.map(policyStore::findById)
6868
.map(policy -> {
6969
// check policy target for compliance with the asset id
70-
final Pattern targetPattern=policy.getPolicy().getTarget()!=null ?
70+
final Pattern targetPattern = policy.getPolicy().getTarget() != null ?
7171
Pattern.compile(policy.getPolicy().getTarget()) : null;
7272
return assets.flatMap(asset -> {
73-
if(targetPattern==null || targetPattern.matcher(asset.getId()).matches()) {
73+
if (targetPattern == null || targetPattern.matcher(asset.getId()).matches()) {
7474
return Stream.of(createContractOffer(definition, policy.getPolicy(), asset));
7575
} else {
7676
return Stream.empty();
@@ -84,7 +84,7 @@ public Stream<ContractOffer> queryContractOffers(ContractOfferQuery query, Range
8484
@NotNull
8585
private ContractOffer createContractOffer(ContractDefinition definition, Policy policy, Asset asset) {
8686
return ContractOffer.Builder.newInstance()
87-
.id(ContractId.createContractId(definition.getId(),asset.getId()))
87+
.id(ContractId.createContractId(definition.getId(), asset.getId()))
8888
.policy(policy.withTarget(asset.getId()))
8989
.asset(asset)
9090
// TODO: this is a workaround for the bug described in https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/753

0 commit comments

Comments
 (0)