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

Use context cache for imported contexts #304

Merged
merged 14 commits into from
Jan 22, 2024
Merged

Use context cache for imported contexts #304

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e9b3ee1
Use context cache for imported contexts
skodapetr Dec 29, 2023
d5418e6
Revert "Use context cache for imported contexts"
skodapetr Jan 15, 2024
67b0489
Add LRUDocumentCache
skodapetr Jan 15, 2024
7f0ab48
Remove use of var
skodapetr Jan 15, 2024
0312ab7
Remove unused field
skodapetr Jan 15, 2024
0ffe652
Update test
skodapetr Jan 15, 2024
8d6e12a
Merge branch 'main' into feature/292
skodapetr Jan 16, 2024
2779574
Remove LRUDocumentCache constrcutor
skodapetr Jan 17, 2024
ce58005
Merge branch 'feature/292' of github.com:skodapetr/titanium-json-ld i…
skodapetr Jan 17, 2024
2624cac
Merge branch 'main' into feature/292
filip26 Jan 17, 2024
5022bbd
Update cache to use equals and hashCode
skodapetr Jan 22, 2024
0cc431e
Merge branch 'feature/292' of github.com:skodapetr/titanium-json-ld i…
skodapetr Jan 22, 2024
0756e9f
Remove use of new syntax
skodapetr Jan 22, 2024
f69f925
Resolve code-style issues
skodapetr Jan 22, 2024
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
40 changes: 24 additions & 16 deletions src/main/java/com/apicatalog/jsonld/context/ActiveContextBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,27 +233,35 @@ public ActiveContext create(final JsonValue localContext, final URI baseUrl) thr
throw new JsonLdError(JsonLdErrorCode.LOADING_REMOTE_CONTEXT_FAILED);
}

final DocumentLoaderOptions loaderOptions = new DocumentLoaderOptions();
loaderOptions.setProfile(ProfileConstants.CONTEXT);
loaderOptions.setRequestProfile(Arrays.asList(loaderOptions.getProfile()));

JsonStructure importedStructure = null;
JsonValue importedStructure;
final String contextImportUriKey = contextImportUri.toString();
if (activeContext.runtime().getContextCache() != null
&& activeContext.runtime().getContextCache().containsKey(contextImportUriKey)) {
importedStructure = activeContext.runtime().getContextCache().get(contextImportUriKey);
} else {
try {
final DocumentLoaderOptions loaderOptions = new DocumentLoaderOptions();
loaderOptions.setProfile(ProfileConstants.CONTEXT);
loaderOptions.setRequestProfile(Arrays.asList(loaderOptions.getProfile()));

try {
final Document importedDocument = activeContext.runtime().getDocumentLoader().loadDocument(contextImportUri, loaderOptions);

final Document importedDocument = activeContext.runtime().getDocumentLoader().loadDocument(contextImportUri, loaderOptions);
if (importedDocument == null) {
throw new JsonLdError(JsonLdErrorCode.INVALID_REMOTE_CONTEXT, "Imported context[" + contextImportUri + "] is null.");
}

if (importedDocument == null) {
throw new JsonLdError(JsonLdErrorCode.INVALID_REMOTE_CONTEXT, "Imported context[" + contextImportUri + "] is null.");
}
importedStructure = importedDocument
.getJsonContent()
.orElseThrow(() -> new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_IMPORT_VALUE));

importedStructure = importedDocument
.getJsonContent()
.orElseThrow(() -> new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_IMPORT_VALUE));
if (activeContext.runtime().getContextCache() != null) {
activeContext.runtime().getContextCache().put(contextImportUriKey, importedStructure.asJsonObject());
}

// 5.6.5
} catch (JsonLdError e) {
throw new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_IMPORT_VALUE, e);
} catch (JsonLdError e) {
// 5.6.5
throw new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_IMPORT_VALUE, e);
}
}

// 5.6.6
Expand Down
Loading