Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
af1719a3
Commit
af1719a3
authored
Mar 22, 2019
by
chaitali
Committed by
Madhan Neethiraj
Mar 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3001: fixed serialization error in AtlasClientV2.updateClassifications()
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
5b9430da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
131 additions
and
2 deletions
+131
-2
AtlasClientV2.java
...ient-v2/src/main/java/org/apache/atlas/AtlasClientV2.java
+2
-2
AtlasClientV2Test.java
...-v2/src/test/java/org.apache.atlas/AtlasClientV2Test.java
+129
-0
No files found.
client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java
View file @
af1719a3
...
...
@@ -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
);
...
...
client/client-v2/src/test/java/org.apache.atlas/AtlasClientV2Test.java
0 → 100644
View file @
af1719a3
/**
* 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 "
));
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment