Skip to content

Commit 159dfd1

Browse files
jzheauxjzheaux
committed
Fix Formatting
1 parent ea849cd commit 159dfd1

File tree

85 files changed

+968
-648
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+968
-648
lines changed

‎core/src/main/java/org/springframework/ldap/aot/hint/LdapCoreRuntimeHints.java‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,50 @@ class LdapCoreRuntimeHints implements RuntimeHintsRegistrar {
3838

3939
@Override
4040
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
41-
hints.reflection().registerType(TypeReference.of("com.sun.jndi.ldap.LdapCtxFactory"),
42-
(builder) -> builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
43-
hints.reflection().registerType(AbstractContextSource.class, (builder) -> builder
41+
hints.reflection()
42+
.registerType(TypeReference.of("com.sun.jndi.ldap.LdapCtxFactory"),
43+
(builder) -> builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
44+
hints.reflection()
45+
.registerType(AbstractContextSource.class, (builder) -> builder
4446
.withMembers(MemberCategory.INTROSPECT_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
45-
hints.reflection().registerType(DefaultDirObjectFactory.class,
46-
(builder) -> builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
47-
hints.reflection().registerTypeIfPresent(classLoader, "javax.naming.ldap.PagedResultsControl",
48-
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
47+
hints.reflection()
48+
.registerType(DefaultDirObjectFactory.class,
49+
(builder) -> builder.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
50+
hints.reflection()
51+
.registerTypeIfPresent(classLoader, "javax.naming.ldap.PagedResultsControl",
52+
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
4953
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
50-
hints.reflection().registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.PagedResultsControl",
51-
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
54+
hints.reflection()
55+
.registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.PagedResultsControl",
56+
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
5257
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
53-
hints.reflection().registerTypeIfPresent(classLoader, "javax.naming.ldap.PagedResultsResponseControl",
54-
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
58+
hints.reflection()
59+
.registerTypeIfPresent(classLoader, "javax.naming.ldap.PagedResultsResponseControl",
60+
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
5561
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
56-
hints.reflection().registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.PagedResultsResponseControl",
57-
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
62+
hints.reflection()
63+
.registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.PagedResultsResponseControl",
64+
(builder) -> builder.onReachableType(PagedResultsDirContextProcessor.class)
5865
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
59-
hints.reflection().registerTypeIfPresent(classLoader, "javax.naming.ldap.SortControl",
60-
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
66+
hints.reflection()
67+
.registerTypeIfPresent(classLoader, "javax.naming.ldap.SortControl",
68+
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
6169
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
62-
hints.reflection().registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.SortControl",
63-
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
70+
hints.reflection()
71+
.registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.SortControl",
72+
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
6473
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
65-
hints.reflection().registerTypeIfPresent(classLoader, "javax.naming.ldap.SortResponseControl",
66-
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
74+
hints.reflection()
75+
.registerTypeIfPresent(classLoader, "javax.naming.ldap.SortResponseControl",
76+
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
6777
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
68-
hints.reflection().registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.SortResponseControl",
69-
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
78+
hints.reflection()
79+
.registerTypeIfPresent(classLoader, "com.sun.jndi.ldap.ctl.SortResponseControl",
80+
(builder) -> builder.onReachableType(SortControlDirContextProcessor.class)
7081
.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
71-
hints.reflection().registerType(TypeReference.of("javax.net.ssl.SSLSocketFactory"),
72-
(builder) -> builder.withMethod("getDefault", Collections.emptyList(), ExecutableMode.INVOKE)
82+
hints.reflection()
83+
.registerType(TypeReference.of("javax.net.ssl.SSLSocketFactory"),
84+
(builder) -> builder.withMethod("getDefault", Collections.emptyList(), ExecutableMode.INVOKE)
7385
.onReachableType(TypeReference.of("com.sun.jndi.ldap.Connection")));
7486
}
7587

‎core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
177177
builder.addPropertyValue("password", password);
178178

179179
BeanDefinitionBuilder urlsBuilder = BeanDefinitionBuilder.rootBeanDefinition(UrlsFactory.class)
180-
.setFactoryMethod("urls").addConstructorArgValue(url);
180+
.setFactoryMethod("urls")
181+
.addConstructorArgValue(url);
181182

182183
builder.addPropertyValue("urls", urlsBuilder.getBeanDefinition());
183184
builder.addPropertyValue("base", ParserUtils.getString(element, ATT_BASE, ""));
@@ -215,7 +216,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
215216
BeanDefinition actualContextSourceDefinition = targetContextSourceDefinition;
216217
if (!anonymousReadOnly) {
217218
BeanDefinitionBuilder proxyBuilder = BeanDefinitionBuilder
218-
.rootBeanDefinition(TransactionAwareContextSourceProxy.class);
219+
.rootBeanDefinition(TransactionAwareContextSourceProxy.class);
219220
proxyBuilder.addConstructorArgValue(targetContextSourceDefinition);
220221
actualContextSourceDefinition = proxyBuilder.getBeanDefinition();
221222
}
@@ -306,7 +307,7 @@ private void populatePoolValidationProperties(BeanDefinitionBuilder builder, Ele
306307
builder.addPropertyValue("testWhileIdle", testWhileIdle);
307308

308309
BeanDefinitionBuilder validatorBuilder = BeanDefinitionBuilder
309-
.rootBeanDefinition(DefaultDirContextValidator.class);
310+
.rootBeanDefinition(DefaultDirContextValidator.class);
310311
validatorBuilder.addPropertyValue("base", ParserUtils.getString(element, ATT_VALIDATION_QUERY_BASE, ""));
311312
validatorBuilder.addPropertyValue("filter",
312313
ParserUtils.getString(element, ATT_VALIDATION_QUERY_FILTER, DefaultDirContextValidator.DEFAULT_FILTER));
@@ -342,7 +343,7 @@ private void populatePoolValidationProperties(BeanDefinitionBuilder builder, Ele
342343
private void populatePoolValidationProperties(BeanDefinitionBuilder builder, Element element) {
343344

344345
BeanDefinitionBuilder validatorBuilder = BeanDefinitionBuilder
345-
.rootBeanDefinition(org.springframework.ldap.pool2.validation.DefaultDirContextValidator.class);
346+
.rootBeanDefinition(org.springframework.ldap.pool2.validation.DefaultDirContextValidator.class);
346347
validatorBuilder.addPropertyValue("base", ParserUtils.getString(element, ATT_VALIDATION_QUERY_BASE, ""));
347348
validatorBuilder.addPropertyValue("filter", ParserUtils.getString(element, ATT_VALIDATION_QUERY_FILTER,
348349
org.springframework.ldap.pool2.validation.DefaultDirContextValidator.DEFAULT_FILTER));

‎core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@ public class DefaultRenamingStrategyParser implements BeanDefinitionParser {
3535
@Override
3636
public BeanDefinition parse(Element element, ParserContext parserContext) {
3737
BeanDefinitionBuilder builder = BeanDefinitionBuilder
38-
.rootBeanDefinition(DefaultTempEntryRenamingStrategy.class);
38+
.rootBeanDefinition(DefaultTempEntryRenamingStrategy.class);
3939

4040
builder.addPropertyValue("tempSuffix",
4141
ParserUtils.getString(element, ATT_TEMP_SUFFIX, DefaultTempEntryRenamingStrategy.DEFAULT_TEMP_SUFFIX));
4242

4343
AbstractBeanDefinition beanDefinition = builder.getBeanDefinition();
44-
parserContext.getContainingBeanDefinition().getPropertyValues().addPropertyValue("renamingStrategy",
45-
beanDefinition);
44+
parserContext.getContainingBeanDefinition()
45+
.getPropertyValues()
46+
.addPropertyValue("renamingStrategy", beanDefinition);
4647

4748
return beanDefinition;
4849
}

‎core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ else if (StringUtils.hasText(sessionFactoryRef)) {
101101

102102
private BeanDefinition parseDifferentSubtreeRenamingStrategy(Element element) {
103103
BeanDefinitionBuilder builder = BeanDefinitionBuilder
104-
.rootBeanDefinition(DifferentSubtreeTempEntryRenamingStrategy.class);
104+
.rootBeanDefinition(DifferentSubtreeTempEntryRenamingStrategy.class);
105105

106106
String subtreeNode = element.getAttribute(ATT_SUBTREE_NODE);
107107
Assert.hasText(subtreeNode, ATT_SUBTREE_NODE + " must be specified");
@@ -113,7 +113,7 @@ private BeanDefinition parseDifferentSubtreeRenamingStrategy(Element element) {
113113

114114
public BeanDefinition parseDefaultRenamingStrategy(Element element) {
115115
BeanDefinitionBuilder builder = BeanDefinitionBuilder
116-
.rootBeanDefinition(DefaultTempEntryRenamingStrategy.class);
116+
.rootBeanDefinition(DefaultTempEntryRenamingStrategy.class);
117117

118118
builder.addPropertyValue("tempSuffix",
119119
ParserUtils.getString(element, ATT_TEMP_SUFFIX, DefaultTempEntryRenamingStrategy.DEFAULT_TEMP_SUFFIX));

‎core/src/main/java/org/springframework/ldap/core/DefaultLdapClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,10 @@ private <S extends NameClassPair, T> Stream<T> toStream(NamingEnumeration<S> res
318318
Enumeration<S> enumeration = enumeration(results);
319319
Function<? super S, T> function = mapper.wrap(this.namingExceptionHandler);
320320
return StreamSupport
321-
.stream(Spliterators.spliteratorUnknownSize(enumeration.asIterator(), Spliterator.ORDERED), false)
322-
.map(function::apply).filter(Objects::nonNull).onClose(() -> closeNamingEnumeration(results));
321+
.stream(Spliterators.spliteratorUnknownSize(enumeration.asIterator(), Spliterator.ORDERED), false)
322+
.map(function::apply)
323+
.filter(Objects::nonNull)
324+
.onClose(() -> closeNamingEnumeration(results));
323325
}
324326

325327
private void closeContext(DirContext ctx) {
@@ -467,7 +469,7 @@ else if (identification.size() != 1) {
467469
try {
468470
String password = (this.password != null) ? new String(this.password) : null;
469471
ctx = DefaultLdapClient.this.contextSource
470-
.getContext(identification.get(0).getAbsoluteName().toString(), password);
472+
.getContext(identification.get(0).getAbsoluteName().toString(), password);
471473
return mapper.mapWithContext(ctx, identification.get(0));
472474
}
473475
finally {

‎core/src/main/java/org/springframework/ldap/core/LdapRdn.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public LdapRdn immutableLdapRdn() {
287287
mapWithImmutableRdns.put(rdnComponent.getKey(), rdnComponent.immutableLdapRdnComponent());
288288
}
289289
Map<String, LdapRdnComponent> unmodifiableMapOfImmutableRdns = Collections
290-
.unmodifiableMap(mapWithImmutableRdns);
290+
.unmodifiableMap(mapWithImmutableRdns);
291291
LdapRdn immutableRdn = new LdapRdn();
292292
immutableRdn.components = unmodifiableMapOfImmutableRdns;
293293
return immutableRdn;

‎core/src/main/java/org/springframework/ldap/core/LdapTemplate.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ public boolean authenticate(Name base, String filter, String password,
13341334

13351335
return authenticate(base, filter, password,
13361336
getDefaultSearchControls(this.defaultSearchScope, RETURN_OBJ_FLAG, null), callback, errorCallback)
1337-
.isSuccess();
1337+
.isSuccess();
13381338
}
13391339

13401340
private AuthenticationStatus authenticate(Name base, String filter, String password, SearchControls searchControls,
@@ -1572,10 +1572,11 @@ <T> Stream<T> searchForStream(LdapQuery query, Function<SearchResult, T> mapper)
15721572
return Stream.empty();
15731573
}
15741574
return StreamSupport
1575-
.stream(Spliterators.spliteratorUnknownSize(CollectionUtils.toIterator(results), Spliterator.ORDERED),
1576-
false)
1577-
.map((nameClassPair) -> unchecked(() -> mapper.apply(nameClassPair))).filter(Objects::nonNull)
1578-
.onClose(() -> closeContextAndNamingEnumeration(ctx, results));
1575+
.stream(Spliterators.spliteratorUnknownSize(CollectionUtils.toIterator(results), Spliterator.ORDERED),
1576+
false)
1577+
.map((nameClassPair) -> unchecked(() -> mapper.apply(nameClassPair)))
1578+
.filter(Objects::nonNull)
1579+
.onClose(() -> closeContextAndNamingEnumeration(ctx, results));
15791580
}
15801581

15811582
/**

‎core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ BaseLdapPathSource getBaseLdapPathSourceFromApplicationContext() {
9494
}
9595

9696
Collection<BaseLdapPathSource> beans = this.applicationContext.getBeansOfType(BaseLdapPathSource.class)
97-
.values();
97+
.values();
9898
if (beans.isEmpty()) {
9999
throw new NoSuchBeanDefinitionException("No BaseLdapPathSource implementation definition found");
100100
}

‎core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public static List<Object> lookupAttributeValues(LdapOperations ldapOperations,
333333
*/
334334
public static List<Object> lookupAttributeValues(LdapOperations ldapOperations, Name dn, String attribute) {
335335
List<Object> values = loopForAllAttributeValues(ldapOperations, dn, new String[] { attribute })
336-
.getValues(attribute);
336+
.getValues(attribute);
337337
if (values == null) {
338338
values = Collections.emptyList();
339339
}

‎core/src/main/java/org/springframework/ldap/odm/annotations/DnAttribute.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* {@link org.springframework.ldap.odm.annotations.Entry#base()} value will be used to
3333
* figure out the distinguished name of entries to create and update.
3434
* </p>
35+
*
3536
* @author Mattias Hellborg Arthursson
3637
* @since 2.0
3738
*/

0 commit comments

Comments
 (0)