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
e2392607
Commit
e2392607
authored
May 25, 2015
by
Suma Shivaprasad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed BUG-37424
parent
58e013fc
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
MetadataServiceClient.java
...ava/org/apache/hadoop/metadata/MetadataServiceClient.java
+1
-0
GraphBackedTypeStore.java
...p/metadata/repository/typestore/GraphBackedTypeStore.java
+1
-1
Servlets.java
...in/java/org/apache/hadoop/metadata/web/util/Servlets.java
+16
-2
EntityJerseyResourceIT.java
...hadoop/metadata/web/resources/EntityJerseyResourceIT.java
+3
-0
No files found.
client/src/main/java/org/apache/hadoop/metadata/MetadataServiceClient.java
View file @
e2392607
...
@@ -55,6 +55,7 @@ public class MetadataServiceClient {
...
@@ -55,6 +55,7 @@ public class MetadataServiceClient {
public
static
final
String
DEFINITION
=
"definition"
;
public
static
final
String
DEFINITION
=
"definition"
;
public
static
final
String
ERROR
=
"error"
;
public
static
final
String
ERROR
=
"error"
;
public
static
final
String
STACKTRACE
=
"stackTrace"
;
public
static
final
String
REQUEST_ID
=
"requestId"
;
public
static
final
String
REQUEST_ID
=
"requestId"
;
public
static
final
String
RESULTS
=
"results"
;
public
static
final
String
RESULTS
=
"results"
;
public
static
final
String
COUNT
=
"count"
;
public
static
final
String
COUNT
=
"count"
;
...
...
repository/src/main/java/org/apache/hadoop/metadata/repository/typestore/GraphBackedTypeStore.java
View file @
e2392607
...
@@ -188,7 +188,7 @@ public class GraphBackedTypeStore implements ITypeStore {
...
@@ -188,7 +188,7 @@ public class GraphBackedTypeStore implements ITypeStore {
break
;
break
;
default
:
default
:
throw
new
IllegalArgumentException
(
"
Unhandled type category
"
+
attrDataType
.
getTypeCategory
());
throw
new
IllegalArgumentException
(
"
Attribute cannot reference instances of type :
"
+
attrDataType
.
getTypeCategory
());
}
}
for
(
IDataType
attrType
:
attrDataTypes
)
{
for
(
IDataType
attrType
:
attrDataTypes
)
{
...
...
webapp/src/main/java/org/apache/hadoop/metadata/web/util/Servlets.java
View file @
e2392607
...
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.StringWriter
;
import
java.io.StringWriter
;
/**
/**
...
@@ -98,7 +99,20 @@ public final class Servlets {
...
@@ -98,7 +99,20 @@ public final class Servlets {
}
}
public
static
Response
getErrorResponse
(
Throwable
e
,
Response
.
Status
status
)
{
public
static
Response
getErrorResponse
(
Throwable
e
,
Response
.
Status
status
)
{
return
getErrorResponse
(
e
.
getMessage
(),
status
);
Response
response
=
getErrorResponse
(
e
.
getMessage
(),
status
);
JSONObject
responseJson
=
(
JSONObject
)
response
.
getEntity
();
try
{
responseJson
.
put
(
MetadataServiceClient
.
STACKTRACE
,
printStackTrace
(
e
));
}
catch
(
JSONException
e1
)
{
LOG
.
warn
(
"Could not construct error Json rensponse"
,
e1
);
}
return
response
;
}
private
static
String
printStackTrace
(
Throwable
t
)
{
StringWriter
sw
=
new
StringWriter
();
t
.
printStackTrace
(
new
PrintWriter
(
sw
));
return
sw
.
toString
();
}
}
public
static
Response
getErrorResponse
(
String
message
,
Response
.
Status
status
)
{
public
static
Response
getErrorResponse
(
String
message
,
Response
.
Status
status
)
{
...
@@ -108,7 +122,7 @@ public final class Servlets {
...
@@ -108,7 +122,7 @@ public final class Servlets {
errorJson
.
put
(
MetadataServiceClient
.
ERROR
,
errorEntity
);
errorJson
.
put
(
MetadataServiceClient
.
ERROR
,
errorEntity
);
errorEntity
=
errorJson
;
errorEntity
=
errorJson
;
}
catch
(
JSONException
jsonE
)
{
}
catch
(
JSONException
jsonE
)
{
LOG
.
warn
(
"Could not construct error Json rensponse"
);
LOG
.
warn
(
"Could not construct error Json rensponse"
,
jsonE
);
}
}
return
Response
return
Response
.
status
(
status
)
.
status
(
status
)
...
...
webapp/src/test/java/org/apache/hadoop/metadata/web/resources/EntityJerseyResourceIT.java
View file @
e2392607
...
@@ -199,6 +199,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
...
@@ -199,6 +199,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
JSONObject
response
=
new
JSONObject
(
responseAsString
);
JSONObject
response
=
new
JSONObject
(
responseAsString
);
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
STACKTRACE
));
}
}
@Test
(
dependsOnMethods
=
"testSubmitEntity"
)
@Test
(
dependsOnMethods
=
"testSubmitEntity"
)
...
@@ -238,6 +239,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
...
@@ -238,6 +239,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
JSONObject
response
=
new
JSONObject
(
responseAsString
);
JSONObject
response
=
new
JSONObject
(
responseAsString
);
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
STACKTRACE
));
}
}
@Test
@Test
...
@@ -395,6 +397,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
...
@@ -395,6 +397,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT {
JSONObject
response
=
new
JSONObject
(
responseAsString
);
JSONObject
response
=
new
JSONObject
(
responseAsString
);
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
ERROR
));
Assert
.
assertNotNull
(
response
.
get
(
MetadataServiceClient
.
STACKTRACE
));
}
}
private
void
createHiveTypes
()
throws
Exception
{
private
void
createHiveTypes
()
throws
Exception
{
...
...
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