Skip to content

Commit 78537b1

Browse files
[SYNCOPE-1993] provide support for enable auto registration parameter also in core module (#1515)
1 parent 3627a6d commit 78537b1

3 files changed

Lines changed: 21 additions & 8 deletions

File tree

‎core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Map;
2222
import org.apache.cxf.spring.boot.autoconfigure.openapi.OpenApiAutoConfiguration;
2323
import org.apache.syncope.common.keymaster.client.api.DomainOps;
24+
import org.apache.syncope.common.keymaster.client.api.KeymasterProperties;
2425
import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
2526
import org.apache.syncope.common.lib.info.SystemInfo;
2627
import org.apache.syncope.core.persistence.api.DomainHolder;
@@ -121,14 +122,16 @@ public TaskExecutorUnloader taskExecutorUnloader(final ListableBeanFactory beanF
121122

122123
@ConditionalOnMissingBean
123124
@Bean
124-
public SyncopeCoreStart keymasterStart(final DomainHolder<?> domainHolder) {
125-
return new SyncopeCoreStart(domainHolder);
125+
public SyncopeCoreStart keymasterStart(
126+
final DomainHolder<?> domainHolder,
127+
final KeymasterProperties keymasterProps) {
128+
return new SyncopeCoreStart(domainHolder, keymasterProps.isEnableAutoRegistration());
126129
}
127130

128131
@ConditionalOnMissingBean
129132
@Bean
130-
public KeymasterStop keymasterStop(final DomainHolder<?> domainHolder) {
131-
return new SyncopeCoreStop(domainHolder);
133+
public KeymasterStop keymasterStop(final DomainHolder<?> domainHolder, final KeymasterProperties keymasterProps) {
134+
return new SyncopeCoreStop(domainHolder, keymasterProps.isEnableAutoRegistration());
132135
}
133136

134137
@ConditionalOnMissingBean

‎core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStart.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@ public class SyncopeCoreStart extends KeymasterStart implements Ordered {
3939

4040
private final DomainHolder<?> domainHolder;
4141

42-
public SyncopeCoreStart(final DomainHolder<?> domainHolder) {
42+
private final boolean enableAutoRegistration;
43+
44+
public SyncopeCoreStart(final DomainHolder<?> domainHolder, final boolean enableAutoRegistration) {
4345
super(NetworkService.Type.CORE);
4446
this.domainHolder = domainHolder;
47+
this.enableAutoRegistration = enableAutoRegistration;
4548
}
4649

4750
@Override
@@ -71,7 +74,9 @@ public void onApplicationEvent(final ContextRefreshedEvent event) {
7174
LOG.debug("[{}] Init completed", loaderName);
7275
});
7376

74-
super.onApplicationEvent(event);
77+
if (enableAutoRegistration) {
78+
super.onApplicationEvent(event);
79+
}
7580

7681
event.getApplicationContext().getBean(JobStatusUpdater.class).initComplete();
7782
}

‎core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStop.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@ public class SyncopeCoreStop extends KeymasterStop implements Ordered {
3737
private static final Logger LOG = LoggerFactory.getLogger(SyncopeCoreStop.class);
3838

3939
private final DomainHolder<?> domainHolder;
40+
41+
private final boolean enableAutoRegistration;
4042

41-
public SyncopeCoreStop(final DomainHolder<?> domainHolder) {
43+
public SyncopeCoreStop(final DomainHolder<?> domainHolder, final boolean enableAutoRegistration) {
4244
super(NetworkService.Type.CORE);
4345
this.domainHolder = domainHolder;
46+
this.enableAutoRegistration = enableAutoRegistration;
4447
}
4548

4649
@Override
@@ -68,6 +71,8 @@ public void onApplicationEvent(final ContextClosedEvent event) {
6871
LOG.debug("[{}] Dispose completed", loaderName);
6972
});
7073

71-
super.onApplicationEvent(event);
74+
if (enableAutoRegistration) {
75+
super.onApplicationEvent(event);
76+
}
7277
}
7378
}

0 commit comments

Comments
 (0)