You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2018/11/22 09:48:05 UTC
[ambari] branch trunk updated (50ea420 -> c36b478)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from 50ea420 [AMBARI-24914] Block Ozone datanode co-location with HDFS Datanode when added though the API (dsen) (#2623)
new 1cd9e6f AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936
new c36b478 AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 - address review comments (dlysnichenko)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/ActionResponse.java | 2 +-
.../org/apache/ambari/server/controller/ConfigurationRequest.java | 1 -
.../org/apache/ambari/server/controller/ConfigurationResponse.java | 2 --
.../java/org/apache/ambari/server/controller/ExtensionResponse.java | 2 +-
.../main/java/org/apache/ambari/server/controller/MpackRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/MpackResponse.java | 2 +-
.../main/java/org/apache/ambari/server/controller/StackResponse.java | 2 +-
.../ambari/server/controller/internal/PrivilegeResourceProvider.java | 2 +-
.../src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java | 2 +-
.../org/apache/ambari/server/orm/models/HostComponentSummary.java | 2 +-
.../server/serveraction/kerberos/CreateKeytabFilesServerAction.java | 2 +-
.../java/org/apache/ambari/server/state/ServiceComponentImpl.java | 2 +-
.../java/org/apache/ambari/server/controller/KerberosHelperTest.java | 1 -
.../ambari/server/controller/metrics/JMXPropertyProviderTest.java | 2 +-
.../test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java | 4 ++--
16 files changed, 14 insertions(+), 18 deletions(-)
[ambari] 01/02: AMBARI-24936. Fix suspicious code spotted while
working on AMBARI-24936
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 1cd9e6ffac280afaa7a7387fec47091bf17627fb
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
AuthorDate: Wed Nov 21 17:11:50 2018 +0200
AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936
---
.../java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/ActionResponse.java | 2 +-
.../java/org/apache/ambari/server/controller/ConfigurationRequest.java | 1 -
.../java/org/apache/ambari/server/controller/ConfigurationResponse.java | 2 --
.../java/org/apache/ambari/server/controller/ExtensionResponse.java | 2 +-
.../src/main/java/org/apache/ambari/server/controller/MpackRequest.java | 2 +-
.../main/java/org/apache/ambari/server/controller/MpackResponse.java | 2 +-
.../main/java/org/apache/ambari/server/controller/StackResponse.java | 2 +-
.../ambari/server/controller/internal/PrivilegeResourceProvider.java | 2 +-
.../src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java | 2 +-
.../java/org/apache/ambari/server/orm/models/HostComponentSummary.java | 2 +-
.../server/serveraction/kerberos/CreateKeytabFilesServerAction.java | 2 +-
.../main/java/org/apache/ambari/server/state/ServiceComponentImpl.java | 2 +-
.../java/org/apache/ambari/server/controller/KerberosHelperTest.java | 1 -
.../ambari/server/controller/metrics/JMXPropertyProviderTest.java | 2 +-
15 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
index ce87478..ce216d7 100644
--- a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
+++ b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/AmbariHttpWebRequest.java
@@ -316,7 +316,7 @@ public class AmbariHttpWebRequest extends WebRequest {
} else if (httpMethod.equals("DELETE")) {
requestBase = new HttpDelete(getRequestUrl());
} else {
- new RuntimeException(String.format("Unsupported HTTP method: %s", httpMethod));
+ throw new RuntimeException(String.format("Unsupported HTTP method: %s", httpMethod));
}
Map<String, String> headers = getHeaders();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
index 10af495..cbda0f5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
@@ -171,7 +171,7 @@ public class ActionResponse {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + (actionName != null ? actionName.hashCode() : 0);
result = result + (actionType != null ? actionType.hashCode() : 0);
result = result + (inputs != null ? inputs.hashCode() : 0);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
index fddc674..f0998f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
@@ -56,7 +56,6 @@ public class ConfigurationRequest {
this.configs = configs;
this.type = type;
this.tag = tag;
- this.configs = configs;
this.configsAttributes = configsAttributes;
this.includeProperties = (type != null && tag != null);
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
index 37290b8..d8f471e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
@@ -64,7 +64,6 @@ public class ConfigurationResponse {
this.type = type;
this.versionTag = versionTag;
this.version = version;
- this.configs = configs;
this.configAttributes = configAttributes;
SecretReference.replacePasswordsWithReferencesForCustomProperties(configAttributes, configs, type, version);
}
@@ -80,7 +79,6 @@ public class ConfigurationResponse {
this.type = type;
this.versionTag = versionTag;
this.version = version;
- this.configs = configs;
this.configAttributes = configAttributes;
this.propertiesTypes = propertiesTypes;
SecretReference.replacePasswordsWithReferences(propertiesTypes, configs, type, version);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionResponse.java
index 0133bbb..9286920 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionResponse.java
@@ -41,7 +41,7 @@ public class ExtensionResponse {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + getExtensionName().hashCode();
return result;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackRequest.java
index 49d0caa..3a1c79d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackRequest.java
@@ -81,7 +81,7 @@ public class MpackRequest {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + getId().hashCode();
return result;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackResponse.java
index 308a2bb..a5c40ba 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/MpackResponse.java
@@ -124,7 +124,7 @@ public class MpackResponse {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + getId().hashCode();
return result;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackResponse.java
index ab21d91..1fe3eb7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackResponse.java
@@ -40,7 +40,7 @@ public class StackResponse {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + getStackName().hashCode();
return result;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
index 97ff062..b8e145c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
@@ -491,7 +491,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes
Set<Long> resourceIds = getResourceEntities(properties).keySet();
Long resourceId = resourceIds.iterator().next();
- if (resource != null && resourceId != resource) {
+ if (resource != null && ! resourceId.equals(resource)) {
throw new AmbariException("Can't update privileges of multiple resources in one request");
}
resource = resourceId;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 72bcfdf..4cc8032 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -1574,7 +1574,7 @@ public class DBAccessorImpl implements DBAccessor {
}
builder.append(requestedColumnNames[0]);
for (int i = 1; i < requestedColumnNames.length; i++) {
- builder.append(", ").append(requestedColumnNames[1]);
+ builder.append(", ").append(requestedColumnNames[i]);
}
// Append the source table
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java
index bec1d38..5886ea7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java
@@ -117,7 +117,7 @@ public class HostComponentSummary {
@Override
public int hashCode() {
- int result = 1;
+ int result;
result = 31 + (serviceName != null ? serviceName.hashCode() : 0);
result = result + (componentName != null ? componentName.hashCode() : 0);
result = result + (hostId != null ? hostId.hashCode() : 0);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 351e861..ca906b6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -333,7 +333,7 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction {
if (LOG.isDebugEnabled()) {
LOG.warn(message, e);
} else {
- LOG.warn(message, e);
+ LOG.warn(message);
}
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index 9cfe8c8..3374521 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -468,8 +468,8 @@ public class ServiceComponentImpl implements ServiceComponent {
for (ServiceComponentHost sch : hostComponents.values()) {
if (!first) {
sb.append(" , ");
- first = false;
}
+ first = false;
sb.append("\n ");
sch.debugDump(sb);
sb.append(" ");
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 39e52ec..ba3bdb2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@ -3439,7 +3439,6 @@ public class KerberosHelperTest extends EasyMockSupport {
final Map<String, String> kerberosEnvProperties = new HashMap<>();
kerberosEnvProperties.put(KerberosHelper.KDC_TYPE, "mit-kdc");
kerberosEnvProperties.put(KerberosHelper.DEFAULT_REALM, "FOOBAR.COM");
- kerberosEnvProperties.put("manage_identities", "FOOBAR.COM");
kerberosEnvProperties.put("manage_identities",
(manageIdentities == null)
? null
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
index d256dec..6bbbb8e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
@@ -639,7 +639,7 @@ public class JMXPropertyProviderTest {
} else if (componentName.equals("DATANODE")) {
return "50075";
} else if (componentName.equals("HBASE_MASTER")) {
- if(clusterName == "c2") {
+ if(clusterName.equals("c2")) {
return "60011";
} else {
// Caters the case where 'clusterName' is null or
[ambari] 02/02: AMBARI-24936. Fix suspicious code spotted while
working on AMBARI-24936 - address review comments (dlysnichenko)
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit c36b478ab31ef6c6d9ac1194b1fe5c6a231f50ea
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
AuthorDate: Wed Nov 21 21:31:53 2018 +0200
AMBARI-24936. Fix suspicious code spotted while working on AMBARI-24936 - address review comments (dlysnichenko)
---
.../test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
index 99d463b..f591156 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
@@ -830,8 +830,8 @@ public class DBAccessorImplTest {
assertEquals(String.format("SELECT id, name FROM %s WHERE time='100'", tableName),
dbAccessor.buildQuery(tableName, new String[] {"id", "name"}, new String[] {"time"}, new String[] {"100"}));
- assertEquals(String.format("SELECT id, name FROM %s", tableName),
- dbAccessor.buildQuery(tableName, new String[] {"id", "name"}, null, null));
+ assertEquals(String.format("SELECT id, name, time FROM %s", tableName),
+ dbAccessor.buildQuery(tableName, new String[] {"id", "name", "time"}, null, null));
try {
dbAccessor.buildQuery("invalid_table_name", new String[] {"id", "name"}, new String[] {"time"}, new String[] {"100"});