Skip to content

Commit 96190ca

Browse files
paullatzelspergerpaullatzelsperger
authored
refactor: rename IssuanceProcess to avoid confusion (#584)
* refactor: rename IssuanceProcess to avoid confusion * checkstyle * removed unneeded module * add missing override annotation
1 parent c435a7a commit 96190ca

File tree

26 files changed

+139
-140
lines changed

26 files changed

+139
-140
lines changed

‎core/issuerservice/issuerservice-core/src/main/java/org/eclipse/edc/issuerservice/defaults/store/InMemoryIssuanceProcessStore.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.edc.issuerservice.defaults.store;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcess;
17+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcess;
1818
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
1919
import org.eclipse.edc.spi.query.CriterionOperatorRegistry;
2020
import org.eclipse.edc.spi.query.QuerySpec;
@@ -24,18 +24,18 @@
2424
import java.util.UUID;
2525
import java.util.stream.Stream;
2626

27-
public class InMemoryIssuanceProcessStore extends InMemoryStatefulEntityStore<IssuanceProcess> implements IssuanceProcessStore {
27+
public class InMemoryIssuanceProcessStore extends InMemoryStatefulEntityStore<IssuerCredentialIssuanceProcess> implements IssuanceProcessStore {
2828

2929
public InMemoryIssuanceProcessStore(Clock clock, CriterionOperatorRegistry criterionOperatorRegistry) {
3030
this(UUID.randomUUID().toString(), clock, criterionOperatorRegistry);
3131
}
3232

3333
public InMemoryIssuanceProcessStore(String leaserId, Clock clock, CriterionOperatorRegistry criterionOperatorRegistry) {
34-
super(IssuanceProcess.class, leaserId, clock, criterionOperatorRegistry);
34+
super(IssuerCredentialIssuanceProcess.class, leaserId, clock, criterionOperatorRegistry);
3535
}
3636

3737
@Override
38-
public Stream<IssuanceProcess> query(QuerySpec querySpec) {
38+
public Stream<IssuerCredentialIssuanceProcess> query(QuerySpec querySpec) {
3939
return super.findAll(querySpec);
4040
}
4141
}

‎core/issuerservice/issuerservice-core/src/test/java/org/eclipse/edc/issuerservice/defaults/store/InMemoryIssuanceProcessStoreTest.java renamed to ‎core/issuerservice/issuerservice-core/src/test/java/org/eclipse/edc/issuerservice/defaults/store/InMemoryIssuerCredentialIssuanceProcessStoreTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
package org.eclipse.edc.issuerservice.defaults.store;
1616

1717
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
18-
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStoreTestBase;
18+
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuerCredentialIssuanceProcessStoreTestBase;
1919
import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
2020

2121
import java.time.Duration;
2222

23-
public class InMemoryIssuanceProcessStoreTest extends IssuanceProcessStoreTestBase {
23+
public class InMemoryIssuerCredentialIssuanceProcessStoreTest extends IssuerCredentialIssuanceProcessStoreTestBase {
2424

25-
private final InMemoryIssuanceProcessStore store = new InMemoryIssuanceProcessStore(IssuanceProcessStoreTestBase.RUNTIME_ID, clock, CriterionOperatorRegistryImpl.ofDefaults());
25+
private final InMemoryIssuanceProcessStore store = new InMemoryIssuanceProcessStore(IssuerCredentialIssuanceProcessStoreTestBase.RUNTIME_ID, clock, CriterionOperatorRegistryImpl.ofDefaults());
2626

2727
@Override
2828
protected IssuanceProcessStore getStore() {

‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/IssuanceCoreExtension.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance;
1616

17-
import org.eclipse.edc.issuerservice.issuance.process.IssuanceProcessManagerImpl;
18-
import org.eclipse.edc.issuerservice.issuance.process.IssuanceProcessServiceImpl;
19-
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuanceProcessManager;
20-
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuanceProcessService;
17+
import org.eclipse.edc.issuerservice.issuance.process.IssuerCredentialIssuanceProcessManagerImpl;
18+
import org.eclipse.edc.issuerservice.issuance.process.IssuerCredentialIssuanceProcessServiceImpl;
19+
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuerCredentialIssuanceProcessManager;
20+
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuerCredentialIssuanceProcessService;
2121
import org.eclipse.edc.issuerservice.spi.issuance.process.retry.IssuanceProcessRetryStrategy;
2222
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
2323
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
@@ -61,7 +61,7 @@ public class IssuanceCoreExtension implements ServiceExtension {
6161
@Setting(description = "The base delay for the issuance retry mechanism in millisecond", key = "edc.issuer.issuance.send.retry.base-delay.ms", defaultValue = DEFAULT_SEND_RETRY_BASE_DELAY + "")
6262
private long sendRetryBaseDelay;
6363

64-
private IssuanceProcessManager issuanceProcessManager;
64+
private IssuerCredentialIssuanceProcessManager issuerCredentialIssuanceProcessManager;
6565

6666
@Inject
6767
private IssuanceProcessStore issuanceProcessStore;
@@ -85,11 +85,11 @@ public class IssuanceCoreExtension implements ServiceExtension {
8585
private TransactionContext transactionContext;
8686

8787
@Provider
88-
public IssuanceProcessManager createIssuanceProcessManager() {
88+
public IssuerCredentialIssuanceProcessManager createIssuanceProcessManager() {
8989

90-
if (issuanceProcessManager == null) {
90+
if (issuerCredentialIssuanceProcessManager == null) {
9191
var waitStrategy = retryStrategy != null ? retryStrategy : new ExponentialWaitStrategy(stateMachineIterationWaitMillis);
92-
issuanceProcessManager = IssuanceProcessManagerImpl.Builder.newInstance()
92+
issuerCredentialIssuanceProcessManager = IssuerCredentialIssuanceProcessManagerImpl.Builder.newInstance()
9393
.store(issuanceProcessStore)
9494
.monitor(monitor)
9595
.batchSize(stateMachineBatchSize)
@@ -100,23 +100,23 @@ public IssuanceProcessManager createIssuanceProcessManager() {
100100
.entityRetryProcessConfiguration(getEntityRetryProcessConfiguration())
101101
.build();
102102
}
103-
return issuanceProcessManager;
103+
return issuerCredentialIssuanceProcessManager;
104104
}
105105

106106
@Provider
107-
public IssuanceProcessService createIssuanceProcessService() {
108-
return new IssuanceProcessServiceImpl(transactionContext, issuanceProcessStore);
107+
public IssuerCredentialIssuanceProcessService createIssuanceProcessService() {
108+
return new IssuerCredentialIssuanceProcessServiceImpl(transactionContext, issuanceProcessStore);
109109
}
110110

111111
@Override
112112
public void start() {
113-
issuanceProcessManager.start();
113+
issuerCredentialIssuanceProcessManager.start();
114114
}
115115

116116
@Override
117117
public void shutdown() {
118-
if (issuanceProcessManager != null) {
119-
issuanceProcessManager.stop();
118+
if (issuerCredentialIssuanceProcessManager != null) {
119+
issuerCredentialIssuanceProcessManager.stop();
120120
}
121121
}
122122

‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/process/IssuanceProcessManagerImpl.java renamed to ‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/process/IssuerCredentialIssuanceProcessManagerImpl.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance.process;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcess;
18-
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuanceProcessManager;
17+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcess;
18+
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuerCredentialIssuanceProcessManager;
1919
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
2020
import org.eclipse.edc.statemachine.AbstractStateEntityManager;
2121
import org.eclipse.edc.statemachine.StateMachineManager;
2222

23-
public class IssuanceProcessManagerImpl extends AbstractStateEntityManager<IssuanceProcess, IssuanceProcessStore> implements IssuanceProcessManager {
23+
public class IssuerCredentialIssuanceProcessManagerImpl extends AbstractStateEntityManager<IssuerCredentialIssuanceProcess, IssuanceProcessStore> implements IssuerCredentialIssuanceProcessManager {
2424

2525

26-
private IssuanceProcessManagerImpl() {
26+
private IssuerCredentialIssuanceProcessManagerImpl() {
2727
}
2828

2929
@Override
@@ -32,10 +32,10 @@ protected StateMachineManager.Builder configureStateMachineManager(StateMachineM
3232
}
3333

3434
public static class Builder
35-
extends AbstractStateEntityManager.Builder<IssuanceProcess, IssuanceProcessStore, IssuanceProcessManagerImpl, Builder> {
35+
extends AbstractStateEntityManager.Builder<IssuerCredentialIssuanceProcess, IssuanceProcessStore, IssuerCredentialIssuanceProcessManagerImpl, Builder> {
3636

3737
private Builder() {
38-
super(new IssuanceProcessManagerImpl());
38+
super(new IssuerCredentialIssuanceProcessManagerImpl());
3939
}
4040

4141
public static Builder newInstance() {
@@ -48,7 +48,7 @@ public Builder self() {
4848
}
4949

5050
@Override
51-
public IssuanceProcessManagerImpl build() {
51+
public IssuerCredentialIssuanceProcessManagerImpl build() {
5252
super.build();
5353
return manager;
5454
}

‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/process/IssuanceProcessServiceImpl.java renamed to ‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/process/IssuerCredentialIssuanceProcessServiceImpl.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance.process;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcess;
18-
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuanceProcessService;
17+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcess;
18+
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuerCredentialIssuanceProcessService;
1919
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
2020
import org.eclipse.edc.spi.query.QuerySpec;
2121
import org.eclipse.edc.spi.result.ServiceResult;
2222
import org.eclipse.edc.transaction.spi.TransactionContext;
2323

2424
import java.util.List;
2525

26-
public class IssuanceProcessServiceImpl implements IssuanceProcessService {
26+
public class IssuerCredentialIssuanceProcessServiceImpl implements IssuerCredentialIssuanceProcessService {
2727

2828
private final TransactionContext transactionContext;
2929
private final IssuanceProcessStore issuanceProcessStore;
3030

31-
public IssuanceProcessServiceImpl(TransactionContext transactionContext, IssuanceProcessStore issuanceProcessStore) {
31+
public IssuerCredentialIssuanceProcessServiceImpl(TransactionContext transactionContext, IssuanceProcessStore issuanceProcessStore) {
3232
this.transactionContext = transactionContext;
3333
this.issuanceProcessStore = issuanceProcessStore;
3434
}
3535

3636
@Override
37-
public IssuanceProcess findById(String id) {
37+
public IssuerCredentialIssuanceProcess findById(String id) {
3838
return transactionContext.execute(() -> issuanceProcessStore.findById(id));
3939
}
4040

4141
@Override
42-
public ServiceResult<List<IssuanceProcess>> search(QuerySpec query) {
42+
public ServiceResult<List<IssuerCredentialIssuanceProcess>> search(QuerySpec query) {
4343
return ServiceResult.success(queryIssuanceProcesses(query));
4444
}
4545

46-
private List<IssuanceProcess> queryIssuanceProcesses(QuerySpec query) {
46+
private List<IssuerCredentialIssuanceProcess> queryIssuanceProcesses(QuerySpec query) {
4747
return transactionContext.execute(() -> {
4848
try (var stream = issuanceProcessStore.query(query)) {
4949
return stream.toList();

‎core/issuerservice/issuerservice-issuance/src/main/java/org/eclipse/edc/issuerservice/issuance/rule/CredentialRuleDefinitionEvaluatorImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance.rule;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.IssuanceContext;
17+
import org.eclipse.edc.issuerservice.spi.issuance.IssuerCredentialIssuanceContext;
1818
import org.eclipse.edc.issuerservice.spi.issuance.model.CredentialRuleDefinition;
1919
import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRuleDefinitionEvaluator;
2020
import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRuleFactoryRegistry;
@@ -31,7 +31,7 @@ public CredentialRuleDefinitionEvaluatorImpl(CredentialRuleFactoryRegistry crede
3131
}
3232

3333
@Override
34-
public Result<Void> evaluate(Collection<CredentialRuleDefinition> definitions, IssuanceContext context) {
34+
public Result<Void> evaluate(Collection<CredentialRuleDefinition> definitions, IssuerCredentialIssuanceContext context) {
3535
for (var definition : definitions) {
3636
var factory = credentialRuleFactoryRegistry.resolveFactory(definition.type());
3737
var rule = factory.createRule(definition);

‎core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/IssuanceCoreExtensionTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717

1818
import org.eclipse.edc.boot.system.injection.ObjectFactory;
19-
import org.eclipse.edc.issuerservice.issuance.process.IssuanceProcessManagerImpl;
20-
import org.eclipse.edc.issuerservice.issuance.process.IssuanceProcessServiceImpl;
19+
import org.eclipse.edc.issuerservice.issuance.process.IssuerCredentialIssuanceProcessManagerImpl;
20+
import org.eclipse.edc.issuerservice.issuance.process.IssuerCredentialIssuanceProcessServiceImpl;
2121
import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
2222
import org.eclipse.edc.spi.system.ServiceExtensionContext;
2323
import org.junit.jupiter.api.Test;
@@ -32,8 +32,8 @@ public class IssuanceCoreExtensionTest {
3232
@Test
3333
void verifyProviders(ServiceExtensionContext context, ObjectFactory factory) {
3434
var extension = factory.constructInstance(IssuanceCoreExtension.class);
35-
assertThat(extension.createIssuanceProcessManager()).isInstanceOf(IssuanceProcessManagerImpl.class);
36-
assertThat(extension.createIssuanceProcessService()).isInstanceOf(IssuanceProcessServiceImpl.class);
35+
assertThat(extension.createIssuanceProcessManager()).isInstanceOf(IssuerCredentialIssuanceProcessManagerImpl.class);
36+
assertThat(extension.createIssuanceProcessService()).isInstanceOf(IssuerCredentialIssuanceProcessServiceImpl.class);
3737

3838
}
3939
}

‎core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/process/IssuanceProcessServiceImplTest.java renamed to ‎core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/process/IssuerCredentialIssuerCredentialIssuanceProcessServiceImplTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance.process;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcess;
18-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcessStates;
19-
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuanceProcessService;
17+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcess;
18+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcessStates;
19+
import org.eclipse.edc.issuerservice.spi.issuance.process.IssuerCredentialIssuanceProcessService;
2020
import org.eclipse.edc.issuerservice.spi.issuance.process.store.IssuanceProcessStore;
2121
import org.eclipse.edc.spi.query.QuerySpec;
2222
import org.eclipse.edc.transaction.spi.NoopTransactionContext;
@@ -34,11 +34,11 @@
3434
import static org.mockito.Mockito.verify;
3535
import static org.mockito.Mockito.when;
3636

37-
public class IssuanceProcessServiceImplTest {
37+
public class IssuerCredentialIssuerCredentialIssuanceProcessServiceImplTest {
3838

3939
private final TransactionContext transactionContext = spy(new NoopTransactionContext());
4040
private final IssuanceProcessStore store = mock();
41-
private final IssuanceProcessService service = new IssuanceProcessServiceImpl(transactionContext, store);
41+
private final IssuerCredentialIssuanceProcessService service = new IssuerCredentialIssuanceProcessServiceImpl(transactionContext, store);
4242

4343
@Test
4444
void findById_whenFound() {
@@ -65,15 +65,15 @@ void search() {
6565

6666
var result = service.search(query);
6767

68-
assertThat(result).isSucceeded().asInstanceOf(list(IssuanceProcess.class)).containsExactly(process);
68+
assertThat(result).isSucceeded().asInstanceOf(list(IssuerCredentialIssuanceProcess.class)).containsExactly(process);
6969
verify(transactionContext).execute(any(TransactionContext.ResultTransactionBlock.class));
7070
}
7171

72-
private IssuanceProcess createIssuanceProcess() {
72+
private IssuerCredentialIssuanceProcess createIssuanceProcess() {
7373

74-
return IssuanceProcess.Builder.newInstance()
74+
return IssuerCredentialIssuanceProcess.Builder.newInstance()
7575
.id("id")
76-
.state(IssuanceProcessStates.APPROVED.code())
76+
.state(IssuerCredentialIssuanceProcessStates.APPROVED.code())
7777
.participantId("participantId")
7878
.build();
7979
}

‎extensions/issuance/issuerservice-issuance-rules/src/main/java/org/eclipse/edc/issuerservice/issuance/rules/expression/ExpressionCredentialRule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.edc.issuerservice.issuance.rules.expression;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.IssuanceContext;
17+
import org.eclipse.edc.issuerservice.spi.issuance.IssuerCredentialIssuanceContext;
1818
import org.eclipse.edc.issuerservice.spi.issuance.rule.CredentialRule;
1919
import org.eclipse.edc.spi.result.Result;
2020

@@ -43,7 +43,7 @@ public ExpressionCredentialRule(String path, Operator operator, Object value) {
4343
}
4444

4545
@Override
46-
public Result<Void> evaluate(IssuanceContext context) {
46+
public Result<Void> evaluate(IssuerCredentialIssuanceContext context) {
4747
var result = navigateProperty(path, context.getClaims(), true);
4848
if (result.failed()) {
4949
return result.mapFailure();

‎extensions/store/sql/issuance-process-store-sql/src/main/java/org/eclipse/edc/issuerservice/store/sql/issuanceprocess/IssuanceProcessStoreStatements.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
package org.eclipse.edc.issuerservice.store.sql.issuanceprocess;
1616

17-
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuanceProcess;
17+
import org.eclipse.edc.issuerservice.spi.issuance.model.IssuerCredentialIssuanceProcess;
1818
import org.eclipse.edc.spi.query.QuerySpec;
1919
import org.eclipse.edc.sql.lease.LeaseStatements;
2020
import org.eclipse.edc.sql.lease.StatefulEntityStatements;
2121
import org.eclipse.edc.sql.translation.SqlQueryStatement;
2222

2323
/**
24-
* Defines SQL-statements and column names for use with a SQL-based {@link IssuanceProcess}
24+
* Defines SQL-statements and column names for use with a SQL-based {@link IssuerCredentialIssuanceProcess}
2525
*/
2626
public interface IssuanceProcessStoreStatements extends StatefulEntityStatements, LeaseStatements {
2727

0 commit comments

Comments
 (0)