This commit is contained in:
Phillip Webb 2017-04-04 09:36:15 -07:00
parent 9374020b0e
commit ddcb5ee328
9 changed files with 16 additions and 18 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -170,7 +170,8 @@ public class ManagementServerProperties implements SecurityPrerequisite {
/** /**
* Comma-separated list of roles that can access the management endpoint. * Comma-separated list of roles that can access the management endpoint.
*/ */
private List<String> roles = new ArrayList<String>(Collections.singletonList("ADMIN")); private List<String> roles = new ArrayList<String>(
Collections.singletonList("ADMIN"));
/** /**
* Session creating policy for security use (always, never, if_required, * Session creating policy for security use (always, never, if_required,

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -103,7 +103,8 @@ public class EnvironmentMvcEndpointTests {
} }
@Test @Test
public void nestedPathWhenPlaceholderCannotBeResolvedShouldReturnUnresolvedProperty() throws Exception { public void nestedPathWhenPlaceholderCannotBeResolvedShouldReturnUnresolvedProperty()
throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("my.foo", "${my.bar}"); map.put("my.foo", "${my.bar}");
((ConfigurableEnvironment) this.context.getEnvironment()).getPropertySources() ((ConfigurableEnvironment) this.context.getEnvironment()).getPropertySources()

View File

@ -40,8 +40,7 @@ class HazelcastJCacheCustomizationConfiguration {
@Bean @Bean
public HazelcastPropertiesCustomizer hazelcastPropertiesCustomizer( public HazelcastPropertiesCustomizer hazelcastPropertiesCustomizer(
ObjectProvider<HazelcastInstance> hazelcastInstance) { ObjectProvider<HazelcastInstance> hazelcastInstance) {
return new HazelcastPropertiesCustomizer( return new HazelcastPropertiesCustomizer(hazelcastInstance.getIfUnique());
hazelcastInstance.getIfUnique());
} }
private static class HazelcastPropertiesCustomizer private static class HazelcastPropertiesCustomizer
@ -75,8 +74,8 @@ class HazelcastJCacheCustomizationConfiguration {
return config.getURI(); return config.getURI();
} }
catch (IOException ex) { catch (IOException ex) {
throw new IllegalArgumentException( throw new IllegalArgumentException("Could not get URI from " + config,
"Could not get URI from " + config, ex); ex);
} }
} }

View File

@ -1,10 +1,6 @@
<hazelcast <hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd" xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd"
xmlns="http://www.hazelcast.com/schema/config" xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<instance-name>default-instance</instance-name> <instance-name>default-instance</instance-name>
<map name="defaultCache" /> <map name="defaultCache" />
</hazelcast> </hazelcast>

View File

@ -46,6 +46,7 @@ public class UnauthenticatedAccessExample {
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {
http.antMatcher("/**").authorizeRequests().anyRequest().authenticated(); http.antMatcher("/**").authorizeRequests().anyRequest().authenticated();
} }
} }
// end::configuration[] // end::configuration[]

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.