Skip to content

Commit

Permalink
Merge pull request odpi#6890 from mandy-chessell/egeria-code
Browse files Browse the repository at this point in the history 
Better Javadoc and REST URL specification
  • Loading branch information
@mandy-chessell
mandy-chessell authored Sep 9, 2022
2 parents 4f85b63 + c097782 commit b7c08f4
Show file tree
Hide file tree
Showing 116 changed files with 5,269 additions and 3,518 deletions.
13 changes: 11 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,18 @@ allprojects {
task findDependency(type: DependencyInsightReportTask) {}

// Whilst all modules have their own javadoc, we only build
// an aggregate for the client and API modules
// an aggregate for the client and API modules plus the REST calls
javadoc {
include ( "**/api/*.java" )
include ( "**/client/*.java" )
include ( "**/clients/*.java" )
include ( "**/properties/*.java" )
include ( "**/metadataelements/*.java" )
include ( "**/metadataelement/*.java" )
include ( "**/events/*.java" )
include ( "**/rest/*.java" )
include ( "**/exceptions/*.java" )
include ( "**/beans/*.java" )
include ( "**/ffdc/*.java" )
include ( "**/configuration/*.java" )
include ( "**/configuration/registration/*.java" )
Expand All @@ -360,6 +364,7 @@ allprojects {
include ( "**/connector/*.java" )
include ( "**/frameworks/*.java" )
include ( "**/context/*.java" )
include ( "**/contextmanager/*.java" )
include ( "**/graph/*.java" )
include ( "**/model/*.java" )
include ( "**/auditlog/*.java" )
Expand All @@ -371,10 +376,14 @@ allprojects {
include ( "**/repositoryconnector/*.java" )
include ( "**/repositoryeventmapper/*.java" )
include ( "**/metadatacollectionstore/*.java" )
include ( "**/metadatacollectionstore/instances/*.java" )
include ( "**/metadatacollectionstore/typedefs/*.java" )
include ( "**/metadatacollectionstore/search/*.java" )
include ( "**/metadatacollectionstore/utilities/*.java" )
include ( "**/archiveutilities/*.java" )
include ( "**/clients/*.java" )
include ( "**/metadatasecurity/*.java" )
include ( "**/spring/*.java" )
include ( "**/frameworks/**/*.java" )
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...rg/odpi/openmetadata/accessservices/assetcatalog/eventclient/AssetCatalogEventClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ public void registerListener(String userId,
final String methodName = "registerListener";
final String nameParameter = "listener";

final String urlTemplate = "/servers/{0}/open-metadata/access-services/asset-catalog/users/{1}/topics/out-topic-connection/{2}";
final String urlTemplate = serverPlatformURLRoot + "/servers/{0}/open-metadata/access-services/asset-catalog/users/{1}/topics/out-topic-connection/{2}";

invalidParameterHandler.validateUserId(userId, methodName);
invalidParameterHandler.validateObject(listener, nameParameter, methodName);

ConnectionResponse restResult = restClient.callOCFConnectionGetRESTCall(methodName,
serverPlatformURLRoot + urlTemplate,
urlTemplate,
serverName,
userId,
callerId);
Expand Down
310 changes: 70 additions & 240 deletions ...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...a/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumerEventClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void registerListener(String userId,
final String nameParameter = "listener";
final String callerIdParameter = "callerId";

final String urlTemplate = "/servers/{0}/open-metadata/access-services/asset-consumer/users/{1}/topics/out-topic-connection/{2}";
final String urlTemplate = serverPlatformURLRoot + "/servers/{0}/open-metadata/access-services/asset-consumer/users/{1}/topics/out-topic-connection/{2}";

invalidParameterHandler.validateUserId(userId, methodName);
invalidParameterHandler.validateObject(listener, nameParameter, methodName);
Expand All @@ -128,7 +128,7 @@ public void registerListener(String userId,
* event bus.
*/
ConnectionResponse restResult = restClient.callOCFConnectionGetRESTCall(methodName,
serverPlatformURLRoot + urlTemplate,
urlTemplate,
serverName,
userId,
callerId);
Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/odpi/openmetadata/accessservices/assetmanager/client/AssetManagerEventClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void registerListener(String userId,
final String nameParameter = "listener";
final String callerIdParameter = "callerId";

final String urlTemplate = "/servers/{0}/open-metadata/access-services/asset-manager/users/{1}/topics/out-topic-connection/{2}";
final String urlTemplate = serverPlatformURLRoot + "/servers/{0}/open-metadata/access-services/asset-manager/users/{1}/topics/out-topic-connection/{2}";

invalidParameterHandler.validateUserId(userId, methodName);
invalidParameterHandler.validateObject(listener, nameParameter, methodName);
Expand All @@ -128,7 +128,7 @@ public void registerListener(String userId,
* event bus.
*/
ConnectionResponse restResult = restClient.callOCFConnectionGetRESTCall(methodName,
serverPlatformURLRoot + urlTemplate,
urlTemplate,
serverName,
userId,
callerId);
Expand Down
Loading

0 comments on commit b7c08f4

Please sign in to comment.