Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Graph API bug fixes. #1

Merged
merged 1 commit into from
Dec 28, 2018
Merged

Graph API bug fixes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 39 additions & 37 deletions src/main/java/com/senzing/api/server/services/EntityGraphServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import javax.json.*;
import javax.ws.rs.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

Expand Down Expand Up @@ -39,11 +40,11 @@ public SzEntityPathResponse getEntityPath(
selfLink += "?maxDegrees=" + maxDegrees;

if (fromParam != null) {
selfLink += "&from=" + urlEncode(fromParam.toString());
selfLink += "&from=" + urlEncode(fromParam);
}

if (toParam != null) {
selfLink += "&to=" + urlEncode(toParam.toString());
selfLink += "&to=" + urlEncode(toParam);
}

if (forbidAvoided) {
Expand All @@ -62,8 +63,8 @@ public SzEntityPathResponse getEntityPath(
selfLink += "?withRaw=true";
}

SzEntityIdentifier from = null;
SzEntityIdentifier to = null;
SzEntityIdentifier from;
SzEntityIdentifier to;
List<SzEntityIdentifier> avoidEntities = null;
List<String> withSources = null;
try {
Expand Down Expand Up @@ -118,9 +119,12 @@ public SzEntityPathResponse getEntityPath(

if (sourcesParam != null && sourcesParam.size() > 0) {
Set<String> dataSources = server.getDataSources();
withSources = new ArrayList<>(dataSources.size());

for (String source : withSources) {
if (!dataSources.contains(source)) {
for (String source : sourcesParam) {
if (dataSources.contains(source)) {
withSources.add(source);
} else {
throw newBadRequestException(
GET, selfLink,
"Unrecognized data source: " + source);
Expand All @@ -142,9 +146,9 @@ public SzEntityPathResponse getEntityPath(
// get the engine API and the config API
G2Engine engineApi = server.getEngineApi();

StringBuffer sb = new StringBuffer();
StringBuffer responseDataBuffer = new StringBuffer();

int result = 0;
int result;
if (from.getClass() == SzRecordId.class) {
String source1 = ((SzRecordId) from).getDataSourceCode();
String source2 = ((SzRecordId) to).getDataSourceCode();
Expand All @@ -157,7 +161,7 @@ public SzEntityPathResponse getEntityPath(
source2,
id2,
maxDegrees,
sb);
responseDataBuffer);
} else if (withSources == null) {
result = engineApi.findPathExcludingByRecordID(
source1,
Expand All @@ -167,7 +171,7 @@ public SzEntityPathResponse getEntityPath(
maxDegrees,
nativeJsonEncodeEntityIds(avoidEntities),
(forbidAvoided ? 0 : G2_FIND_PATH_PREFER_EXCLUDE),
sb);
responseDataBuffer);

} else {
result = engineApi.findPathIncludingSourceByRecordID(
Expand All @@ -179,7 +183,7 @@ public SzEntityPathResponse getEntityPath(
nativeJsonEncodeEntityIds(avoidEntities),
nativeJsonEncodeDataSources(withSources),
(forbidAvoided ? 0 : G2_FIND_PATH_PREFER_EXCLUDE),
sb);
responseDataBuffer);
}
} else {
SzEntityId id1 = (SzEntityId) from;
Expand All @@ -189,15 +193,15 @@ public SzEntityPathResponse getEntityPath(
result = engineApi.findPathByEntityID(id1.getValue(),
id2.getValue(),
maxDegrees,
sb);
responseDataBuffer);
} else if (withSources == null) {
result = engineApi.findPathExcludingByEntityID(
id1.getValue(),
id2.getValue(),
maxDegrees,
nativeJsonEncodeEntityIds(avoidEntities),
(forbidAvoided ? 0 : G2_FIND_PATH_PREFER_EXCLUDE),
sb);
responseDataBuffer);

} else {
result = engineApi.findPathIncludingSourceByEntityID(
Expand All @@ -207,7 +211,7 @@ public SzEntityPathResponse getEntityPath(
nativeJsonEncodeEntityIds(avoidEntities),
nativeJsonEncodeDataSources(withSources),
(forbidAvoided ? 0 : G2_FIND_PATH_PREFER_EXCLUDE),
sb);
responseDataBuffer);
}
}

Expand All @@ -216,12 +220,12 @@ public SzEntityPathResponse getEntityPath(
}

// parse the raw data
String rawData = sb.toString();
String rawData = responseDataBuffer.toString();
JsonObject jsonObject = JsonUtils.parseJsonObject(rawData);
SzEntityPathData entityPathData
= SzEntityPathData.parseEntityPathData(
jsonObject,
(f) -> server.getAttributeClassForFeature(f));
server::getAttributeClassForFeature);

// construct the response
SzEntityPathResponse response
Expand Down Expand Up @@ -249,30 +253,31 @@ public SzEntityPathResponse getEntityPath(
@Path("entity-networks")
public SzEntityNetworkResponse getEntityNetwork(
@QueryParam("e") List<String> entitiesParam,
@DefaultValue("5") @QueryParam("maxDegrees") int maxDegrees,
@DefaultValue("1") @QueryParam("buildOut") int buildOut,
@DefaultValue("1000") @QueryParam("buildOut") int maxEntities,
@DefaultValue("false") @QueryParam("withRaw") boolean withRaw)
@DefaultValue("5") @QueryParam("maxDegrees") int maxDegrees,
@DefaultValue("1") @QueryParam("buildOut") int buildOut,
@DefaultValue("1000") @QueryParam("maxEntities") int maxEntities,
@DefaultValue("false") @QueryParam("withRaw") boolean withRaw)
{
SzApiServer server = SzApiServer.getInstance();

return server.executeInThread(() -> {
String selfLink = server.makeLink("/entity-networks");
selfLink += "?maxDegrees=" + maxDegrees;
selfLink += "&buildOut=" + buildOut;
selfLink += "&maxEntities=" + maxEntities;
StringBuilder selfLinkBuilder = new StringBuilder(server.makeLink("/entity-networks"));
selfLinkBuilder.append("?maxDegrees=").append(maxDegrees)
.append("&buildOut=").append(buildOut)
.append("&maxEntities=").append(maxEntities);

if (entitiesParam != null && entitiesParam.size() > 0) {
selfLink += formatMultiValuedParam("&", "e", entitiesParam);
selfLinkBuilder.append(formatMultiValuedParam("&", "e", entitiesParam));
}
if (withRaw) {
selfLink += "?withRaw=true";
selfLinkBuilder.append("?withRaw=true");
}
String selfLink = selfLinkBuilder.toString();

List<SzEntityIdentifier> entities = null;
List<SzEntityIdentifier> entities;
// check for consistent entity IDs
try {
if (entitiesParam == null && entitiesParam.size() > 0) {
if (entitiesParam == null || entitiesParam.isEmpty()) {
throw newBadRequestException(
GET, selfLink,
"Parameter missing or empty: \"entities\". "
Expand All @@ -295,10 +300,10 @@ public SzEntityNetworkResponse getEntityNetwork(
"Max degrees must be greater than zero: " + maxDegrees);
}

if (buildOut < 1) {
if (buildOut < 0) {
throw newBadRequestException(
GET, selfLink,
"Build out must be greater than zero: " + buildOut);
"Build out must be zero or greater: " + buildOut);
}

if (maxEntities < 1) {
Expand All @@ -319,7 +324,7 @@ public SzEntityNetworkResponse getEntityNetwork(

StringBuffer sb = new StringBuffer();

int result = 0;
int result;

if (entities.iterator().next().getClass() == SzRecordId.class) {
result = engineApi.findNetworkByRecordID(
Expand Down Expand Up @@ -349,7 +354,7 @@ public SzEntityNetworkResponse getEntityNetwork(
SzEntityNetworkData entityNetworkData
= SzEntityNetworkData.parseEntityNetworkData(
jsonObject,
(f) -> server.getAttributeClassForFeature(f));
server::getAttributeClassForFeature);

// construct the response
SzEntityNetworkResponse response
Expand Down Expand Up @@ -378,11 +383,8 @@ public SzEntityNetworkResponse getEntityNetwork(
*
* @param entities The list of {@link SzEntityIdentifier} instances.
*/
private static boolean checkConsistent(List<SzEntityIdentifier> entities)
{
int entityCount = 0;
if (entities != null && entities.size() > 0) {
entityCount = entities.size();
private static boolean checkConsistent(List<SzEntityIdentifier> entities) {
if (entities != null && !entities.isEmpty()) {
Class idClass = null;
for (SzEntityIdentifier id : entities) {
if (idClass == null) {
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/senzing/api/server/services/ServicesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,10 @@ static String jsonEncodeEntityIds(List<SzEntityIdentifier> list)
*
* @return The JSON array string for the identifiers.
*/
static String nativeJsonEncodeEntityIds(List<SzEntityIdentifier> list)
{
static String nativeJsonEncodeEntityIds(List<SzEntityIdentifier> list) {
if (list == null) {
return null;
}
String propName = "ENTITIES";
JsonArrayBuilder jab = Json.createArrayBuilder();
for (SzEntityIdentifier id : list) {
Expand Down Expand Up @@ -356,9 +358,6 @@ static List<SzEntityIdentifier> parseEntityIdentifiers(
SzHttpMethod httpMethod,
String selfLink)
{
StringBuilder sb = new StringBuilder();
String prefix = "";

List<SzEntityIdentifier> result = new ArrayList<>(params.size());

for (String param : params) {
Expand Down