Skip to content

Commit

Permalink
Fix up schemas
Browse files Browse the repository at this point in the history 
Signed-off-by: Mandy Chessell <[email protected]>
  • Loading branch information
@mandy-chessell
mandy-chessell committed Jul 31, 2024
1 parent 287ab57 commit 4d0868c
Show file tree
Hide file tree
Showing 42 changed files with 353 additions and 657 deletions.
34 changes: 17 additions & 17 deletions ...ient/src/main/java/org/odpi/openmetadata/accessservices/assetowner/client/AssetOwner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1870,7 +1870,7 @@ public List<SchemaAttributeElement> findSchemaAttributes(String userId,

final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/schema-attributes/by-search-string?startFrom={2}&pageSize={3}";

SchemaAttributeElementsResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
SchemaAttributesResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
requestBody,
serverName,
Expand Down Expand Up @@ -1913,14 +1913,14 @@ public List<SchemaAttributeElement> getNestedSchemaAttributes(String userId,

final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/schema-elements/{2}/schema-attributes/retrieve?startFrom={3}&pageSize={4}";

SchemaAttributeElementsResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
new EffectiveTimeQueryRequestBody(),
serverName,
userId,
parentSchemaElementGUID,
startFrom,
validatedPageSize);
SchemaAttributesResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
new EffectiveTimeQueryRequestBody(),
serverName,
userId,
parentSchemaElementGUID,
startFrom,
validatedPageSize);

return restResult.getElements();
}
Expand Down Expand Up @@ -1964,13 +1964,13 @@ public List<SchemaAttributeElement> getSchemaAttributesByName(String userId,

final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/schema-attributes/by-name?startFrom={2}&pageSize={3}";

SchemaAttributeElementsResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
requestBody,
serverName,
userId,
startFrom,
validatedPageSize);
SchemaAttributesResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
requestBody,
serverName,
userId,
startFrom,
validatedPageSize);

return restResult.getElements();
}
Expand Down Expand Up @@ -2002,7 +2002,7 @@ public SchemaAttributeElement getSchemaAttributeByGUID(String userId,

final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/schema-attributes/{2}/retrieve";

SchemaAttributeElementResponse restResult = restClient.callSchemaAttributePostRESTCall(methodName,
SchemaAttributeResponse restResult = restClient.callSchemaAttributePostRESTCall(methodName,
urlTemplate,
new EffectiveTimeQueryRequestBody(),
serverName,
Expand Down
56 changes: 28 additions & 28 deletions ...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3356,19 +3356,19 @@ public VoidResponse removeSchemaAttribute(String serverName,
* UserNotAuthorizedException the user is not authorized to issue this request
* PropertyServerException there is a problem reported in the open metadata server(s)
*/
public SchemaAttributeElementsResponse findSchemaAttributes(String serverName,
String userId,
int startFrom,
int pageSize,
SearchStringRequestBody requestBody)
public SchemaAttributesResponse findSchemaAttributes(String serverName,
String userId,
int startFrom,
int pageSize,
SearchStringRequestBody requestBody)
{
final String methodName = "findSchemaAttributes";
final String searchStringParameterName = "searchString";

RESTCallToken token = restCallLogger.logRESTCall(serverName, userId, methodName);

SchemaAttributeElementsResponse response = new SchemaAttributeElementsResponse();
AuditLog auditLog = null;
SchemaAttributesResponse response = new SchemaAttributesResponse();
AuditLog auditLog = null;

try
{
Expand Down Expand Up @@ -3423,20 +3423,20 @@ public SchemaAttributeElementsResponse findSchemaAttributes(String
* UserNotAuthorizedException the user is not authorized to issue this request
* PropertyServerException there is a problem reported in the open metadata server(s)
*/
public SchemaAttributeElementsResponse getNestedAttributes(String serverName,
String userId,
String schemaTypeGUID,
int startFrom,
int pageSize,
EffectiveTimeQueryRequestBody requestBody)
public SchemaAttributesResponse getNestedAttributes(String serverName,
String userId,
String schemaTypeGUID,
int startFrom,
int pageSize,
EffectiveTimeQueryRequestBody requestBody)
{
final String methodName = "getNestedAttributes";
final String elementGUIDParameterName = "schemaAttributeGUID";

RESTCallToken token = restCallLogger.logRESTCall(serverName, userId, methodName);

SchemaAttributeElementsResponse response = new SchemaAttributeElementsResponse();
AuditLog auditLog = null;
SchemaAttributesResponse response = new SchemaAttributesResponse();
AuditLog auditLog = null;

try
{
Expand Down Expand Up @@ -3488,18 +3488,18 @@ public SchemaAttributeElementsResponse getNestedAttributes(String
* UserNotAuthorizedException the user is not authorized to issue this request
* PropertyServerException there is a problem reported in the open metadata server(s)
*/
public SchemaAttributeElementsResponse getSchemaAttributesByName(String serverName,
String userId,
int startFrom,
int pageSize,
NameRequestBody requestBody)
public SchemaAttributesResponse getSchemaAttributesByName(String serverName,
String userId,
int startFrom,
int pageSize,
NameRequestBody requestBody)
{
final String methodName = "getSchemaAttributesByName";

RESTCallToken token = restCallLogger.logRESTCall(serverName, userId, methodName);

SchemaAttributeElementsResponse response = new SchemaAttributeElementsResponse();
AuditLog auditLog = null;
SchemaAttributesResponse response = new SchemaAttributesResponse();
AuditLog auditLog = null;

try
{
Expand Down Expand Up @@ -3551,18 +3551,18 @@ public SchemaAttributeElementsResponse getSchemaAttributesByName(String
* UserNotAuthorizedException the user is not authorized to issue this request
* PropertyServerException there is a problem reported in the open metadata server(s)
*/
public SchemaAttributeElementResponse getSchemaAttributeByGUID(String serverName,
String userId,
String schemaAttributeGUID,
EffectiveTimeQueryRequestBody requestBody)
public SchemaAttributeResponse getSchemaAttributeByGUID(String serverName,
String userId,
String schemaAttributeGUID,
EffectiveTimeQueryRequestBody requestBody)
{
final String methodName = "getSchemaAttributeByGUID";
final String guidParameterName = "schemaAttributeGUID";

RESTCallToken token = restCallLogger.logRESTCall(serverName, userId, methodName);

SchemaAttributeElementResponse response = new SchemaAttributeElementResponse();
AuditLog auditLog = null;
SchemaAttributeResponse response = new SchemaAttributeResponse();
AuditLog auditLog = null;

try
{
Expand Down
40 changes: 20 additions & 20 deletions ...ava/org/odpi/openmetadata/accessservices/assetowner/server/spring/AssetOwnerResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1059,11 +1059,11 @@ public VoidResponse removeSchemaAttribute(@PathVariable String server
*/
@PostMapping(path = "/schema-attributes/by-search-string")

public SchemaAttributeElementsResponse findSchemaAttributes(@PathVariable String serverName,
@PathVariable String userId,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody SearchStringRequestBody requestBody)
public SchemaAttributesResponse findSchemaAttributes(@PathVariable String serverName,
@PathVariable String userId,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody SearchStringRequestBody requestBody)
{
return restAPI.findSchemaAttributes(serverName, userId, startFrom, pageSize, requestBody);
}
Expand All @@ -1086,12 +1086,12 @@ public SchemaAttributeElementsResponse findSchemaAttributes(@PathVariable String
*/
@PostMapping(path = "/schema-elements/{parentSchemaElementGUID}/schema-attributes/retrieve")

public SchemaAttributeElementsResponse getNestedAttributes(@PathVariable String serverName,
@PathVariable String userId,
@PathVariable String parentSchemaElementGUID,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody EffectiveTimeQueryRequestBody requestBody)
public SchemaAttributesResponse getNestedAttributes(@PathVariable String serverName,
@PathVariable String userId,
@PathVariable String parentSchemaElementGUID,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody EffectiveTimeQueryRequestBody requestBody)
{
return restAPI.getNestedAttributes(serverName, userId, parentSchemaElementGUID, startFrom, pageSize, requestBody);
}
Expand All @@ -1114,11 +1114,11 @@ public SchemaAttributeElementsResponse getNestedAttributes(@PathVariable String
*/
@PostMapping(path = "/schema-attributes/by-name")

public SchemaAttributeElementsResponse getSchemaAttributesByName(@PathVariable String serverName,
@PathVariable String userId,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody NameRequestBody requestBody)
public SchemaAttributesResponse getSchemaAttributesByName(@PathVariable String serverName,
@PathVariable String userId,
@RequestParam int startFrom,
@RequestParam int pageSize,
@RequestBody NameRequestBody requestBody)
{
return restAPI.getSchemaAttributesByName(serverName, userId, startFrom, pageSize, requestBody);
}
Expand All @@ -1139,10 +1139,10 @@ public SchemaAttributeElementsResponse getSchemaAttributesByName(@PathVariable S
*/
@PostMapping(path = "/schema-attributes/{schemaAttributeGUID}/retrieve")

public SchemaAttributeElementResponse getSchemaAttributeByGUID(@PathVariable String serverName,
@PathVariable String userId,
@PathVariable String schemaAttributeGUID,
@RequestBody EffectiveTimeQueryRequestBody requestBody)
public SchemaAttributeResponse getSchemaAttributeByGUID(@PathVariable String serverName,
@PathVariable String userId,
@PathVariable String schemaAttributeGUID,
@RequestBody EffectiveTimeQueryRequestBody requestBody)
{
return restAPI.getSchemaAttributeByGUID(serverName, userId, schemaAttributeGUID, requestBody);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/odpi/openmetadata/accessservices/datamanager/client/SchemaManagerClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ public List<SchemaAttributeElement> findSchemaAttributes(String userId,
requestBody.setSearchString(searchString);
requestBody.setSearchStringParameterName(searchStringParameterName);

SchemaAttributeElementsResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
SchemaAttributesResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
requestBody,
serverName,
Expand Down Expand Up @@ -1503,7 +1503,7 @@ public List<SchemaAttributeElement> getSchemaAttributesByName(String userId,
requestBody.setName(name);
requestBody.setNamePropertyName(nameParameterName);

SchemaAttributeElementsResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
SchemaAttributesResponse restResult = restClient.callSchemaAttributesPostRESTCall(methodName,
urlTemplate,
requestBody,
serverName,
Expand Down
Loading

0 comments on commit 4d0868c

Please sign in to comment.