Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: Findbugs fixes
......................................................................
aaa: Findbugs fixes
Change-Id: I34674920d96ae447e15b96ccc26009f075e85ca3
topic: AAA
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
A backend/manager/modules/builtin-extensions/exclude-filters.xml
M backend/manager/modules/builtin-extensions/pom.xml
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsConfiguration.java
6 files changed, 109 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/25781/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
index 90e716f..c1eb7f4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
@@ -133,7 +133,6 @@
private void createKerberosLdapAAAConfigurations() {
- List<Properties> results = new ArrayList<>();
for (String domain : Config.<String>
getValue(ConfigValues.DomainName).split("[,]", -1)) {
Properties authConfig = new Properties();
authConfig.put(ExtensionsManager.CLASS,
diff --git a/backend/manager/modules/builtin-extensions/exclude-filters.xml
b/backend/manager/modules/builtin-extensions/exclude-filters.xml
new file mode 100644
index 0000000..7c9e2a3
--- /dev/null
+++ b/backend/manager/modules/builtin-extensions/exclude-filters.xml
@@ -0,0 +1,47 @@
+<FindBugsFilter>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryDataImpl" />
+ <Method name="getFilterParameters"/>
+ <Bug code="EI"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryDataImpl" />
+ <Method name="getBaseDNParameters"/>
+ <Bug code="EI"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryDataImpl" />
+ <Method name="setFilterParameters"/>
+ <Bug code="EI2"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryDataImpl" />
+ <Method name="setBaseDNParameters"/>
+ <Bug code="EI2"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryExecution"
/>
+ <Method name="getReturningAttributes"/>
+ <Bug code="EI1"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryExecution"
/>
+ <Method name="LdapQueryExecution"/>
+ <Bug code="EI1"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryMetadataImpl"
/>
+ <Method name="getReturningAttributes"/>
+ <Bug code="EI1"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryMetadataImpl"
/>
+ <Method name="LdapQueryMetadataImpl"/>
+ <Bug code="EI2"/>
+ </Match>
+ <Match>
+ <Class
name="org.ovirt.engine.extensions.aaa.builtin.kerberosldap.LdapQueryMetadataImpl"
/>
+ <Method name="setReturningAttributes"/>
+ <Bug code="EI2"/>
+ </Match>
+</FindBugsFilter>
diff --git a/backend/manager/modules/builtin-extensions/pom.xml
b/backend/manager/modules/builtin-extensions/pom.xml
index f38f9dc..fbc60fb 100644
--- a/backend/manager/modules/builtin-extensions/pom.xml
+++ b/backend/manager/modules/builtin-extensions/pom.xml
@@ -50,4 +50,46 @@
</plugin>
</plugins>
</build>
+<profiles>
+ <profile>
+ <id>findbugs</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <!-- Optional directory to put findbugs xdoc xml
report -->
+ <excludeFilterFile>
${basedir}/exclude-filters.xml</excludeFilterFile>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>findbugs-general</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <!-- Optional directory to put findbugs xdoc xml
report -->
+ <excludeFilterFile> ${basedir}/exclude-filters.xml,
${basedir}/../../../../exclude-filters-general.xml</excludeFilterFile>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java
index 37ca21c..b5556fa 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerBase.java
@@ -1,6 +1,8 @@
package org.ovirt.engine.extensions.aaa.builtin.kerberosldap;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.ReflectionUtils;
@@ -20,14 +22,14 @@
}
private BrokerCommandBase CreateCommand(AdActionType action,
LdapBrokerBaseParameters parameters) {
+ Class type;
try {
- Class type = Class.forName(GetCommandTypeName(action));
+ type = Class.forName(GetCommandTypeName(action));
Constructor info = ReflectionUtils.findConstructor(type,
parameters.getClass());
Object tempVar = info.newInstance(parameters);
return (BrokerCommandBase) ((tempVar instanceof BrokerCommandBase)
? tempVar : null);
- }
-
- catch (Exception e) {
+ } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {
log.errorFormat("LdapBrokerCommandBase: Failed to get type
information using reflection for Action: {0}",
action);
return null;
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
index 27f4e75..982d4a6 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
@@ -22,20 +22,22 @@
import static
org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_USER;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -199,7 +201,7 @@
}
private String convertStreamToString(InputStream is) {
- return new Scanner(is).useDelimiter("\\A").next().replace("\n", "");
+ return new Scanner(is,
Charset.defaultCharset().displayName()).useDelimiter("\\A").next().replace("\n",
"");
}
public String getConfigValue(String engineConfigExecutable, String
engineConfigProperties, ConfigValues enumValue)
@@ -237,15 +239,11 @@
getConfigValue(engineConfigExecutable,
engineConfigProperties, ConfigValues.LDAPProviderTypes);
String ldapPort =
getConfigValue(engineConfigExecutable,
engineConfigProperties, ConfigValues.LDAPServerPort);
- if (ldapPort == null) {
+ if (ldapPort.equals("")) {
ldapPort = DEFAULT_LDAP_SERVER_PORT;
}
String changePasswordUrl =
getConfigValue(engineConfigExecutable,
engineConfigProperties, ConfigValues.ChangePasswordMsg);
- if (changePasswordUrl == null) {
- changePasswordUrl = "";
- }
-
configurationProvider =
new ConfigurationProvider(adUserName,
adUserPassword,
@@ -366,11 +364,10 @@
}
private String readPasswordFile(String passwordFile) throws
FileNotFoundException, IOException {
- FileReader in = new FileReader(passwordFile);
- BufferedReader bufferedReader = new BufferedReader(in);
- String readLine = bufferedReader.readLine();
- closeQuietly(in, bufferedReader);
- return readLine;
+ try (BufferedReader reader = new BufferedReader(new
InputStreamReader(new FileInputStream(passwordFile),
Charset.defaultCharset().displayName()))) {
+ String readLine = reader.readLine();
+ return readLine;
+ }
}
private String getDomainAuthMode(String domainName) {
@@ -1130,7 +1127,7 @@
ex.getMessage());
}
- try (FileWriter fw = new FileWriter(propFile)) {
+ try (BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(new
FileOutputStream(propFile), Charset.defaultCharset().displayName()))) {
fw.write(new StringBuilder()
.append(ConfigValues.AdUserName.name())
.append("=\n")
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsConfiguration.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsConfiguration.java
index 4aa8e4d..14d3dc9 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsConfiguration.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsConfiguration.java
@@ -15,7 +15,9 @@
ManageDomainsConfiguration(String confFilePath) throws Exception {
manageDomainsConf = new Properties();
- manageDomainsConf.load(new FileInputStream(confFilePath));
+ try (FileInputStream inputStream = new FileInputStream(confFilePath)) {
+ manageDomainsConf.load(inputStream);
+ }
}
public String getJaasFilePath() {
--
To view, visit http://gerrit.ovirt.org/25781
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34674920d96ae447e15b96ccc26009f075e85ca3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
