parent
de560a933c
commit
3c76f81fe3
|
|
@ -73,6 +73,9 @@ public class Saml2RelyingPartyProperties {
|
|||
*/
|
||||
private final AssertingParty assertingparty = new AssertingParty();
|
||||
|
||||
/**
|
||||
* Name ID format for a relying party registration.
|
||||
*/
|
||||
private String nameIdFormat;
|
||||
|
||||
public String getEntityId() {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public interface WebHttpHandlerBuilderCustomizer {
|
|||
|
||||
/**
|
||||
* Callback to customize a {@link WebHttpHandlerBuilder} instance.
|
||||
* @param webHttpHandlerBuilder the handlerBuilder to customize
|
||||
* @param webHttpHandlerBuilder the {@link WebHttpHandlerBuilder} to customize
|
||||
*/
|
||||
void customize(WebHttpHandlerBuilder webHttpHandlerBuilder);
|
||||
|
||||
|
|
|
|||
|
|
@ -84,10 +84,6 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
|||
import org.springframework.jdbc.datasource.init.DatabasePopulator;
|
||||
import org.springframework.orm.jpa.JpaTransactionManager;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
import org.springframework.transaction.TransactionException;
|
||||
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
|
||||
import org.springframework.transaction.support.DefaultTransactionStatus;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
|
|
@ -517,61 +513,40 @@ class BatchAutoConfigurationTests {
|
|||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
protected static class BatchDataSourceConfiguration {
|
||||
static class BatchDataSourceConfiguration {
|
||||
|
||||
@Bean
|
||||
@Primary
|
||||
public DataSource normalDataSource() {
|
||||
DataSource normalDataSource() {
|
||||
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:normal").username("sa").build();
|
||||
}
|
||||
|
||||
@BatchDataSource
|
||||
@Bean
|
||||
public DataSource batchDataSource() {
|
||||
DataSource batchDataSource() {
|
||||
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:batchdatasource").username("sa").build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
protected static class BatchTransactionManagerConfiguration {
|
||||
static class BatchTransactionManagerConfiguration {
|
||||
|
||||
@Bean
|
||||
public DataSource dataSource() {
|
||||
DataSource dataSource() {
|
||||
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:database").username("sa").build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
@Primary
|
||||
public PlatformTransactionManager normalTransactionManager() {
|
||||
return new TestTransactionManager();
|
||||
PlatformTransactionManager normalTransactionManager() {
|
||||
return mock(PlatformTransactionManager.class);
|
||||
}
|
||||
|
||||
@BatchTransactionManager
|
||||
@Bean
|
||||
public PlatformTransactionManager batchTransactionManager() {
|
||||
return new TestTransactionManager();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static class TestTransactionManager extends AbstractPlatformTransactionManager {
|
||||
|
||||
@Override
|
||||
protected Object doGetTransaction() throws TransactionException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doCommit(DefaultTransactionStatus status) throws TransactionException {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
|
||||
PlatformTransactionManager batchTransactionManager() {
|
||||
return mock(PlatformTransactionManager.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1455,7 +1455,7 @@ bom {
|
|||
library("Pulsar", "3.2.2") {
|
||||
group("org.apache.pulsar") {
|
||||
imports = [
|
||||
"pulsar-bom"
|
||||
"pulsar-bom"
|
||||
]
|
||||
}
|
||||
links {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class ActiveMQClassicDockerComposeConnectionDetailsFactory
|
|||
}
|
||||
|
||||
/**
|
||||
* {@link ActiveMQConnectionDetails} backed by a {@code activemq}
|
||||
* {@link ActiveMQConnectionDetails} backed by an {@code activemq}
|
||||
* {@link RunningService}.
|
||||
*/
|
||||
static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class ActiveMQDockerComposeConnectionDetailsFactory
|
|||
}
|
||||
|
||||
/**
|
||||
* {@link ActiveMQConnectionDetails} backed by a {@code activemq}
|
||||
* {@link ActiveMQConnectionDetails} backed by an {@code activemq}
|
||||
* {@link RunningService}.
|
||||
*/
|
||||
static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails
|
||||
|
|
|
|||
Loading…
Reference in New Issue