You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/01/24 17:06:51 UTC
[ambari] branch branch-feature-AMBARI-22842 updated: AMBARI-22842
Use collection utils instead of jwt Collections class
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-feature-AMBARI-22842
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-22842 by this push:
new da756d0 AMBARI-22842 Use collection utils instead of jwt Collections class
da756d0 is described below
commit da756d007c3262a2a9ca84fb6e8847eadfc094b5
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Wed Jan 24 18:06:17 2018 +0100
AMBARI-22842 Use collection utils instead of jwt Collections class
---
.../org/apache/ambari/logsearch/common/LabelFallbackHandler.java | 5 ++---
.../java/org/apache/ambari/logsearch/common/PropertiesSplitter.java | 4 ++--
.../java/org/apache/ambari/logsearch/solr/ResponseDataGenerator.java | 5 ++---
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LabelFallbackHandler.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LabelFallbackHandler.java
index ee941ad..5549343 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LabelFallbackHandler.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LabelFallbackHandler.java
@@ -18,9 +18,8 @@
*/
package org.apache.ambari.logsearch.common;
-import com.google.common.annotations.VisibleForTesting;
-import io.jsonwebtoken.lang.Collections;
import org.apache.ambari.logsearch.conf.UIMappingConfig;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
@@ -69,7 +68,7 @@ public class LabelFallbackHandler {
public String fallback(String field, boolean replaceUnderscore, boolean replaceUppercaseInWord, boolean capitalizeAll, List<String> prefixesToRemove) {
String fieldWithoutPrefix = null;
- if (!Collections.isEmpty(prefixesToRemove)) {
+ if (!CollectionUtils.isEmpty(prefixesToRemove)) {
for (String prefix : prefixesToRemove) {
if (StringUtils.isNotBlank(field) && field.startsWith(prefix)) {
fieldWithoutPrefix = field.substring(prefix.length());
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/PropertiesSplitter.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/PropertiesSplitter.java
index b0ca3f2..57e33e9 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/PropertiesSplitter.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/PropertiesSplitter.java
@@ -19,7 +19,7 @@
package org.apache.ambari.logsearch.common;
import com.google.common.base.Splitter;
-import io.jsonwebtoken.lang.Collections;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import javax.inject.Named;
@@ -51,7 +51,7 @@ public class PropertiesSplitter {
for (String keyValueElement : keyValueList) {
if (StringUtils.isNotEmpty(keyValueElement)) {
List<String> keyValueElementList = parseList(keyValueElement, keyValueSeparator);
- if (!Collections.isEmpty(keyValueElementList) && keyValueElementList.size() >= 2
+ if (!CollectionUtils.isEmpty(keyValueElementList) && keyValueElementList.size() >= 2
&& StringUtils.isNotBlank(keyValueElementList.get(0))) {
resultMap.put(keyValueElementList.get(0), keyValueElementList.get(1));
}
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/ResponseDataGenerator.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/ResponseDataGenerator.java
index 9867a37..e541d53 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/ResponseDataGenerator.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/ResponseDataGenerator.java
@@ -32,7 +32,6 @@ import java.util.Map;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import io.jsonwebtoken.lang.Collections;
import org.apache.ambari.logsearch.common.LabelFallbackHandler;
import org.apache.ambari.logsearch.model.metadata.ComponentMetadata;
import org.apache.ambari.logsearch.model.metadata.ServiceComponentMetadataWrapper;
@@ -502,12 +501,12 @@ public class ResponseDataGenerator {
return new ServiceComponentMetadataWrapper(componentMetadata, groupsMetadata);
}
List<GroupCommand> groupCommands = groupResponse.getValues();
- if (Collections.isEmpty(groupCommands) || Collections.isEmpty(groupCommands.get(0).getValues())) {
+ if (CollectionUtils.isEmpty(groupCommands) || CollectionUtils.isEmpty(groupCommands.get(0).getValues())) {
return new ServiceComponentMetadataWrapper(componentMetadata, groupsMetadata);
}
List<Group> groups = groupCommands.get(0).getValues();
for (Group group : groups) {
- if (!Collections.isEmpty(group.getResult())) {
+ if (!CollectionUtils.isEmpty(group.getResult())) {
if (group.getGroupValue() != null) {
groupsMetadata.put(group.getGroupValue(), groupLabels.getOrDefault(group.getGroupValue(), null));
}
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.