Skip to content

Commit 3fa4405

Browse files
K0K0V0KK0K0V0K
committed
fix missing dependency
stabilize tests
1 parent bf4606f commit 3fa4405

File tree

8 files changed

+102
-22
lines changed

8 files changed

+102
-22
lines changed

‎hadoop-project/pom.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@
6767
<!-- jersey version -->
6868
<jersey2.version>2.46</jersey2.version>
6969

70-
<!-- eclipse persistence -->
70+
<!-- moxy version -->
7171
<eclipse-persistence.version>2.7.14</eclipse-persistence.version>
72+
<jsonapi.version>1.1.6</jsonapi.version>
73+
<json.version>1.1.4</json.version>
7274

7375
<!-- jaxb version -->
7476
<jaxb.version>2.3.9</jaxb.version>
@@ -2154,6 +2156,16 @@
21542156
<artifactId>org.eclipse.persistence.moxy</artifactId>
21552157
<version>${eclipse-persistence.version}</version>
21562158
</dependency>
2159+
<dependency>
2160+
<groupId>jakarta.json</groupId>
2161+
<artifactId>jakarta.json-api</artifactId>
2162+
<version>${jsonapi.version}</version>
2163+
</dependency>
2164+
<dependency>
2165+
<groupId>org.glassfish</groupId>
2166+
<artifactId>javax.json</artifactId>
2167+
<version>${json.version}</version>
2168+
</dependency>
21572169
<dependency>
21582170
<groupId>org.glassfish.jaxb</groupId>
21592171
<artifactId>jaxb-runtime</artifactId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,14 @@
265265
<groupId>org.eclipse.persistence</groupId>
266266
<artifactId>org.eclipse.persistence.moxy</artifactId>
267267
</dependency>
268+
<dependency>
269+
<groupId>jakarta.json</groupId>
270+
<artifactId>jakarta.json-api</artifactId>
271+
</dependency>
272+
<dependency>
273+
<groupId>org.glassfish</groupId>
274+
<artifactId>javax.json</artifactId>
275+
</dependency>
268276
<dependency>
269277
<groupId>org.mockito</groupId>
270278
<artifactId>mockito-junit-jupiter</artifactId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CredentialsInfo;
105105
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo;
106106
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo;
107+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
108+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
107109
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
108110
import org.apache.hadoop.yarn.util.Times;
109111
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
@@ -113,6 +115,7 @@
113115
import org.codehaus.jettison.json.JSONArray;
114116
import org.codehaus.jettison.json.JSONException;
115117
import org.codehaus.jettison.json.JSONObject;
118+
import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider;
116119
import org.junit.jupiter.api.AfterEach;
117120
import org.junit.jupiter.api.Timeout;
118121
import org.junit.jupiter.params.ParameterizedTest;
@@ -332,7 +335,10 @@ private WebTarget constructWebResource(WebTarget r, String... paths) {
332335
}
333336

334337
private WebTarget constructWebResource(String... paths) {
335-
WebTarget r = target();
338+
WebTarget r = target()
339+
.register(JettisonObjectProvider.App.class)
340+
.register(new IncludeRootJSONProvider())
341+
.register(new ExcludeRootJSONProvider());
336342
WebTarget ws = r.path("ws").path("v1").path("cluster");
337343
return this.constructWebResource(ws, paths);
338344
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import org.apache.hadoop.yarn.conf.YarnConfiguration;
3737
import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
3838
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
39+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
40+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
3941
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
4042
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
4143
import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo;
@@ -157,6 +159,8 @@ public void testUpdateAbsoluteHierarchyWithZeroCapacities(boolean pLegacyQueueMo
157159
updateInfo.getUpdateQueueInfo().add(b);
158160

159161
Response response = target()
162+
.register(new IncludeRootJSONProvider())
163+
.register(new ExcludeRootJSONProvider())
160164
.path("ws/v1/cluster/scheduler-conf")
161165
.queryParam("user.name", userName)
162166
.request(MediaType.APPLICATION_JSON)

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java‎

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePrefixes;
3636
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
3737
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
38+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
39+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
3840
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
3941
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
4042
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
@@ -245,7 +247,9 @@ public void testFormatSchedulerConf() throws Exception {
245247
updateInfo.getUpdateQueueInfo().add(stoppedInfo);
246248

247249
// Add a queue root.formattest to the existing three queues
248-
WebTarget r = target();
250+
WebTarget r = target()
251+
.register(new IncludeRootJSONProvider())
252+
.register(new ExcludeRootJSONProvider());
249253
Response response = r.path("ws").path("v1").path("cluster")
250254
.path("scheduler-conf").queryParam("user.name", userName)
251255
.request(MediaType.APPLICATION_JSON)
@@ -290,7 +294,9 @@ public void testAddNestedQueue() throws Exception {
290294
assertNotNull(orgConf);
291295
assertEquals(4, orgConf.getQueues(ROOT).size());
292296

293-
WebTarget r = target();
297+
WebTarget r = target()
298+
.register(new IncludeRootJSONProvider())
299+
.register(new ExcludeRootJSONProvider());
294300

295301
Response response;
296302

@@ -335,7 +341,9 @@ public void testAddNestedQueue() throws Exception {
335341

336342
@Test
337343
public void testAddWithUpdate() throws Exception {
338-
WebTarget r = target();
344+
WebTarget r = target()
345+
.register(new IncludeRootJSONProvider())
346+
.register(new ExcludeRootJSONProvider());
339347

340348
Response response;
341349

@@ -365,7 +373,9 @@ public void testAddWithUpdate() throws Exception {
365373

366374
@Test
367375
public void testUnsetParentQueueOrderingPolicy() throws Exception {
368-
WebTarget r = target();
376+
WebTarget r = target()
377+
.register(new IncludeRootJSONProvider())
378+
.register(new ExcludeRootJSONProvider());
369379
Response response;
370380

371381
// Update ordering policy of Leaf Queue root.b to fair
@@ -412,7 +422,9 @@ public void testUnsetParentQueueOrderingPolicy() throws Exception {
412422

413423
@Test
414424
public void testUnsetLeafQueueOrderingPolicy() throws Exception {
415-
WebTarget r = target();
425+
WebTarget r = target()
426+
.register(new IncludeRootJSONProvider())
427+
.register(new ExcludeRootJSONProvider());
416428
Response response;
417429

418430
// Update ordering policy of Parent Queue root.c to priority-utilization
@@ -456,7 +468,9 @@ public void testUnsetLeafQueueOrderingPolicy() throws Exception {
456468

457469
@Test
458470
public void testRemoveQueue() throws Exception {
459-
WebTarget r = target();
471+
WebTarget r = target()
472+
.register(new IncludeRootJSONProvider())
473+
.register(new ExcludeRootJSONProvider());
460474

461475
Response response;
462476

@@ -482,7 +496,9 @@ public void testRemoveQueue() throws Exception {
482496

483497
@Test
484498
public void testStopWithRemoveQueue() throws Exception {
485-
WebTarget r = target();
499+
WebTarget r = target()
500+
.register(new IncludeRootJSONProvider())
501+
.register(new ExcludeRootJSONProvider());
486502

487503
Response response;
488504

@@ -511,7 +527,9 @@ public void testStopWithRemoveQueue() throws Exception {
511527

512528
@Test
513529
public void testRemoveQueueWhichHasQueueMapping() throws Exception {
514-
WebTarget r = target();
530+
WebTarget r = target()
531+
.register(new IncludeRootJSONProvider())
532+
.register(new ExcludeRootJSONProvider());
515533

516534
Response response;
517535
CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler();
@@ -550,7 +568,9 @@ public void testRemoveQueueWhichHasQueueMapping() throws Exception {
550568

551569
@Test
552570
public void testStopWithConvertLeafToParentQueue() throws Exception {
553-
WebTarget r = target();
571+
WebTarget r = target()
572+
.register(new IncludeRootJSONProvider())
573+
.register(new ExcludeRootJSONProvider());
554574
Response response;
555575

556576
// Set state of queues to STOPPED.
@@ -581,7 +601,9 @@ public void testStopWithConvertLeafToParentQueue() throws Exception {
581601

582602
@Test
583603
public void testRemoveParentQueue() throws Exception {
584-
WebTarget r = target();
604+
WebTarget r = target()
605+
.register(new IncludeRootJSONProvider())
606+
.register(new ExcludeRootJSONProvider());
585607

586608
Response response;
587609

@@ -604,7 +626,9 @@ public void testRemoveParentQueue() throws Exception {
604626

605627
@Test
606628
public void testRemoveParentQueueWithCapacity() throws Exception {
607-
WebTarget r = target();
629+
WebTarget r = target()
630+
.register(new IncludeRootJSONProvider())
631+
.register(new ExcludeRootJSONProvider());
608632

609633
Response response;
610634

@@ -634,7 +658,9 @@ public void testRemoveParentQueueWithCapacity() throws Exception {
634658

635659
@Test
636660
public void testRemoveMultipleQueues() throws Exception {
637-
WebTarget r = target();
661+
WebTarget r = target()
662+
.register(new IncludeRootJSONProvider())
663+
.register(new ExcludeRootJSONProvider());
638664

639665
Response response;
640666

@@ -661,7 +687,9 @@ public void testRemoveMultipleQueues() throws Exception {
661687
}
662688

663689
private void stopQueue(QueuePath... queuePaths) throws Exception {
664-
WebTarget r = target();
690+
WebTarget r = target()
691+
.register(new IncludeRootJSONProvider())
692+
.register(new ExcludeRootJSONProvider());
665693

666694
Response response;
667695

@@ -689,7 +717,9 @@ private void stopQueue(QueuePath... queuePaths) throws Exception {
689717

690718
@Test
691719
public void testUpdateQueue() throws Exception {
692-
WebTarget r = target();
720+
WebTarget r = target()
721+
.register(new IncludeRootJSONProvider())
722+
.register(new ExcludeRootJSONProvider());
693723

694724
Response response;
695725

@@ -740,7 +770,9 @@ public void testUpdateQueue() throws Exception {
740770

741771
@Test
742772
public void testUpdateQueueCapacity() throws Exception {
743-
WebTarget r = target();
773+
WebTarget r = target()
774+
.register(new IncludeRootJSONProvider())
775+
.register(new ExcludeRootJSONProvider());
744776

745777
Response response;
746778

@@ -767,7 +799,9 @@ public void testUpdateQueueCapacity() throws Exception {
767799

768800
@Test
769801
public void testGlobalConfChange() throws Exception {
770-
WebTarget r = target();
802+
WebTarget r = target()
803+
.register(new IncludeRootJSONProvider())
804+
.register(new ExcludeRootJSONProvider());
771805

772806
Response response;
773807

@@ -804,7 +838,9 @@ public void testGlobalConfChange() throws Exception {
804838

805839
@Test
806840
public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception {
807-
WebTarget r = target();
841+
WebTarget r = target()
842+
.register(new IncludeRootJSONProvider())
843+
.register(new ExcludeRootJSONProvider());
808844
Response response;
809845

810846
// 1. Create Node Label: label1
@@ -1007,7 +1043,9 @@ private String getAccessibleNodeLabelsMaxCapacityPropertyName(String label) {
10071043

10081044
@Test
10091045
public void testValidateWithClusterMaxAllocation() throws Exception {
1010-
WebTarget r = target();
1046+
WebTarget r = target()
1047+
.register(new IncludeRootJSONProvider())
1048+
.register(new ExcludeRootJSONProvider());
10111049
int clusterMax = YarnConfiguration.
10121050
DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB * 2;
10131051
conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB,

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry;
6161
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
6262
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
63+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
64+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
6365
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
6466
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
6567
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
@@ -162,8 +164,10 @@ public TestRMWebServicesNodeLabels() {
162164
}
163165

164166
private WebTarget getClusterWebResource() {
165-
return targetWithJsonObject().
166-
path(PATH_WS).path(PATH_V1).path(PATH_CLUSTER);
167+
return targetWithJsonObject()
168+
.register(new IncludeRootJSONProvider())
169+
.register(new ExcludeRootJSONProvider())
170+
.path(PATH_WS).path(PATH_V1).path(PATH_CLUSTER);
167171
}
168172

169173
private Response get(String path) {

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
8989
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
9090
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
91+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
92+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
9193
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
9294
import org.apache.hadoop.yarn.util.Records;
9395
import org.apache.hadoop.yarn.util.RackResolver;
@@ -96,6 +98,8 @@
9698
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
9799
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
98100
import org.apache.hadoop.yarn.webapp.WebServicesTestUtils;
101+
102+
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
99103
import org.codehaus.jettison.json.JSONArray;
100104
import org.codehaus.jettison.json.JSONException;
101105
import org.codehaus.jettison.json.JSONObject;
@@ -744,6 +748,8 @@ public void testNodesResourceUtilization() throws JSONException, Exception {
744748
@Test
745749
public void testUpdateNodeResource() throws Exception {
746750
WebTarget r = targetWithJsonObject()
751+
.register(new IncludeRootJSONProvider())
752+
.register(new ExcludeRootJSONProvider())
747753
.path(RMWSConsts.RM_WEB_SERVICE_PATH);
748754

749755
r = r.queryParam("user.name", userName);

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant;
3131
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState;
3232
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
33+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider;
34+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider;
3335
import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature;
3436
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
3537
import org.apache.hadoop.yarn.webapp.JerseyTestBase;

0 commit comments

Comments
 (0)