Skip to content

Commit 75fc637

Browse files
committed
YARN-11786. Upgrade hadoop-yarn-server-timelineservice-hbase-tests to Support Trunk Compilation and Remove compatible hadoop version.
1 parent 6049652 commit 75fc637

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/FlowActivityEntityListReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public List<FlowActivityEntity> readFrom(Class<List<FlowActivityEntity>> type,
7272
JsonNode jnIdentifier = jNode.get("identifier");
7373
JsonNode jnType = jnIdentifier.get("type");
7474
JsonNode jnId = jnIdentifier.get("id");
75-
TimelineEntity.Identifier identifier = new TimelineEntity.Identifier(jnType.asText(), jnId.asText());
75+
TimelineEntity.Identifier identifier =
76+
new TimelineEntity.Identifier(jnType.asText(), jnId.asText());
7677
entity.setIdentifier(identifier);
7778

7879
// Get Type

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/FlowActivityEntityReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public FlowActivityEntity readFrom(Class<FlowActivityEntity> type, Type genericT
5353
Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders,
5454
InputStream entityStream) throws IOException, WebApplicationException {
5555
try {
56-
FlowActivityEntity timelineEntity = objectMapper.readValue(entityStream, FlowActivityEntity.class);
56+
FlowActivityEntity timelineEntity =
57+
objectMapper.readValue(entityStream, FlowActivityEntity.class);
5758
return timelineEntity;
5859
} catch (Exception e) {
5960
return new FlowActivityEntity();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/FlowActivityEntitySetReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public Set<FlowActivityEntity> readFrom(Class<Set<FlowActivityEntity>> type,
7272
JsonNode jnIdentifier = jNode.get("identifier");
7373
JsonNode jnType = jnIdentifier.get("type");
7474
JsonNode jnId = jnIdentifier.get("id");
75-
TimelineEntity.Identifier identifier = new TimelineEntity.Identifier(jnType.asText(), jnId.asText());
75+
TimelineEntity.Identifier identifier =
76+
new TimelineEntity.Identifier(jnType.asText(), jnId.asText());
7677
entity.setIdentifier(identifier);
7778

7879
// Get Type

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/FlowRunEntitySetReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.lang.annotation.Annotation;
3333
import java.lang.reflect.Type;
3434
import java.util.HashSet;
35-
import java.util.Map;
3635
import java.util.Set;
3736

3837
/**

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineEntitySetReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public Set<TimelineEntity> readFrom(Class<Set<TimelineEntity>> type,
9999
JsonNode jnConfigs = jNode.get("configs");
100100
if (jnConfigs != null) {
101101
Map<String, String> configInfos =
102-
objectMapper.treeToValue(jnConfigs, Map.class);
102+
objectMapper.treeToValue(jnConfigs, Map.class);
103103
entity.setConfigs(configInfos);
104104
}
105105

0 commit comments

Comments
 (0)