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

HqdmObjectFactory NPE Fix #103

Merged
merged 8 commits into from
Jan 27, 2023
+6 −9
Merged

HqdmObjectFactory NPE Fix #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a4f5366
Merge pull request #1 from gchq/main
twalmsley Oct 14, 2022
cd80f2b
Merge pull request #2 from gchq/main
twalmsley Nov 4, 2022
44a643c
Merge pull request #3 from gchq/main
twalmsley Nov 11, 2022
6fd993f
Merge pull request #4 from gchq/main
twalmsley Nov 25, 2022
03fe5ee
Merge pull request #5 from gchq/main
twalmsley Dec 2, 2022
4f484a4
Merge pull request #6 from gchq/main
twalmsley Jan 13, 2023
aed706b
#102 Fix NPE in HqdmObjectFactory
twalmsley Jan 16, 2023
10c15c3
Merge branch 'main' into 102-hqdmobjectfactory-nullpointerexception
GCHQDeveloper42 Jan 27, 2023
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
8 changes: 5 additions & 3 deletions hqdm-rdf/src/main/java/uk/gov/gchq/magmacore/hqdm/rdf/HqdmObjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import uk.gov.gchq.magmacore.hqdm.exception.HqdmException;
Expand Down Expand Up @@ -65,7 +67,7 @@ public static <T extends Thing> T create(final HqdmIri hqdmType, final IRI iri)
*/
public static Thing create(final IRI iri, final List<Pair<Object, Object>> pairs) throws HqdmException {
try {
final List<IRI> iris = new ArrayList<>();
final Set<IRI> iris = new HashSet<>();
for (final Pair<Object, Object> pair : pairs.stream()
.filter(pair -> pair.getLeft().equals(RDF_TYPE))
.filter(pair -> pair.getRight().toString().startsWith(HQDM.HQDM.getNamespace()))
Expand All @@ -77,7 +79,7 @@ public static Thing create(final IRI iri, final List<Pair<Object, Object>> pairs
final Thing result;

if (iris.size() == 1) {
result = mapToThing(iris.get(0).getResource(), iri);
result = mapToThing(iris.iterator().next().getResource(), iri);
} else {
result = DynamicObjects.create(iri.toString(), Thing.class, irisToClasses(iris));
}
Expand All @@ -104,7 +106,7 @@ public static Thing create(final IRI iri, final List<Pair<Object, Object>> pairs
* @param iris List of {@link IRI}.
* @return Array of Class.
*/
private static <T extends Thing> java.lang.Class<T>[] irisToClasses(final List<IRI> iris) {
private static <T extends Thing> java.lang.Class<T>[] irisToClasses(final Set<IRI> iris) {
final List<java.lang.Class<? extends Thing>> classes = new ArrayList<>(3);

// It will be a small list so just iterate it.
Expand Down
7 changes: 1 addition & 6 deletions hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/services/DynamicObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ public static <T extends Thing, U extends Thing> U create(final String id, final
*/
public static <T extends Thing, U extends Thing> U implementInterfaces(final T thing,
final java.lang.Class<U> returnType, final java.lang.Class<T>[] classes) {
try {
return (U) Proxy.newProxyInstance(ClassServices.class.getClassLoader(), classes, new ThingHandler(thing));

} catch (final Exception e) {
return null;
}
return (U) Proxy.newProxyInstance(ClassServices.class.getClassLoader(), classes, new ThingHandler(thing));
}

/**
Expand Down