You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2019/03/24 16:31:24 UTC
[atlas] 02/02: ATLAS-3001: fixed serialization error in
AtlasClientV2.updateClassifications()
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 40dc26e55b535b61026fee650c1c6e72ef1c2bf5
Author: chaitali <ch...@freestoneinfotech.com>
AuthorDate: Fri Mar 22 18:33:10 2019 +0530
ATLAS-3001: fixed serialization error in AtlasClientV2.updateClassifications()
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit af1719a3472d1d436d0fc685fe9f88d8a754ef94)
---
.../main/java/org/apache/atlas/AtlasClientV2.java | 4 +-
.../java/org.apache.atlas/AtlasClientV2Test.java | 129 +++++++++++++++++++++
2 files changed, 131 insertions(+), 2 deletions(-)
diff --git a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java
index 33466e5..f81a7d5 100644
--- a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java
+++ b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java
@@ -326,7 +326,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
}
public void updateClassifications(String guid, List<AtlasClassification> classifications) throws AtlasServiceException {
- callAPI(formatPathParameters(API_V2.UPDATE_CLASSIFICATIONS, guid), AtlasClassifications.class, classifications);
+ callAPI(formatPathParameters(API_V2.UPDATE_CLASSIFICATIONS, guid), (Class<?>)null, classifications);
}
public void deleteClassifications(String guid, List<AtlasClassification> classifications) throws AtlasServiceException {
@@ -486,7 +486,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
public static final API_V2 DELETE_ENTITIES_BY_GUIDS = new API_V2(ENTITY_BULK_API, HttpMethod.DELETE, Response.Status.OK);
public static final API_V2 GET_CLASSIFICATIONS = new API_V2(ENTITY_API + "guid/%s/classifications", HttpMethod.GET, Response.Status.OK);
public static final API_V2 ADD_CLASSIFICATIONS = new API_V2(ENTITY_API + "guid/%s/classifications", HttpMethod.POST, Response.Status.NO_CONTENT);
- public static final API_V2 UPDATE_CLASSIFICATIONS = new API_V2(ENTITY_API + "guid/%s/classifications", HttpMethod.PUT, Response.Status.OK);
+ public static final API_V2 UPDATE_CLASSIFICATIONS = new API_V2(ENTITY_API + "guid/%s/classifications", HttpMethod.PUT, Response.Status.NO_CONTENT);
public static final API_V2 DELETE_CLASSIFICATION = new API_V2(ENTITY_API + "guid/%s/classification/%s", HttpMethod.DELETE, Response.Status.NO_CONTENT);
public static final API_V2 LINEAGE_INFO = new API_V2(LINEAGE_URI, HttpMethod.GET, Response.Status.OK);
public static final API_V2 DSL_SEARCH = new API_V2(DSL_URI, HttpMethod.GET, Response.Status.OK);
diff --git a/client/client-v2/src/test/java/org.apache.atlas/AtlasClientV2Test.java b/client/client-v2/src/test/java/org.apache.atlas/AtlasClientV2Test.java
new file mode 100644
index 0000000..83a3391
--- /dev/null
+++ b/client/client-v2/src/test/java/org.apache.atlas/AtlasClientV2Test.java
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.atlas;
+
+
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import org.apache.atlas.model.instance.AtlasClassification;
+import org.apache.commons.configuration.Configuration;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Collections;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class AtlasClientV2Test {
+ @Mock
+ private WebResource service;
+
+ @Mock
+ private WebResource.Builder resourceBuilderMock;
+
+ @Mock
+ private Configuration configuration;
+
+
+ @BeforeMethod
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ private WebResource.Builder setupBuilder(AtlasClientV2.API_V2 api, WebResource webResource) {
+ when(webResource.path(api.getPath())).thenReturn(service);
+ when(webResource.path(api.getNormalizedPath())).thenReturn(service);
+ return getBuilder(service);
+ }
+
+
+ private WebResource.Builder getBuilder(WebResource resourceObject) {
+ when(resourceObject.getRequestBuilder()).thenReturn(resourceBuilderMock);
+ when(resourceObject.path(anyString())).thenReturn(resourceObject);
+ when(resourceBuilderMock.accept(AtlasBaseClient.JSON_MEDIA_TYPE)).thenReturn(resourceBuilderMock);
+ when(resourceBuilderMock.accept(MediaType.APPLICATION_JSON)).thenReturn(resourceBuilderMock);
+ when(resourceBuilderMock.type(AtlasBaseClient.JSON_MEDIA_TYPE)).thenReturn(resourceBuilderMock);
+ when(resourceBuilderMock.type(MediaType.MULTIPART_FORM_DATA)).thenReturn(resourceBuilderMock);
+ return resourceBuilderMock;
+ }
+
+
+ @Test
+ public void updateClassificationsShouldNotThrowExceptionIfResponseIs204() {
+
+ AtlasClientV2 atlasClient = new AtlasClientV2(service, configuration);
+
+
+ AtlasClassification atlasClassification = new AtlasClassification("Testdb");
+ atlasClassification.setEntityGuid("abb672b1-e4bd-402d-a98f-73cd8f775e2a");
+ WebResource.Builder builder = setupBuilder(AtlasClientV2.API_V2.UPDATE_CLASSIFICATIONS, service);
+
+
+ ClientResponse response = mock(ClientResponse.class);
+ when(response.getStatus()).thenReturn(Response.Status.NO_CONTENT.getStatusCode());
+
+
+ when(builder.method(anyString(), Matchers.<Class>any(), anyString())).thenReturn(response);
+
+ try {
+ atlasClient.updateClassifications("abb672b1-e4bd-402d-a98f-73cd8f775e2a", Collections.singletonList(atlasClassification));
+
+ } catch (AtlasServiceException e) {
+ Assert.fail("Failed with Exception");
+ }
+
+ }
+
+
+ @Test
+ public void updateClassificationsShouldThrowExceptionIfResponseIsNot204() {
+
+ AtlasClientV2 atlasClient = new AtlasClientV2(service, configuration);
+
+
+ AtlasClassification atlasClassification = new AtlasClassification("Testdb");
+ atlasClassification.setEntityGuid("abb672b1-e4bd-402d-a98f-73cd8f775e2a");
+ WebResource.Builder builder = setupBuilder(AtlasClientV2.API_V2.UPDATE_CLASSIFICATIONS, service);
+
+
+ ClientResponse response = mock(ClientResponse.class);
+ when(response.getStatus()).thenReturn(Response.Status.OK.getStatusCode());
+
+
+ when(builder.method(anyString(), Matchers.<Class>any(), anyString())).thenReturn(response);
+
+ try {
+ atlasClient.updateClassifications("abb672b1-e4bd-402d-a98f-73cd8f775e2a", Collections.singletonList(atlasClassification));
+ Assert.fail("Failed with Exception");
+ } catch (AtlasServiceException e) {
+ Assert.assertTrue(e.getMessage().contains(" failed with status 200 "));
+ }
+
+ }
+
+
+}
+