This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fa11ee9 (chores) Formatting fixes (#5723)
fa11ee9 is described below
commit fa11ee93444d6e798f996e9a8dd2f4dce008e37e
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Mon Jun 21 15:31:32 2021 +0200
(chores) Formatting fixes (#5723)
components: camel-ldap, camel-ldif, camel-lucene
---
.../directory/server/core/integ5/DSAnnotationProcessor.java | 4 ++--
.../directory/server/core/integ5/DirectoryExtension.java | 4 ++--
.../server/core/integ5/ServerAnnotationProcessor.java | 2 +-
.../directory/server/core/integ5/DSAnnotationProcessor.java | 4 ++--
.../directory/server/core/integ5/DirectoryExtension.java | 4 ++--
.../server/core/integ5/ServerAnnotationProcessor.java | 2 +-
.../org/apache/camel/component/lucene/LuceneConfiguration.java | 10 ++++++----
.../java/org/apache/camel/component/lucene/LuceneIndexer.java | 2 +-
8 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
index 79c5c28..0ae07da 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
@@ -350,7 +350,7 @@ public final class DSAnnotationProcessor {
Class<?> clazz,
DirectoryService service, String[] ldifFiles)
throws Exception {
- if ((ldifFiles != null) && (ldifFiles.length > 0)) {
+ if (ldifFiles != null && ldifFiles.length > 0) {
for (String ldifFile : ldifFiles) {
InputStream is = clazz.getClassLoader().getResourceAsStream(
ldifFile);
@@ -438,7 +438,7 @@ public final class DSAnnotationProcessor {
ApplyLdifs applyLdifs = desc.getAnnotation(ApplyLdifs.class);
- if ((applyLdifs != null) && (applyLdifs.value() != null)) {
+ if (applyLdifs != null && applyLdifs.value() != null) {
String[] ldifs = applyLdifs.value();
String dnStart = "dn:";
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 5852370..58718ef 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -220,7 +220,7 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
}
private long getCurrentRevision(DirectoryService dirService) throws
Exception {
- if ((dirService != null) &&
(dirService.getChangeLog().isEnabled())) {
+ if (dirService != null && dirService.getChangeLog().isEnabled()) {
long revision = dirService.getChangeLog().getCurrentRevision();
LOG.debug("Create revision {}", revision);
return revision;
@@ -233,7 +233,7 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
return;
}
ChangeLog cl = dirService.getChangeLog();
- if (cl.isEnabled() && (revision < cl.getCurrentRevision())) {
+ if (cl.isEnabled() && revision < cl.getCurrentRevision()) {
LOG.debug("Revert revision {}", revision);
dirService.revert(revision);
}
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 2aaa3ec..ae9fbca 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -155,7 +155,7 @@ public final class ServerAnnotationProcessor {
if (ntlmHandler != null) {
Class<?> ntlmProviderClass = createLdapServer.ntlmProvider();
// default value is a invalid Object.class
- if ((ntlmProviderClass != null) && (ntlmProviderClass !=
Object.class)) {
+ if (ntlmProviderClass != null && ntlmProviderClass !=
Object.class) {
try {
ntlmHandler.setNtlmProvider((NtlmProvider)
ntlmProviderClass
.getDeclaredConstructor().newInstance());
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
index 79c5c28..0ae07da 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
@@ -350,7 +350,7 @@ public final class DSAnnotationProcessor {
Class<?> clazz,
DirectoryService service, String[] ldifFiles)
throws Exception {
- if ((ldifFiles != null) && (ldifFiles.length > 0)) {
+ if (ldifFiles != null && ldifFiles.length > 0) {
for (String ldifFile : ldifFiles) {
InputStream is = clazz.getClassLoader().getResourceAsStream(
ldifFile);
@@ -438,7 +438,7 @@ public final class DSAnnotationProcessor {
ApplyLdifs applyLdifs = desc.getAnnotation(ApplyLdifs.class);
- if ((applyLdifs != null) && (applyLdifs.value() != null)) {
+ if (applyLdifs != null && applyLdifs.value() != null) {
String[] ldifs = applyLdifs.value();
String dnStart = "dn:";
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 5852370..58718ef 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -220,7 +220,7 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
}
private long getCurrentRevision(DirectoryService dirService) throws
Exception {
- if ((dirService != null) &&
(dirService.getChangeLog().isEnabled())) {
+ if (dirService != null && dirService.getChangeLog().isEnabled()) {
long revision = dirService.getChangeLog().getCurrentRevision();
LOG.debug("Create revision {}", revision);
return revision;
@@ -233,7 +233,7 @@ public class DirectoryExtension implements
BeforeAllCallback, AfterAllCallback,
return;
}
ChangeLog cl = dirService.getChangeLog();
- if (cl.isEnabled() && (revision < cl.getCurrentRevision())) {
+ if (cl.isEnabled() && revision < cl.getCurrentRevision()) {
LOG.debug("Revert revision {}", revision);
dirService.revert(revision);
}
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 2aaa3ec..ae9fbca 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -155,7 +155,7 @@ public final class ServerAnnotationProcessor {
if (ntlmHandler != null) {
Class<?> ntlmProviderClass = createLdapServer.ntlmProvider();
// default value is a invalid Object.class
- if ((ntlmProviderClass != null) && (ntlmProviderClass !=
Object.class)) {
+ if (ntlmProviderClass != null && ntlmProviderClass !=
Object.class) {
try {
ntlmHandler.setNtlmProvider((NtlmProvider)
ntlmProviderClass
.getDeclaredConstructor().newInstance());
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index 522ac2d..bc473aa 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -88,16 +88,18 @@ public class LuceneConfiguration {
}
private boolean isValidAuthority() throws URISyntaxException {
- if ((!authority.contains(":"))
- || ((authority.split(":")[0]) == null)
- || ((!authority.split(":")[1].equalsIgnoreCase("insert"))
- &&
(!authority.split(":")[1].equalsIgnoreCase("query")))) {
+ if (!authority.contains(":") || authority.split(":")[0] == null ||
insertOrQueryCheck()) {
return false;
}
return true;
}
+ private boolean insertOrQueryCheck() {
+ return !authority.split(":")[1].equalsIgnoreCase("insert")
+ && !authority.split(":")[1].equalsIgnoreCase("query");
+ }
+
private String retrieveTokenFromAuthority(String token) throws
URISyntaxException {
String retval;
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index 1952a5a..5f64ba3 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -60,7 +60,7 @@ public class LuceneIndexer {
this.setAnalyzer(analyzer);
- if ((sourceDirectory != null) && (!sourceDirectoryIndexed)) {
+ if (sourceDirectory != null && !sourceDirectoryIndexed) {
this.setSourceDirectory(sourceDirectory);
add(getSourceDirectory());
sourceDirectoryIndexed = true;
