diff --git a/core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java b/core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java index f68e5d61..93401394 100644 --- a/core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java +++ b/core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java @@ -97,7 +97,7 @@ public class MagmaCoreService { public Set findParticipantDetails(final Individual individual1, final Individual individual2, final KindOfAssociation kind, final PointInTime pointInTime) { - final Instant when = Instant.parse(pointInTime.value(HQDM.ENTITY_NAME).iterator().next().toString()); + final Instant when = Instant.parse(pointInTime.oneValue(HQDM.ENTITY_NAME)); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_PARTICIPANT_DETAILS_QUERY, individual1.getId(), @@ -113,7 +113,7 @@ public Set findParticipantDetails(final Individual individua // Map them to ParticipantDetails objects. .map(p -> { // Get the Roles of the Participant. - final Set roles = p.value(HQDM.MEMBER_OF_KIND) + final Set roles = p.values(HQDM.MEMBER_OF_KIND) .stream() .map(o -> (IRI) o) .map(roleIri -> database.get(roleIri)) @@ -171,12 +171,12 @@ public List findBySignValue( final String value, final PointInTime pointInTime) throws MagmaCoreException { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_BY_SIGN_VALUE_QUERY, @@ -212,12 +212,12 @@ public List findByPartialSignValue( final String value, final PointInTime pointInTime) throws MagmaCoreException { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_BY_PARTIAL_SIGN_VALUE_CASE_INSENSITIVE_QUERY, @@ -246,12 +246,12 @@ public List findByTypeClassAndSignPattern( final IRI pattern, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_OBJECTS_BY_TYPE_CLASS_AND_SIGN_PATTERN, @@ -278,12 +278,12 @@ public List findByTypeKindAndSignPattern( final IRI pattern, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_OBJECTS_BY_TYPE_AND_SIGN_PATTERN, @@ -305,12 +305,12 @@ public List findByTypeKindAndSignPattern( */ public List findByKindOfAssociation(final IRI kindOfAssociation, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_BY_KIND_OF_ASSOCIATION, @@ -352,12 +352,12 @@ public List findAssociated(final IRI item, final IRI kindOfAsso */ public List findAssociated(final IRI item, final IRI kindOfAssociation, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery(String.format(MagmaCoreServiceQueries.FIND_ASSOCIATED, @@ -381,12 +381,12 @@ public List findAssociated(final IRI item, final IRI kindOfAsso public List findByPartialSignAndClassCaseSensitive(final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery( @@ -413,12 +413,12 @@ public List findByPartialSignAndClassCaseSensitive(final String public List findByPartialSignAndClass(final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database .executeQuery( @@ -448,12 +448,12 @@ public List findByPartialSignByActivityReferenceAndClass(final final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database.executeQuery(String.format( MagmaCoreServiceQueries.FIND_MEMBERS_OF_CLASS_BY_ACTIVITY_AND_PARTIAL_SIGN_CASE_INSENSITIVE, @@ -482,12 +482,12 @@ public List findByPartialSignByActivityReferenceAndClassCaseSen final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database.executeQuery(String.format( MagmaCoreServiceQueries.FIND_MEMBERS_OF_CLASS_BY_ACTIVITY_AND_PARTIAL_SIGN_CASE_SENSITIVE, @@ -516,12 +516,12 @@ public List findByPartialSignCompositionAndClassCaseSensitive(f final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database.executeQuery(String.format( MagmaCoreServiceQueries.FIND_MEMBERS_OF_CLASS_BY_COMPOSITION_AND_PARTIAL_SIGN_CASE_SENSITIVE, @@ -550,12 +550,12 @@ public List findByPartialSignCompositionAndClass(final IRI whol final String text, final IRI classIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database.executeQuery(String.format( MagmaCoreServiceQueries.FIND_MEMBERS_OF_CLASS_BY_COMPOSITION_AND_PARTIAL_SIGN_CASE_INSENSITIVE, @@ -579,12 +579,12 @@ public List findByPartialSignCompositionAndClass(final IRI whol */ public List findSignsForEntity(final IRI entityIri, final PointInTime pointInTime) { - final Set pointInTimeValues = pointInTime.value(HQDM.ENTITY_NAME); - if (pointInTimeValues == null || pointInTimeValues.isEmpty()) { + final String pointInTimeValue = pointInTime.oneValue(HQDM.ENTITY_NAME); + if (pointInTimeValue == null) { return List.of(); } - final Instant when = Instant.parse(pointInTimeValues.iterator().next().toString()); + final Instant when = Instant.parse(pointInTimeValue); final QueryResultList queryResultList = database.executeQuery(String.format( MagmaCoreServiceQueries.FIND_SIGNS_FOR_ENTITY, entityIri)); @@ -915,4 +915,26 @@ public void abort() { public QueryResultList executeQuery(final String query) { return database.executeQuery(query); } + + /** + * SPARQL queries restricted to having 3 columns for the subject, predicate, and object, with any names but they must be in that order. E.g. + * SELECT ?s ?p ?o WHERE {...} order by ?s ?p ?o + * The first column must contain entity IDs. + * The second column must contain predicates. + * The third column can contain IRIs or primitive values. + * + * @param query a SELECT query {@link String} + * @return a {@link Map} of {@link IRI} to {@link Thing} + */ + public Map executeQueryForThings(final String query) { + final QueryResultList resultsList = database.executeQuery(query); + + final List things = database.toTopObjects(resultsList); + + final Map result = new HashMap<>(); + + things.forEach(t -> result.put(t.getId(), t)); + + return result; + } } diff --git a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByKindOfAssociationTest.java b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByKindOfAssociationTest.java index 7415b230..34e56555 100644 --- a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByKindOfAssociationTest.java +++ b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByKindOfAssociationTest.java @@ -66,12 +66,12 @@ public void testFindSuccess() { // This query augments its object with HQDM.VALUE predicates for the current Sign values for the // object. - final Set values = person.value(HQDM.VALUE_); + final Set values = person.values(HQDM.VALUE_); assertNotNull(values); assertEquals(1, values.size()); - final Set names = person.value(HQDM.ENTITY_NAME); + final Set names = person.values(HQDM.ENTITY_NAME); assertNotNull(names); assertEquals(1, names.size()); }); diff --git a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByTypeKindAndSignPatternTest.java b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByTypeKindAndSignPatternTest.java index 1041624a..bb2d47af 100644 --- a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByTypeKindAndSignPatternTest.java +++ b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceFindByTypeKindAndSignPatternTest.java @@ -56,7 +56,7 @@ public void testFindSuccess() { // This query augments its object with HQDM.VALUE predicates for the current Sign values for the // object. - final Set values = person.value(HQDM.VALUE_); + final Set values = person.values(HQDM.VALUE_); assertNotNull(values); assertEquals(1, values.size()); assertEquals("person1", values.iterator().next().toString()); diff --git a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceTest.java b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceTest.java index d6f603ba..0050a620 100644 --- a/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceTest.java +++ b/core/src/test/java/uk/gov/gchq/magmacore/service/MagmaCoreServiceTest.java @@ -22,6 +22,7 @@ import java.time.Instant; import java.util.List; +import java.util.Map; import java.util.Set; import org.junit.Test; @@ -120,8 +121,8 @@ public void testFindBySignSuccess() throws MagmaCoreException { assertEquals(SignPatternTestData.stateOfPerson1.getId(), personState1.getId()); assertEquals(SignPatternTestData.stateOfPerson2.getId(), personState2.getId()); - final Set parent1 = personState1.value(HQDM.TEMPORAL_PART_OF); - final Set parent2 = personState2.value(HQDM.TEMPORAL_PART_OF); + final Set parent1 = personState1.values(HQDM.TEMPORAL_PART_OF); + final Set parent2 = personState2.values(HQDM.TEMPORAL_PART_OF); // Check that the `temporal_part_of` relationship is correct. assertEquals(1, parent1.size()); @@ -388,4 +389,35 @@ public void testSparqlQuery() { assertEquals(1, result.getQueryResults().size()); assertEquals(5, result.getQueryResults().get(0).getMap().size()); } + + /** + * Check that it is possible to query for a Set of Things. + */ + @Test + public void testQueryForThingsSuccess() { + // Create an in-memory databse. + final MagmaCoreService service = MagmaCoreServiceFactory.createWithJenaDatabase(); + + // Populate some arbitrary data. + final IRI subj1 = new IRI(TEST_BASE, "subj1"); + final IRI obj1 = new IRI(TEST_BASE, "obj1"); + + new DbChangeSet( + List.of(), // no deletes + List.of(// Two creates + new DbCreateOperation(subj1, HQDM.MEMBER_OF, obj1), + new DbCreateOperation(subj1, RDFS.RDF_TYPE, HQDM.PERSON), + new DbCreateOperation(obj1, RDFS.RDF_TYPE, HQDM.CLASS_OF_PERSON) + ) + ).apply(service); + + // Query the service by joining the two statements in a single result. + final Map result = service.executeQueryForThings("SELECT ?s ?p ?o WHERE { ?s ?p ?o}"); + + // Verify the result. + assertNotNull(result); + // There should be one result record with five columns. + assertEquals(2, result.size()); + result.values().forEach(t -> assertTrue(t instanceof Thing)); + } } diff --git a/examples/src/main/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExample.java b/examples/src/main/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExample.java new file mode 100644 index 00000000..fbe42d1c --- /dev/null +++ b/examples/src/main/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExample.java @@ -0,0 +1,301 @@ +package uk.gov.gchq.magmacore.examples.functional; + +import java.time.Instant; +import java.util.UUID; +import java.util.function.Function; + +import uk.gov.gchq.magmacore.hqdm.model.Activity; +import uk.gov.gchq.magmacore.hqdm.model.ClassOfPerson; +import uk.gov.gchq.magmacore.hqdm.model.KindOfActivity; +import uk.gov.gchq.magmacore.hqdm.model.Person; +import uk.gov.gchq.magmacore.hqdm.model.PointInTime; +import uk.gov.gchq.magmacore.hqdm.model.Role; +import uk.gov.gchq.magmacore.hqdm.model.StateOfPerson; +import uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM; +import uk.gov.gchq.magmacore.hqdm.rdf.iri.IRI; +import uk.gov.gchq.magmacore.hqdm.rdf.iri.IriBase; +import uk.gov.gchq.magmacore.hqdm.rdf.iri.RDFS; +import uk.gov.gchq.magmacore.hqdm.services.ClassServices; +import uk.gov.gchq.magmacore.hqdm.services.SpatioTemporalExtentServices; +import uk.gov.gchq.magmacore.service.MagmaCoreService; +import uk.gov.gchq.magmacore.service.MagmaCoreServiceFactory; + +/** + * A Functional Programming example for using MagmaCore. + * + *

+ * The purpose of this example is to try to write a program that is more readable than the other examples. + * The {@link #main() main} method shows a clear sequence of steps carried out by the use case, and it + * should be possible to write the steps as reusable and composable functions. + *

+ */ +public class FunctionalProgrammingExample { + + /** + * A program showing how to use functional programming with MagmaCore. + */ + public static void main(final String[] args) { + + /* + * Use function composition to build up a program that we will run later. + * The program will use a Context object to keep track of entities that + * are created. All functions in the processing chain accept a Context, + * mutate it, then return it. Ideally a `record` would be used instead + * and Lombok could be used to add 'wither' methods so that the Context + * could be immutable. + */ + final Function program = + + /* + * First create a MagmaCoreService in the Context. + */ + createMagmaCoreService + + /* + * The first transaction will populate the Reference Data needed by this example. + * Normally such data will already exist in the database and this step will not + * be necessary. + */ + .andThen(beginWriteTransaction) + .andThen(populateRefData) + .andThen(commitTransaction) + + /* + * Often a program will need to look up some existing entities for Reference + * Data needed by the use case. In this case they are stored in the Context. + */ + .andThen(beginReadTransaction) + .andThen(findRefData) + .andThen(commitTransaction) + + /* + * New entities can be created making use of the Reference Data. No transaction + * is needed since the entities will be persisted at the end. + */ + .andThen(createPerson) + .andThen(createResearchActivity) + .andThen(createPersonAsParticipantInActivity) + + /* + * The last transaction persists all of the new entities. + */ + .andThen(beginWriteTransaction) + .andThen(creatEntities) + .andThen(commitTransaction); + + /* + * Now execute the program created above. + */ + final Context ctx = program.apply(new Context()); + + /* + * Check that the results are as expected. + */ + if (ctx.magmaCore.get(ctx.person.getId()) == null) { + System.err.println("Cannot find person object with IRI: " + ctx.person.getId()); + } + if (ctx.magmaCore.get(ctx.researchActivity.getId()) == null) { + System.err.println("Cannot find researchActivity object with IRI: " + ctx.researchActivity.getId()); + } + if (ctx.magmaCore.get(ctx.startOfResearch.getId()) == null) { + System.err.println("Cannot find startOfResearch object with IRI: " + ctx.startOfResearch.getId()); + } + if (ctx.magmaCore.get(ctx.stateOfPerson.getId()) == null) { + System.err.println("Cannot find stateOfPerson object with IRI: " + ctx.stateOfPerson.getId()); + } + } + + /** + * A class to hold the entities created and referenced by the use case. + * + *

+ * All fields are public for ease of access and to reduce clutter from + * adding getters and setters. Lombok could be used to generate them + * without adding clutter. + *

+ */ + private static class Context { + public MagmaCoreService magmaCore; + + // New entities to be created. + public Activity researchActivity; + public Person person; + public PointInTime startOfResearch; + public StateOfPerson stateOfPerson; + + // Ref data items. + public ClassOfPerson researchersClass; + public KindOfActivity researchActivityKind; + public Role researchRole; + } + + /** + * An IRI prefix for the example. + */ + private static final IriBase TEST_BASE = new IriBase("test", "http://example.com/test#"); + + /** + * A class name for collecting together persons who are reseaechers. + */ + private static final String RESEARCHERS_CLASS_ENTITY_NAME = "Researchers"; + + /** + * The name of a kind of activity. + */ + private static final String RESEARCH_ACTIVITY_KIND_ENTITY_NAME = "Research Activities"; + + /** + * The name of a role for participants of research activities. + */ + private static final String RESEARCHER_ROLE_ENTITY_NAME = "Researcher Role"; + + /** + * A function to create the MagmaCoreService. In this case it is an in-memory + * database for the example. + */ + private static final Function createMagmaCoreService = ctx -> { + ctx.magmaCore = MagmaCoreServiceFactory.createWithJenaDatabase(); + return ctx; + }; + + /** + * A function to persist the new entities in the database. + */ + private static final Function creatEntities = ctx -> { + ctx.magmaCore.create(ctx.person); + ctx.magmaCore.create(ctx.researchActivity); + ctx.magmaCore.create(ctx.startOfResearch); + ctx.magmaCore.create(ctx.stateOfPerson); + return ctx; + }; + + /** + * A function to find the Reference Data required by this use case. + */ + private static final Function findRefData = ctx -> { + ctx.researchActivityKind = ctx.magmaCore.findByEntityName(RESEARCH_ACTIVITY_KIND_ENTITY_NAME); + ctx.researchRole = ctx.magmaCore.findByEntityName(RESEARCHER_ROLE_ENTITY_NAME); + ctx.researchersClass = ctx.magmaCore.findByEntityName(RESEARCHERS_CLASS_ENTITY_NAME); + return ctx; + }; + + /** + * A function to create a Person. + */ + private static final Function createPerson = ctx -> { + + /* + * Create a Person. + */ + ctx.person = SpatioTemporalExtentServices + .createPerson(randomIri()); + ctx.person.addValue(HQDM.MEMBER_OF, ctx.researchersClass.getId()); + return ctx; + }; + + /** + * A function to create an Activity. + */ + private static final Function createResearchActivity = ctx -> { + /* + * Create a timestamp for use as the beginning of the axctivity. + */ + final String now = Instant.now().toString(); + + /* + * Create a PointInTime event. + */ + ctx.startOfResearch = SpatioTemporalExtentServices + .createPointInTime(randomIri()); + ctx.startOfResearch.addValue(HQDM.VALUE_, now); + + /* + * Create the Activity. + */ + ctx.researchActivity = SpatioTemporalExtentServices + .createActivity(randomIri()); + ctx.researchActivity.addValue(HQDM.BEGINNING, ctx.startOfResearch.getId()); + ctx.researchActivity.addValue(HQDM.MEMBER_OF_KIND, ctx.researchActivityKind.getId()); + return ctx; + }; + + /** + * A function to add a state of person as a participant in the research activity. + */ + private static final Function createPersonAsParticipantInActivity = ctx -> { + /* + * The state of person will be a participant in the research activity. + */ + ctx.stateOfPerson = SpatioTemporalExtentServices + .createStateOfPerson(randomIri()); + ctx.stateOfPerson.addValue(HQDM.BEGINNING, ctx.startOfResearch.getId()); + ctx.stateOfPerson.addValue(HQDM.MEMBER_OF_KIND, ctx.researchRole.getId()); + ctx.stateOfPerson.addValue(HQDM.PARTICIPANT_IN, ctx.researchActivity.getId()); + ctx.stateOfPerson.addValue(HQDM.TEMPORAL_PART_OF, ctx.person.getId()); + ctx.stateOfPerson.addValue(RDFS.RDF_TYPE, HQDM.PARTICIPANT); + + return ctx; + }; + + /** + * A utility function to generate random IRI values. + */ + private static final IRI randomIri() { + return new IRI(TEST_BASE, UUID.randomUUID().toString()); + } + + /** + * A function to populate Reference Data for the example. + */ + private static Function populateRefData = ctx -> { + + /* + * Create a Class of Person. + */ + final ClassOfPerson cop = ClassServices.createClassOfPerson(randomIri()); + cop.addValue(HQDM.ENTITY_NAME, RESEARCHERS_CLASS_ENTITY_NAME); + ctx.magmaCore.create(cop); + + /* + * Create a Kind of Activity. + */ + final KindOfActivity koa = ClassServices.createKindOfActivity(randomIri()); + koa.addValue(HQDM.ENTITY_NAME, RESEARCH_ACTIVITY_KIND_ENTITY_NAME); + ctx.magmaCore.create(koa); + + /* + * Create a Role. + */ + final Role role = ClassServices.createRole(randomIri()); + role.addValue(HQDM.ENTITY_NAME, RESEARCHER_ROLE_ENTITY_NAME); + ctx.magmaCore.create(role); + + return ctx; + }; + + /** + * A function to begin a read transaction. + */ + private static final Function beginReadTransaction = magmaCore -> { + magmaCore.magmaCore.beginWrite(); + return magmaCore; + }; + + /** + * A function to begin a write transaction. + */ + private static final Function beginWriteTransaction = magmaCore -> { + magmaCore.magmaCore.beginWrite(); + return magmaCore; + }; + + /** + * A function to commit a transaction. + */ + private static final Function commitTransaction = magmaCore -> { + magmaCore.magmaCore.commit(); + return magmaCore; + }; + +} + diff --git a/examples/src/test/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExampleTest.java b/examples/src/test/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExampleTest.java new file mode 100644 index 00000000..41833990 --- /dev/null +++ b/examples/src/test/java/uk/gov/gchq/magmacore/examples/functional/FunctionalProgrammingExampleTest.java @@ -0,0 +1,18 @@ +package uk.gov.gchq.magmacore.examples.functional; + +import org.junit.Test; + +/** + * Execute the Functional Programming example for using MagmaCore. + */ +public class FunctionalProgrammingExampleTest { + + /** + * A unit test to ensure that the FunctionalProgrammingExample code is executed as part of a build. + */ + @Test + public void test() { + FunctionalProgrammingExample.main(null); + } +} + diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AbstractObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AbstractObjectBuilder.java index 254183fd..005233d0 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AbstractObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AbstractObjectBuilder.java @@ -57,7 +57,7 @@ public final AbstractObjectBuilder member__Of(final Class clazz) { */ public AbstractObject build() throws HqdmException { if (this.abstractObject.hasValue(HQDM.MEMBER__OF) - && this.abstractObject.value(HQDM.MEMBER__OF).isEmpty()) { + && this.abstractObject.values(HQDM.MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } return this.abstractObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java index d95b0045..512302d9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java @@ -332,44 +332,44 @@ public final AcceptanceOfOfferBuilder temporal_Part_Of(final Individual individu */ public AcceptanceOfOffer build() throws HqdmException { if (this.acceptanceOfOffer.hasValue(AGGREGATED_INTO) - && this.acceptanceOfOffer.value(AGGREGATED_INTO).isEmpty()) { + && this.acceptanceOfOffer.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.acceptanceOfOffer.hasValue(BEGINNING) - && this.acceptanceOfOffer.value(BEGINNING).isEmpty()) { + && this.acceptanceOfOffer.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.acceptanceOfOffer.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.acceptanceOfOffer.hasValue(DETERMINES) - && this.acceptanceOfOffer.value(DETERMINES).isEmpty()) { + && this.acceptanceOfOffer.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.acceptanceOfOffer.hasValue(ENDING) - && this.acceptanceOfOffer.value(ENDING).isEmpty()) { + && this.acceptanceOfOffer.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.acceptanceOfOffer.hasValue(MEMBER__OF) - && this.acceptanceOfOffer.value(MEMBER__OF).isEmpty()) { + && this.acceptanceOfOffer.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.acceptanceOfOffer.hasValue(MEMBER_OF) - && this.acceptanceOfOffer.value(MEMBER_OF).isEmpty()) { + && this.acceptanceOfOffer.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.acceptanceOfOffer.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.acceptanceOfOffer.hasValue(PART__OF) - && this.acceptanceOfOffer.value(PART__OF).isEmpty()) { + && this.acceptanceOfOffer.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.acceptanceOfOffer.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.acceptanceOfOffer.hasValue(PART_OF_) - && this.acceptanceOfOffer.value(PART_OF_).isEmpty()) { + && this.acceptanceOfOffer.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.acceptanceOfOffer.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -379,11 +379,11 @@ public AcceptanceOfOffer build() throws HqdmException { throw new HqdmException("Property Not Set: references"); } if (this.acceptanceOfOffer.hasValue(TEMPORAL__PART_OF) - && this.acceptanceOfOffer.value(TEMPORAL__PART_OF).isEmpty()) { + && this.acceptanceOfOffer.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.acceptanceOfOffer.hasValue(TEMPORAL_PART_OF) - && this.acceptanceOfOffer.value(TEMPORAL_PART_OF).isEmpty()) { + && this.acceptanceOfOffer.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.acceptanceOfOffer; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java index 8e15b4f0..39051ebf 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java @@ -329,44 +329,44 @@ public final AcceptanceOfOfferForGoodsBuilder temporal_Part_Of(final Individual */ public AcceptanceOfOfferForGoods build() throws HqdmException { if (this.acceptanceOfOfferForGoods.hasValue(AGGREGATED_INTO) - && this.acceptanceOfOfferForGoods.value(AGGREGATED_INTO).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.acceptanceOfOfferForGoods.hasValue(BEGINNING) - && this.acceptanceOfOfferForGoods.value(BEGINNING).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.acceptanceOfOfferForGoods.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.acceptanceOfOfferForGoods.hasValue(DETERMINES) - && this.acceptanceOfOfferForGoods.value(DETERMINES).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.acceptanceOfOfferForGoods.hasValue(ENDING) - && this.acceptanceOfOfferForGoods.value(ENDING).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.acceptanceOfOfferForGoods.hasValue(MEMBER__OF) - && this.acceptanceOfOfferForGoods.value(MEMBER__OF).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.acceptanceOfOfferForGoods.hasValue(MEMBER_OF) - && this.acceptanceOfOfferForGoods.value(MEMBER_OF).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.acceptanceOfOfferForGoods.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.acceptanceOfOfferForGoods.hasValue(PART__OF) - && this.acceptanceOfOfferForGoods.value(PART__OF).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.acceptanceOfOfferForGoods.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.acceptanceOfOfferForGoods.hasValue(PART_OF_) - && this.acceptanceOfOfferForGoods.value(PART_OF_).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.acceptanceOfOfferForGoods.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -376,11 +376,11 @@ public AcceptanceOfOfferForGoods build() throws HqdmException { throw new HqdmException("Property Not Set: references"); } if (this.acceptanceOfOfferForGoods.hasValue(TEMPORAL__PART_OF) - && this.acceptanceOfOfferForGoods.value(TEMPORAL__PART_OF).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.acceptanceOfOfferForGoods.hasValue(TEMPORAL_PART_OF) - && this.acceptanceOfOfferForGoods.value(TEMPORAL_PART_OF).isEmpty()) { + && this.acceptanceOfOfferForGoods.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.acceptanceOfOfferForGoods; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java index a6c59579..9e7148fc 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java @@ -303,56 +303,56 @@ public final ActivityBuilder temporal_Part_Of(final Individual individual) { */ public Activity build() throws HqdmException { if (this.activity.hasValue(AGGREGATED_INTO) - && this.activity.value(AGGREGATED_INTO).isEmpty()) { + && this.activity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.activity.hasValue(BEGINNING) - && this.activity.value(BEGINNING).isEmpty()) { + && this.activity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.activity.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.activity.hasValue(DETERMINES) - && this.activity.value(DETERMINES).isEmpty()) { + && this.activity.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.activity.hasValue(ENDING) - && this.activity.value(ENDING).isEmpty()) { + && this.activity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.activity.hasValue(MEMBER__OF) - && this.activity.value(MEMBER__OF).isEmpty()) { + && this.activity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.activity.hasValue(MEMBER_OF) - && this.activity.value(MEMBER_OF).isEmpty()) { + && this.activity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.activity.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.activity.hasValue(PART__OF) - && this.activity.value(PART__OF).isEmpty()) { + && this.activity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.activity.hasValue(PART_OF) - && this.activity.value(PART_OF).isEmpty()) { + && this.activity.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (!this.activity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.activity.hasValue(REFERENCES) - && this.activity.value(REFERENCES).isEmpty()) { + && this.activity.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.activity.hasValue(TEMPORAL__PART_OF) - && this.activity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.activity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.activity.hasValue(TEMPORAL_PART_OF) - && this.activity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.activity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.activity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AggregationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AggregationBuilder.java index 37301f1a..ed5a2ecb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AggregationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AggregationBuilder.java @@ -100,11 +100,11 @@ public final AggregationBuilder whole_M(final SpatioTemporalExtent spatioTempora */ public Aggregation build() throws HqdmException { if (this.aggregation.hasValue(MEMBER__OF) - && this.aggregation.value(MEMBER__OF).isEmpty()) { + && this.aggregation.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.aggregation.hasValue(MEMBER_OF) - && this.aggregation.value(MEMBER_OF).isEmpty()) { + && this.aggregation.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.aggregation.hasValue(PART)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java index 25c75f27..f55d7a7d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java @@ -338,59 +338,59 @@ public final AgreeContractBuilder temporal_Part_Of(final Individual individual) */ public AgreeContract build() throws HqdmException { if (this.agreeContract.hasValue(AGGREGATED_INTO) - && this.agreeContract.value(AGGREGATED_INTO).isEmpty()) { + && this.agreeContract.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.agreeContract.hasValue(BEGINNING) - && this.agreeContract.value(BEGINNING).isEmpty()) { + && this.agreeContract.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.agreeContract.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.agreeContract.hasValue(DETERMINES) - && this.agreeContract.value(DETERMINES).isEmpty()) { + && this.agreeContract.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.agreeContract.hasValue(ENDING) - && this.agreeContract.value(ENDING).isEmpty()) { + && this.agreeContract.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.agreeContract.hasValue(MEMBER__OF) - && this.agreeContract.value(MEMBER__OF).isEmpty()) { + && this.agreeContract.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.agreeContract.hasValue(MEMBER_OF) - && this.agreeContract.value(MEMBER_OF).isEmpty()) { + && this.agreeContract.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.agreeContract.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.agreeContract.hasValue(PART__OF) - && this.agreeContract.value(PART__OF).isEmpty()) { + && this.agreeContract.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.agreeContract.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.agreeContract.hasValue(PART_OF_) - && this.agreeContract.value(PART_OF_).isEmpty()) { + && this.agreeContract.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.agreeContract.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.agreeContract.hasValue(REFERENCES) - && this.agreeContract.value(REFERENCES).isEmpty()) { + && this.agreeContract.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.agreeContract.hasValue(TEMPORAL__PART_OF) - && this.agreeContract.value(TEMPORAL__PART_OF).isEmpty()) { + && this.agreeContract.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.agreeContract.hasValue(TEMPORAL_PART_OF) - && this.agreeContract.value(TEMPORAL_PART_OF).isEmpty()) { + && this.agreeContract.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.agreeContract; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java index c8bd1b55..ff9e0f10 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java @@ -321,59 +321,59 @@ public final AgreementExecutionBuilder temporal_Part_Of(final Individual individ */ public AgreementExecution build() throws HqdmException { if (this.agreementExecution.hasValue(AGGREGATED_INTO) - && this.agreementExecution.value(AGGREGATED_INTO).isEmpty()) { + && this.agreementExecution.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.agreementExecution.hasValue(BEGINNING) - && this.agreementExecution.value(BEGINNING).isEmpty()) { + && this.agreementExecution.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.agreementExecution.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.agreementExecution.hasValue(DETERMINES) - && this.agreementExecution.value(DETERMINES).isEmpty()) { + && this.agreementExecution.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.agreementExecution.hasValue(ENDING) - && this.agreementExecution.value(ENDING).isEmpty()) { + && this.agreementExecution.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.agreementExecution.hasValue(MEMBER__OF) - && this.agreementExecution.value(MEMBER__OF).isEmpty()) { + && this.agreementExecution.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.agreementExecution.hasValue(MEMBER_OF) - && this.agreementExecution.value(MEMBER_OF).isEmpty()) { + && this.agreementExecution.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.agreementExecution.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.agreementExecution.hasValue(PART__OF) - && this.agreementExecution.value(PART__OF).isEmpty()) { + && this.agreementExecution.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.agreementExecution.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.agreementExecution.hasValue(PART_OF_) - && this.agreementExecution.value(PART_OF_).isEmpty()) { + && this.agreementExecution.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.agreementExecution.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.agreementExecution.hasValue(REFERENCES) - && this.agreementExecution.value(REFERENCES).isEmpty()) { + && this.agreementExecution.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.agreementExecution.hasValue(TEMPORAL__PART_OF) - && this.agreementExecution.value(TEMPORAL__PART_OF).isEmpty()) { + && this.agreementExecution.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.agreementExecution.hasValue(TEMPORAL_PART_OF) - && this.agreementExecution.value(TEMPORAL_PART_OF).isEmpty()) { + && this.agreementExecution.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.agreementExecution; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java index 4f6d409b..18fc2193 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java @@ -336,60 +336,60 @@ public final AgreementProcessBuilder temporal_Part_Of(final Individual individua */ public AgreementProcess build() throws HqdmException { if (this.agreementProcess.hasValue(AGGREGATED_INTO) - && this.agreementProcess.value(AGGREGATED_INTO).isEmpty()) { + && this.agreementProcess.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.agreementProcess.hasValue(BEGINNING) - && this.agreementProcess.value(BEGINNING).isEmpty()) { + && this.agreementProcess.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.agreementProcess.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.agreementProcess.hasValue(DETERMINES) - && this.agreementProcess.value(DETERMINES).isEmpty()) { + && this.agreementProcess.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.agreementProcess.hasValue(ENDING) - && this.agreementProcess.value(ENDING).isEmpty()) { + && this.agreementProcess.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.agreementProcess.hasValue(MEMBER__OF) - && this.agreementProcess.value(MEMBER__OF).isEmpty()) { + && this.agreementProcess.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.agreementProcess.hasValue(MEMBER_OF) - && this.agreementProcess.value(MEMBER_OF).isEmpty()) { + && this.agreementProcess.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.agreementProcess.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.agreementProcess.hasValue(PART__OF) - && this.agreementProcess.value(PART__OF).isEmpty()) { + && this.agreementProcess.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.agreementProcess.hasValue(PART_OF) - && this.agreementProcess.value(PART_OF).isEmpty()) { + && this.agreementProcess.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.agreementProcess.hasValue(PART_OF_) - && this.agreementProcess.value(PART_OF_).isEmpty()) { + && this.agreementProcess.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.agreementProcess.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.agreementProcess.hasValue(REFERENCES) - && this.agreementProcess.value(REFERENCES).isEmpty()) { + && this.agreementProcess.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.agreementProcess.hasValue(TEMPORAL__PART_OF) - && this.agreementProcess.value(TEMPORAL__PART_OF).isEmpty()) { + && this.agreementProcess.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.agreementProcess.hasValue(TEMPORAL_PART_OF) - && this.agreementProcess.value(TEMPORAL_PART_OF).isEmpty()) { + && this.agreementProcess.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.agreementProcess; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java index a501f884..788c88d8 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java @@ -230,46 +230,46 @@ public final AmountOfMoneyBuilder temporal_Part_Of(final AmountOfMoney amountOfM */ public AmountOfMoney build() throws HqdmException { if (this.amountOfMoney.hasValue(AGGREGATED_INTO) - && this.amountOfMoney.value(AGGREGATED_INTO).isEmpty()) { + && this.amountOfMoney.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.amountOfMoney.hasValue(BEGINNING) - && this.amountOfMoney.value(BEGINNING).isEmpty()) { + && this.amountOfMoney.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.amountOfMoney.hasValue(ENDING) - && this.amountOfMoney.value(ENDING).isEmpty()) { + && this.amountOfMoney.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.amountOfMoney.hasValue(MEMBER__OF) - && this.amountOfMoney.value(MEMBER__OF).isEmpty()) { + && this.amountOfMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.amountOfMoney.hasValue(MEMBER_OF) - && this.amountOfMoney.value(MEMBER_OF).isEmpty()) { + && this.amountOfMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.amountOfMoney.hasValue(MEMBER_OF_CURRENCY) - && this.amountOfMoney.value(MEMBER_OF_CURRENCY).isEmpty()) { + && this.amountOfMoney.values(MEMBER_OF_CURRENCY).isEmpty()) { throw new HqdmException("Property Not Set: member_of_currency"); } if (this.amountOfMoney.hasValue(MEMBER_OF_KIND) - && this.amountOfMoney.value(MEMBER_OF_KIND).isEmpty()) { + && this.amountOfMoney.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.amountOfMoney.hasValue(PART__OF) - && this.amountOfMoney.value(PART__OF).isEmpty()) { + && this.amountOfMoney.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.amountOfMoney.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.amountOfMoney.hasValue(TEMPORAL__PART_OF) - && this.amountOfMoney.value(TEMPORAL__PART_OF).isEmpty()) { + && this.amountOfMoney.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.amountOfMoney.hasValue(TEMPORAL_PART_OF) - && this.amountOfMoney.value(TEMPORAL_PART_OF).isEmpty()) { + && this.amountOfMoney.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.amountOfMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java index d0ab763d..a15dba57 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java @@ -230,30 +230,30 @@ public final AssetBuilder temporal_Part_Of(final PhysicalObject physicalObject) */ public Asset build() throws HqdmException { if (this.asset.hasValue(AGGREGATED_INTO) - && this.asset.value(AGGREGATED_INTO).isEmpty()) { + && this.asset.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.asset.hasValue(BEGINNING) - && this.asset.value(BEGINNING).isEmpty()) { + && this.asset.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.asset.hasValue(ENDING) - && this.asset.value(ENDING).isEmpty()) { + && this.asset.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.asset.hasValue(MEMBER__OF) - && this.asset.value(MEMBER__OF).isEmpty()) { + && this.asset.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.asset.hasValue(MEMBER_OF) - && this.asset.value(MEMBER_OF).isEmpty()) { + && this.asset.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.asset.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.asset.hasValue(PART__OF) - && this.asset.value(PART__OF).isEmpty()) { + && this.asset.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.asset.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -263,11 +263,11 @@ public Asset build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.asset.hasValue(TEMPORAL__PART_OF) - && this.asset.value(TEMPORAL__PART_OF).isEmpty()) { + && this.asset.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.asset.hasValue(TEMPORAL_PART_OF) - && this.asset.value(TEMPORAL_PART_OF).isEmpty()) { + && this.asset.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.asset; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java index 70eb3f7a..13db121f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java @@ -237,41 +237,41 @@ public final AssociationBuilder temporal_Part_Of(final Individual individual) { */ public Association build() throws HqdmException { if (this.association.hasValue(AGGREGATED_INTO) - && this.association.value(AGGREGATED_INTO).isEmpty()) { + && this.association.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.association.hasValue(BEGINNING) - && this.association.value(BEGINNING).isEmpty()) { + && this.association.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.association.hasValue(ENDING) - && this.association.value(ENDING).isEmpty()) { + && this.association.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.association.hasValue(MEMBER__OF) - && this.association.value(MEMBER__OF).isEmpty()) { + && this.association.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.association.hasValue(MEMBER_OF) - && this.association.value(MEMBER_OF).isEmpty()) { + && this.association.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.association.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.association.hasValue(PART__OF) - && this.association.value(PART__OF).isEmpty()) { + && this.association.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.association.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.association.hasValue(TEMPORAL__PART_OF) - && this.association.value(TEMPORAL__PART_OF).isEmpty()) { + && this.association.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.association.hasValue(TEMPORAL_PART_OF) - && this.association.value(TEMPORAL_PART_OF).isEmpty()) { + && this.association.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.association; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java index 9a2c3d88..19f5fb78 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java @@ -183,34 +183,34 @@ public final BeginningOfOwnershipBuilder temporal__Part_Of(final SpatioTemporalE */ public BeginningOfOwnership build() throws HqdmException { if (this.beginningOfOwnership.hasValue(AGGREGATED_INTO) - && this.beginningOfOwnership.value(AGGREGATED_INTO).isEmpty()) { + && this.beginningOfOwnership.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.beginningOfOwnership.hasValue(BEGINNING) - && this.beginningOfOwnership.value(BEGINNING).isEmpty()) { + && this.beginningOfOwnership.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.beginningOfOwnership.hasValue(ENDING) - && this.beginningOfOwnership.value(ENDING).isEmpty()) { + && this.beginningOfOwnership.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.beginningOfOwnership.hasValue(MEMBER__OF) - && this.beginningOfOwnership.value(MEMBER__OF).isEmpty()) { + && this.beginningOfOwnership.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.beginningOfOwnership.hasValue(MEMBER_OF) - && this.beginningOfOwnership.value(MEMBER_OF).isEmpty()) { + && this.beginningOfOwnership.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.beginningOfOwnership.hasValue(PART__OF) - && this.beginningOfOwnership.value(PART__OF).isEmpty()) { + && this.beginningOfOwnership.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.beginningOfOwnership.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.beginningOfOwnership.hasValue(TEMPORAL__PART_OF) - && this.beginningOfOwnership.value(TEMPORAL__PART_OF).isEmpty()) { + && this.beginningOfOwnership.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return this.beginningOfOwnership; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java index ac0f8851..982317cc 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java @@ -213,42 +213,42 @@ public final BiologicalObjectBuilder temporal_Part_Of(final BiologicalObject bio */ public BiologicalObject build() throws HqdmException { if (this.biologicalObject.hasValue(AGGREGATED_INTO) - && this.biologicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.biologicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.biologicalObject.hasValue(BEGINNING) - && this.biologicalObject.value(BEGINNING).isEmpty()) { + && this.biologicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.biologicalObject.hasValue(ENDING) - && this.biologicalObject.value(ENDING).isEmpty()) { + && this.biologicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.biologicalObject.hasValue(MEMBER__OF) - && this.biologicalObject.value(MEMBER__OF).isEmpty()) { + && this.biologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.biologicalObject.hasValue(MEMBER_OF) - && this.biologicalObject.value(MEMBER_OF).isEmpty()) { + && this.biologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.biologicalObject.hasValue(MEMBER_OF_KIND) - && this.biologicalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.biologicalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.biologicalObject.hasValue(PART__OF) - && this.biologicalObject.value(PART__OF).isEmpty()) { + && this.biologicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.biologicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.biologicalObject.hasValue(TEMPORAL__PART_OF) - && this.biologicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.biologicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.biologicalObject.hasValue(TEMPORAL_PART_OF) - && this.biologicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.biologicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.biologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java index f2e8ae53..23236ecd 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java @@ -229,45 +229,45 @@ public final BiologicalSystemBuilder temporal_Part_Of( */ public BiologicalSystem build() throws HqdmException { if (this.biologicalSystem.hasValue(AGGREGATED_INTO) - && this.biologicalSystem.value(AGGREGATED_INTO).isEmpty()) { + && this.biologicalSystem.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.biologicalSystem.hasValue(BEGINNING) - && this.biologicalSystem.value(BEGINNING).isEmpty()) { + && this.biologicalSystem.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.biologicalSystem.hasValue(ENDING) - && this.biologicalSystem.value(ENDING).isEmpty()) { + && this.biologicalSystem.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.biologicalSystem.hasValue(MEMBER__OF) - && this.biologicalSystem.value(MEMBER__OF).isEmpty()) { + && this.biologicalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.biologicalSystem.hasValue(MEMBER_OF) - && this.biologicalSystem.value(MEMBER_OF).isEmpty()) { + && this.biologicalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.biologicalSystem.hasValue(MEMBER_OF_KIND) - && this.biologicalSystem.value(MEMBER_OF_KIND).isEmpty()) { + && this.biologicalSystem.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (!this.biologicalSystem.hasValue(NATURAL_ROLE)) { throw new HqdmException("Property Not Set: natural_role"); } if (this.biologicalSystem.hasValue(PART__OF) - && this.biologicalSystem.value(PART__OF).isEmpty()) { + && this.biologicalSystem.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.biologicalSystem.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.biologicalSystem.hasValue(TEMPORAL__PART_OF) - && this.biologicalSystem.value(TEMPORAL__PART_OF).isEmpty()) { + && this.biologicalSystem.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.biologicalSystem.hasValue(TEMPORAL_PART_OF) - && this.biologicalSystem.value(TEMPORAL_PART_OF).isEmpty()) { + && this.biologicalSystem.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.biologicalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java index eccb5744..20b1d8eb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java @@ -234,45 +234,45 @@ public final BiologicalSystemComponentBuilder temporal_Part_Of(final BiologicalO */ public BiologicalSystemComponent build() throws HqdmException { if (this.biologicalSystemComponent.hasValue(AGGREGATED_INTO) - && this.biologicalSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.biologicalSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.biologicalSystemComponent.hasValue(BEGINNING) - && this.biologicalSystemComponent.value(BEGINNING).isEmpty()) { + && this.biologicalSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.biologicalSystemComponent.hasValue(COMPONENT_OF)) { throw new HqdmException("Property Not Set: component_of"); } if (this.biologicalSystemComponent.hasValue(ENDING) - && this.biologicalSystemComponent.value(ENDING).isEmpty()) { + && this.biologicalSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.biologicalSystemComponent.hasValue(MEMBER__OF) - && this.biologicalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.biologicalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.biologicalSystemComponent.hasValue(MEMBER_OF) - && this.biologicalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.biologicalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.biologicalSystemComponent.hasValue(MEMBER_OF_KIND) - && this.biologicalSystemComponent.value(MEMBER_OF_KIND).isEmpty()) { + && this.biologicalSystemComponent.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.biologicalSystemComponent.hasValue(PART__OF) - && this.biologicalSystemComponent.value(PART__OF).isEmpty()) { + && this.biologicalSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.biologicalSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.biologicalSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.biologicalSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.biologicalSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.biologicalSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.biologicalSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.biologicalSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.biologicalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassBuilder.java index efbffe84..33a57574 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassBuilder.java @@ -85,15 +85,15 @@ public final ClassBuilder member_Of(final ClassOfClass classOfClass) { */ public Class build() throws HqdmException { if (this.clazz.hasValue(HAS_SUPERCLASS) - && this.clazz.value(HAS_SUPERCLASS).isEmpty()) { + && this.clazz.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.clazz.hasValue(MEMBER__OF) - && this.clazz.value(MEMBER__OF).isEmpty()) { + && this.clazz.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.clazz.hasValue(MEMBER_OF) - && this.clazz.value(MEMBER_OF).isEmpty()) { + && this.clazz.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.clazz; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAbstractObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAbstractObjectBuilder.java index 5ce896f8..e34a97b3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAbstractObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAbstractObjectBuilder.java @@ -86,15 +86,15 @@ public final ClassOfAbstractObjectBuilder member_Of(final ClassOfClass classOfCl */ public ClassOfAbstractObject build() throws HqdmException { if (this.classOfAbstractObject.hasValue(HAS_SUPERCLASS) - && this.classOfAbstractObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAbstractObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAbstractObject.hasValue(MEMBER__OF) - && this.classOfAbstractObject.value(MEMBER__OF).isEmpty()) { + && this.classOfAbstractObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAbstractObject.hasValue(MEMBER_OF) - && this.classOfAbstractObject.value(MEMBER_OF).isEmpty()) { + && this.classOfAbstractObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfAbstractObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java index 8dfaf13b..4ef09d8e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java @@ -139,23 +139,23 @@ public final ClassOfActivityBuilder part__Of_By_Class( */ public ClassOfActivity build() throws HqdmException { if (this.classOfActivity.hasValue(HAS_SUPERCLASS) - && this.classOfActivity.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfActivity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfActivity.hasValue(MEMBER__OF) - && this.classOfActivity.value(MEMBER__OF).isEmpty()) { + && this.classOfActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfActivity.hasValue(MEMBER_OF) - && this.classOfActivity.value(MEMBER_OF).isEmpty()) { + && this.classOfActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfActivity.hasValue(MEMBER_OF_) - && this.classOfActivity.value(MEMBER_OF_).isEmpty()) { + && this.classOfActivity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfActivity.hasValue(PART__OF_BY_CLASS) - && this.classOfActivity.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfActivity.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java index 4872b8d7..a06f40e9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java @@ -179,31 +179,31 @@ public final ClassOfAgreeContractBuilder part_Of_By_Class_( */ public ClassOfAgreeContract build() throws HqdmException { if (this.classOfAgreeContract.hasValue(HAS_SUPERCLASS) - && this.classOfAgreeContract.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAgreeContract.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAgreeContract.hasValue(MEMBER__OF) - && this.classOfAgreeContract.value(MEMBER__OF).isEmpty()) { + && this.classOfAgreeContract.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAgreeContract.hasValue(MEMBER_OF) - && this.classOfAgreeContract.value(MEMBER_OF).isEmpty()) { + && this.classOfAgreeContract.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfAgreeContract.hasValue(MEMBER_OF_) - && this.classOfAgreeContract.value(MEMBER_OF_).isEmpty()) { + && this.classOfAgreeContract.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfAgreeContract.hasValue(PART__OF_BY_CLASS) - && this.classOfAgreeContract.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfAgreeContract.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfAgreeContract.hasValue(PART_OF_BY_CLASS) - && this.classOfAgreeContract.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfAgreeContract.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfAgreeContract.hasValue(PART_OF_BY_CLASS_) - && this.classOfAgreeContract.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfAgreeContract.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfAgreeContract; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java index c8e42f46..cc34d5ff 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java @@ -180,31 +180,31 @@ public final ClassOfAgreementExecutionBuilder part_Of_By_Class_( */ public ClassOfAgreementExecution build() throws HqdmException { if (this.classOfAgreementExecution.hasValue(HAS_SUPERCLASS) - && this.classOfAgreementExecution.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAgreementExecution.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAgreementExecution.hasValue(MEMBER__OF) - && this.classOfAgreementExecution.value(MEMBER__OF).isEmpty()) { + && this.classOfAgreementExecution.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAgreementExecution.hasValue(MEMBER_OF) - && this.classOfAgreementExecution.value(MEMBER_OF).isEmpty()) { + && this.classOfAgreementExecution.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfAgreementExecution.hasValue(MEMBER_OF_) - && this.classOfAgreementExecution.value(MEMBER_OF_).isEmpty()) { + && this.classOfAgreementExecution.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfAgreementExecution.hasValue(PART__OF_BY_CLASS) - && this.classOfAgreementExecution.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfAgreementExecution.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfAgreementExecution.hasValue(PART_OF_BY_CLASS) - && this.classOfAgreementExecution.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfAgreementExecution.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfAgreementExecution.hasValue(PART_OF_BY_CLASS_) - && this.classOfAgreementExecution.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfAgreementExecution.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfAgreementExecution; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java index 80c2ef73..fb4a5a68 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java @@ -180,31 +180,31 @@ public final ClassOfAgreementProcessBuilder part_Of_By_Class_( */ public ClassOfAgreementProcess build() throws HqdmException { if (this.classOfAgreementProcess.hasValue(HAS_SUPERCLASS) - && this.classOfAgreementProcess.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAgreementProcess.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAgreementProcess.hasValue(MEMBER__OF) - && this.classOfAgreementProcess.value(MEMBER__OF).isEmpty()) { + && this.classOfAgreementProcess.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAgreementProcess.hasValue(MEMBER_OF) - && this.classOfAgreementProcess.value(MEMBER_OF).isEmpty()) { + && this.classOfAgreementProcess.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfAgreementProcess.hasValue(MEMBER_OF_) - && this.classOfAgreementProcess.value(MEMBER_OF_).isEmpty()) { + && this.classOfAgreementProcess.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfAgreementProcess.hasValue(PART__OF_BY_CLASS) - && this.classOfAgreementProcess.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfAgreementProcess.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfAgreementProcess.hasValue(PART_OF_BY_CLASS) - && this.classOfAgreementProcess.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfAgreementProcess.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfAgreementProcess.hasValue(PART_OF_BY_CLASS_) - && this.classOfAgreementProcess.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfAgreementProcess.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfAgreementProcess; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java index dafbaa3c..09009d94 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java @@ -141,23 +141,23 @@ public final ClassOfAmountOfMoneyBuilder part__Of_By_Class( */ public ClassOfAmountOfMoney build() throws HqdmException { if (this.classOfAmountOfMoney.hasValue(HAS_SUPERCLASS) - && this.classOfAmountOfMoney.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAmountOfMoney.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAmountOfMoney.hasValue(MEMBER__OF) - && this.classOfAmountOfMoney.value(MEMBER__OF).isEmpty()) { + && this.classOfAmountOfMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAmountOfMoney.hasValue(MEMBER_OF) - && this.classOfAmountOfMoney.value(MEMBER_OF).isEmpty()) { + && this.classOfAmountOfMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfAmountOfMoney.hasValue(MEMBER_OF_) - && this.classOfAmountOfMoney.value(MEMBER_OF_).isEmpty()) { + && this.classOfAmountOfMoney.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfAmountOfMoney.hasValue(PART__OF_BY_CLASS) - && this.classOfAmountOfMoney.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfAmountOfMoney.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfAmountOfMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java index 5e73b53c..1ee6f407 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java @@ -141,23 +141,23 @@ public final ClassOfAssociationBuilder part__Of_By_Class( */ public ClassOfAssociation build() throws HqdmException { if (this.classOfAssociation.hasValue(HAS_SUPERCLASS) - && this.classOfAssociation.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfAssociation.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfAssociation.hasValue(MEMBER__OF) - && this.classOfAssociation.value(MEMBER__OF).isEmpty()) { + && this.classOfAssociation.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfAssociation.hasValue(MEMBER_OF) - && this.classOfAssociation.value(MEMBER_OF).isEmpty()) { + && this.classOfAssociation.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfAssociation.hasValue(MEMBER_OF_) - && this.classOfAssociation.value(MEMBER_OF_).isEmpty()) { + && this.classOfAssociation.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfAssociation.hasValue(PART__OF_BY_CLASS) - && this.classOfAssociation.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfAssociation.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfAssociation; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java index 3dba23a5..f1966a83 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java @@ -141,23 +141,23 @@ public final ClassOfBiologicalObjectBuilder part__Of_By_Class( */ public ClassOfBiologicalObject build() throws HqdmException { if (this.classOfBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfBiologicalObject.hasValue(MEMBER__OF) - && this.classOfBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfBiologicalObject.hasValue(MEMBER_OF) - && this.classOfBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfBiologicalObject.hasValue(MEMBER_OF_) - && this.classOfBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfBiologicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfBiologicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java index 9bbcf888..0255ecc8 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java @@ -141,23 +141,23 @@ public final ClassOfBiologicalSystemBuilder part__Of_By_Class( */ public ClassOfBiologicalSystem build() throws HqdmException { if (this.classOfBiologicalSystem.hasValue(HAS_SUPERCLASS) - && this.classOfBiologicalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfBiologicalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfBiologicalSystem.hasValue(MEMBER__OF) - && this.classOfBiologicalSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfBiologicalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfBiologicalSystem.hasValue(MEMBER_OF) - && this.classOfBiologicalSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfBiologicalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfBiologicalSystem.hasValue(MEMBER_OF_) - && this.classOfBiologicalSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfBiologicalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfBiologicalSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfBiologicalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfBiologicalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfBiologicalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java index f8ba532d..9ed681c2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java @@ -143,23 +143,23 @@ public final ClassOfBiologicalSystemComponentBuilder part__Of_By_Class( */ public ClassOfBiologicalSystemComponent build() throws HqdmException { if (this.classOfBiologicalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfBiologicalSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfBiologicalSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfBiologicalSystemComponent.hasValue(MEMBER__OF) - && this.classOfBiologicalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfBiologicalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfBiologicalSystemComponent.hasValue(MEMBER_OF) - && this.classOfBiologicalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfBiologicalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfBiologicalSystemComponent.hasValue(MEMBER_OF_) - && this.classOfBiologicalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfBiologicalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfBiologicalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfBiologicalSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfBiologicalSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfBiologicalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassBuilder.java index 53e5241f..39915852 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassBuilder.java @@ -85,15 +85,15 @@ public final ClassOfClassBuilder member_Of(final ClassOfClass classOfClass) { */ public ClassOfClass build() throws HqdmException { if (this.classOfClass.hasValue(HAS_SUPERCLASS) - && this.classOfClass.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfClass.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfClass.hasValue(MEMBER__OF) - && this.classOfClass.value(MEMBER__OF).isEmpty()) { + && this.classOfClass.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfClass.hasValue(MEMBER_OF) - && this.classOfClass.value(MEMBER_OF).isEmpty()) { + && this.classOfClass.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfClass; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java index c01c9c8b..e72cea55 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java @@ -89,15 +89,15 @@ public final ClassOfClassOfSpatioTemporalExtentBuilder member_Of(final ClassOfCl */ public ClassOfClassOfSpatioTemporalExtent build() throws HqdmException { if (this.classOfClassOfSpatioTemporalExtent.hasValue(HAS_SUPERCLASS) - && this.classOfClassOfSpatioTemporalExtent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfClassOfSpatioTemporalExtent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfClassOfSpatioTemporalExtent.hasValue(MEMBER__OF) - && this.classOfClassOfSpatioTemporalExtent.value(MEMBER__OF).isEmpty()) { + && this.classOfClassOfSpatioTemporalExtent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfClassOfSpatioTemporalExtent.hasValue(MEMBER_OF) - && this.classOfClassOfSpatioTemporalExtent.value(MEMBER_OF).isEmpty()) { + && this.classOfClassOfSpatioTemporalExtent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfClassOfSpatioTemporalExtent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java index 36cc7185..2512ac3d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java @@ -180,31 +180,31 @@ public final ClassOfContractExecutionBuilder part_Of_By_Class_( */ public ClassOfContractExecution build() throws HqdmException { if (this.classOfContractExecution.hasValue(HAS_SUPERCLASS) - && this.classOfContractExecution.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfContractExecution.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfContractExecution.hasValue(MEMBER__OF) - && this.classOfContractExecution.value(MEMBER__OF).isEmpty()) { + && this.classOfContractExecution.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfContractExecution.hasValue(MEMBER_OF) - && this.classOfContractExecution.value(MEMBER_OF).isEmpty()) { + && this.classOfContractExecution.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfContractExecution.hasValue(MEMBER_OF_) - && this.classOfContractExecution.value(MEMBER_OF_).isEmpty()) { + && this.classOfContractExecution.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfContractExecution.hasValue(PART__OF_BY_CLASS) - && this.classOfContractExecution.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfContractExecution.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfContractExecution.hasValue(PART_OF_BY_CLASS) - && this.classOfContractExecution.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfContractExecution.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfContractExecution.hasValue(PART_OF_BY_CLASS_) - && this.classOfContractExecution.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfContractExecution.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfContractExecution; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java index cb522cf6..843fac2b 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java @@ -180,31 +180,31 @@ public final ClassOfContractProcessBuilder part_Of_By_Class_( */ public ClassOfContractProcess build() throws HqdmException { if (this.classOfContractProcess.hasValue(HAS_SUPERCLASS) - && this.classOfContractProcess.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfContractProcess.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfContractProcess.hasValue(MEMBER__OF) - && this.classOfContractProcess.value(MEMBER__OF).isEmpty()) { + && this.classOfContractProcess.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfContractProcess.hasValue(MEMBER_OF) - && this.classOfContractProcess.value(MEMBER_OF).isEmpty()) { + && this.classOfContractProcess.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfContractProcess.hasValue(MEMBER_OF_) - && this.classOfContractProcess.value(MEMBER_OF_).isEmpty()) { + && this.classOfContractProcess.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfContractProcess.hasValue(PART__OF_BY_CLASS) - && this.classOfContractProcess.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfContractProcess.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfContractProcess.hasValue(PART_OF_BY_CLASS) - && this.classOfContractProcess.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfContractProcess.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfContractProcess.hasValue(PART_OF_BY_CLASS_) - && this.classOfContractProcess.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfContractProcess.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfContractProcess; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java index d1555530..1f830b03 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java @@ -139,23 +139,23 @@ public final ClassOfEventBuilder part__Of_By_Class( */ public ClassOfEvent build() throws HqdmException { if (this.classOfEvent.hasValue(HAS_SUPERCLASS) - && this.classOfEvent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfEvent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfEvent.hasValue(MEMBER__OF) - && this.classOfEvent.value(MEMBER__OF).isEmpty()) { + && this.classOfEvent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfEvent.hasValue(MEMBER_OF) - && this.classOfEvent.value(MEMBER_OF).isEmpty()) { + && this.classOfEvent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfEvent.hasValue(MEMBER_OF_) - && this.classOfEvent.value(MEMBER_OF_).isEmpty()) { + && this.classOfEvent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfEvent.hasValue(PART__OF_BY_CLASS) - && this.classOfEvent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfEvent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfEvent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java index 3d0bf50b..2318e4b6 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java @@ -141,23 +141,23 @@ public final ClassOfFunctionalObjectBuilder part__Of_By_Class( */ public ClassOfFunctionalObject build() throws HqdmException { if (this.classOfFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.classOfFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfFunctionalObject.hasValue(MEMBER__OF) - && this.classOfFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfFunctionalObject.hasValue(MEMBER_OF) - && this.classOfFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfFunctionalObject.hasValue(MEMBER_OF_) - && this.classOfFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfFunctionalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfFunctionalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java index 2de55432..8f83eb5f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java @@ -141,23 +141,23 @@ public final ClassOfFunctionalSystemBuilder part__Of_By_Class( */ public ClassOfFunctionalSystem build() throws HqdmException { if (this.classOfFunctionalSystem.hasValue(HAS_SUPERCLASS) - && this.classOfFunctionalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfFunctionalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfFunctionalSystem.hasValue(MEMBER__OF) - && this.classOfFunctionalSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfFunctionalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfFunctionalSystem.hasValue(MEMBER_OF) - && this.classOfFunctionalSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfFunctionalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfFunctionalSystem.hasValue(MEMBER_OF_) - && this.classOfFunctionalSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfFunctionalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfFunctionalSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfFunctionalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfFunctionalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfFunctionalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java index e3e3a88e..79347e83 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java @@ -144,23 +144,23 @@ public final ClassOfFunctionalSystemComponentBuilder part__Of_By_Class( */ public ClassOfFunctionalSystemComponent build() throws HqdmException { if (this.classOfFunctionalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfFunctionalSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfFunctionalSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.classOfFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.classOfFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfFunctionalSystemComponent.hasValue(MEMBER_OF_) - && this.classOfFunctionalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfFunctionalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfFunctionalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfFunctionalSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfFunctionalSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfFunctionalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java index dbc6958c..41982e16 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java @@ -144,23 +144,23 @@ public final ClassOfInPlaceBiologicalComponentBuilder part__Of_By_Class( */ public ClassOfInPlaceBiologicalComponent build() throws HqdmException { if (this.classOfInPlaceBiologicalComponent.hasValue(HAS_SUPERCLASS) - && this.classOfInPlaceBiologicalComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfInPlaceBiologicalComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfInPlaceBiologicalComponent.hasValue(MEMBER__OF) - && this.classOfInPlaceBiologicalComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfInPlaceBiologicalComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfInPlaceBiologicalComponent.hasValue(MEMBER_OF) - && this.classOfInPlaceBiologicalComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfInPlaceBiologicalComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfInPlaceBiologicalComponent.hasValue(MEMBER_OF_) - && this.classOfInPlaceBiologicalComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfInPlaceBiologicalComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfInPlaceBiologicalComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfInPlaceBiologicalComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfInPlaceBiologicalComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfInPlaceBiologicalComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java index ad69701d..bf3826a1 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java @@ -139,23 +139,23 @@ public final ClassOfIndividualBuilder part__Of_By_Class( */ public ClassOfIndividual build() throws HqdmException { if (this.classOfIndividual.hasValue(HAS_SUPERCLASS) - && this.classOfIndividual.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfIndividual.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfIndividual.hasValue(MEMBER__OF) - && this.classOfIndividual.value(MEMBER__OF).isEmpty()) { + && this.classOfIndividual.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfIndividual.hasValue(MEMBER_OF) - && this.classOfIndividual.value(MEMBER_OF).isEmpty()) { + && this.classOfIndividual.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfIndividual.hasValue(MEMBER_OF_) - && this.classOfIndividual.value(MEMBER_OF_).isEmpty()) { + && this.classOfIndividual.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfIndividual.hasValue(PART__OF_BY_CLASS) - && this.classOfIndividual.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfIndividual.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfIndividual; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java index 15c3ebf6..b8155aa2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java @@ -147,25 +147,25 @@ public final ClassOfInstalledFunctionalSystemComponentBuilder part__Of_By_Class( public ClassOfInstalledFunctionalSystemComponent build() throws HqdmException { if (this.classOfInstalledFunctionalSystemComponent.hasValue(HAS_SUPERCLASS) && this.classOfInstalledFunctionalSystemComponent - .value(HAS_SUPERCLASS) + .values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfInstalledFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.classOfInstalledFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfInstalledFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfInstalledFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.classOfInstalledFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfInstalledFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfInstalledFunctionalSystemComponent.hasValue(MEMBER_OF_) - && this.classOfInstalledFunctionalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfInstalledFunctionalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfInstalledFunctionalSystemComponent.hasValue(PART__OF_BY_CLASS) && this.classOfInstalledFunctionalSystemComponent - .value(PART__OF_BY_CLASS) + .values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java index b4b094a0..3e8684be 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java @@ -141,23 +141,23 @@ public final ClassOfInstalledObjectBuilder part__Of_By_Class( */ public ClassOfInstalledObject build() throws HqdmException { if (this.classOfInstalledObject.hasValue(HAS_SUPERCLASS) - && this.classOfInstalledObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfInstalledObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfInstalledObject.hasValue(MEMBER__OF) - && this.classOfInstalledObject.value(MEMBER__OF).isEmpty()) { + && this.classOfInstalledObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfInstalledObject.hasValue(MEMBER_OF) - && this.classOfInstalledObject.value(MEMBER_OF).isEmpty()) { + && this.classOfInstalledObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfInstalledObject.hasValue(MEMBER_OF_) - && this.classOfInstalledObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfInstalledObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfInstalledObject.hasValue(PART__OF_BY_CLASS) - && this.classOfInstalledObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfInstalledObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfInstalledObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java index 3376a093..bcaba1d2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java @@ -145,24 +145,24 @@ public final ClassOfIntentionallyConstructedObjectBuilder part__Of_By_Class( */ public ClassOfIntentionallyConstructedObject build() throws HqdmException { if (this.classOfIntentionallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.classOfIntentionallyConstructedObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfIntentionallyConstructedObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfIntentionallyConstructedObject.hasValue(MEMBER__OF) - && this.classOfIntentionallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.classOfIntentionallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfIntentionallyConstructedObject.hasValue(MEMBER_OF) - && this.classOfIntentionallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.classOfIntentionallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfIntentionallyConstructedObject.hasValue(MEMBER_OF_) - && this.classOfIntentionallyConstructedObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfIntentionallyConstructedObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfIntentionallyConstructedObject.hasValue(PART__OF_BY_CLASS) && this.classOfIntentionallyConstructedObject - .value(PART__OF_BY_CLASS) + .values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java index 7ef4d785..3f566cc7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java @@ -175,31 +175,31 @@ public final ClassOfOfferBuilder part_Of_By_Class_( */ public ClassOfOffer build() throws HqdmException { if (this.classOfOffer.hasValue(HAS_SUPERCLASS) - && this.classOfOffer.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOffer.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOffer.hasValue(MEMBER__OF) - && this.classOfOffer.value(MEMBER__OF).isEmpty()) { + && this.classOfOffer.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOffer.hasValue(MEMBER_OF) - && this.classOfOffer.value(MEMBER_OF).isEmpty()) { + && this.classOfOffer.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOffer.hasValue(MEMBER_OF_) - && this.classOfOffer.value(MEMBER_OF_).isEmpty()) { + && this.classOfOffer.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOffer.hasValue(PART__OF_BY_CLASS) - && this.classOfOffer.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOffer.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfOffer.hasValue(PART_OF_BY_CLASS) - && this.classOfOffer.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfOffer.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfOffer.hasValue(PART_OF_BY_CLASS_) - && this.classOfOffer.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfOffer.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfOffer; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java index c64921e4..7073f015 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java @@ -143,23 +143,23 @@ public final ClassOfOrdinaryBiologicalObjectBuilder part__Of_By_Class( */ public ClassOfOrdinaryBiologicalObject build() throws HqdmException { if (this.classOfOrdinaryBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfOrdinaryBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOrdinaryBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOrdinaryBiologicalObject.hasValue(MEMBER__OF) - && this.classOfOrdinaryBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfOrdinaryBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOrdinaryBiologicalObject.hasValue(MEMBER_OF) - && this.classOfOrdinaryBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfOrdinaryBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOrdinaryBiologicalObject.hasValue(MEMBER_OF_) - && this.classOfOrdinaryBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfOrdinaryBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOrdinaryBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfOrdinaryBiologicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOrdinaryBiologicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfOrdinaryBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java index 23ea1d07..f1d2608b 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java @@ -143,23 +143,23 @@ public final ClassOfOrdinaryFunctionalObjectBuilder part__Of_By_Class( */ public ClassOfOrdinaryFunctionalObject build() throws HqdmException { if (this.classOfOrdinaryFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.classOfOrdinaryFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOrdinaryFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOrdinaryFunctionalObject.hasValue(MEMBER__OF) - && this.classOfOrdinaryFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfOrdinaryFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOrdinaryFunctionalObject.hasValue(MEMBER_OF) - && this.classOfOrdinaryFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfOrdinaryFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOrdinaryFunctionalObject.hasValue(MEMBER_OF_) - && this.classOfOrdinaryFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfOrdinaryFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOrdinaryFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfOrdinaryFunctionalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOrdinaryFunctionalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfOrdinaryFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java index 703b283e..9ce8fc85 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java @@ -142,23 +142,23 @@ public final ClassOfOrdinaryPhysicalObjectBuilder part__Of_By_Class( */ public ClassOfOrdinaryPhysicalObject build() throws HqdmException { if (this.classOfOrdinaryPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfOrdinaryPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOrdinaryPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOrdinaryPhysicalObject.hasValue(MEMBER__OF) - && this.classOfOrdinaryPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfOrdinaryPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOrdinaryPhysicalObject.hasValue(MEMBER_OF) - && this.classOfOrdinaryPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfOrdinaryPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOrdinaryPhysicalObject.hasValue(MEMBER_OF_) - && this.classOfOrdinaryPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfOrdinaryPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOrdinaryPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfOrdinaryPhysicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOrdinaryPhysicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfOrdinaryPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java index 8e868366..6a745ee9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java @@ -141,23 +141,23 @@ public final ClassOfOrganizationBuilder part__Of_By_Class( */ public ClassOfOrganization build() throws HqdmException { if (this.classOfOrganization.hasValue(HAS_SUPERCLASS) - && this.classOfOrganization.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOrganization.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOrganization.hasValue(MEMBER__OF) - && this.classOfOrganization.value(MEMBER__OF).isEmpty()) { + && this.classOfOrganization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOrganization.hasValue(MEMBER_OF) - && this.classOfOrganization.value(MEMBER_OF).isEmpty()) { + && this.classOfOrganization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOrganization.hasValue(MEMBER_OF_) - && this.classOfOrganization.value(MEMBER_OF_).isEmpty()) { + && this.classOfOrganization.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOrganization.hasValue(PART__OF_BY_CLASS) - && this.classOfOrganization.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOrganization.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfOrganization; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java index d20494e2..ca1d4d4f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java @@ -142,23 +142,23 @@ public final ClassOfOrganizationComponentBuilder part__Of_By_Class( */ public ClassOfOrganizationComponent build() throws HqdmException { if (this.classOfOrganizationComponent.hasValue(HAS_SUPERCLASS) - && this.classOfOrganizationComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfOrganizationComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfOrganizationComponent.hasValue(MEMBER__OF) - && this.classOfOrganizationComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfOrganizationComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfOrganizationComponent.hasValue(MEMBER_OF) - && this.classOfOrganizationComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfOrganizationComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfOrganizationComponent.hasValue(MEMBER_OF_) - && this.classOfOrganizationComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfOrganizationComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfOrganizationComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfOrganizationComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfOrganizationComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfOrganizationComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java index d62555af..f2b7d76a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java @@ -141,23 +141,23 @@ public final ClassOfParticipantBuilder part__Of_By_Class( */ public ClassOfParticipant build() throws HqdmException { if (this.classOfParticipant.hasValue(HAS_SUPERCLASS) - && this.classOfParticipant.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfParticipant.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfParticipant.hasValue(MEMBER__OF) - && this.classOfParticipant.value(MEMBER__OF).isEmpty()) { + && this.classOfParticipant.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfParticipant.hasValue(MEMBER_OF) - && this.classOfParticipant.value(MEMBER_OF).isEmpty()) { + && this.classOfParticipant.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfParticipant.hasValue(MEMBER_OF_) - && this.classOfParticipant.value(MEMBER_OF_).isEmpty()) { + && this.classOfParticipant.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfParticipant.hasValue(PART__OF_BY_CLASS) - && this.classOfParticipant.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfParticipant.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfParticipant; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java index e3977611..1b76637e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java @@ -138,23 +138,23 @@ public final ClassOfPartyBuilder part__Of_By_Class( */ public ClassOfParty build() throws HqdmException { if (this.classOfParty.hasValue(HAS_SUPERCLASS) - && this.classOfParty.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfParty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfParty.hasValue(MEMBER__OF) - && this.classOfParty.value(MEMBER__OF).isEmpty()) { + && this.classOfParty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfParty.hasValue(MEMBER_OF) - && this.classOfParty.value(MEMBER_OF).isEmpty()) { + && this.classOfParty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfParty.hasValue(MEMBER_OF_) - && this.classOfParty.value(MEMBER_OF_).isEmpty()) { + && this.classOfParty.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfParty.hasValue(PART__OF_BY_CLASS) - && this.classOfParty.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfParty.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfParty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java index ca463146..58c2b047 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java @@ -141,23 +141,23 @@ public final ClassOfPeriodOfTimeBuilder part__Of_By_Class( */ public ClassOfPeriodOfTime build() throws HqdmException { if (this.classOfPeriodOfTime.hasValue(HAS_SUPERCLASS) - && this.classOfPeriodOfTime.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPeriodOfTime.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPeriodOfTime.hasValue(MEMBER__OF) - && this.classOfPeriodOfTime.value(MEMBER__OF).isEmpty()) { + && this.classOfPeriodOfTime.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPeriodOfTime.hasValue(MEMBER_OF) - && this.classOfPeriodOfTime.value(MEMBER_OF).isEmpty()) { + && this.classOfPeriodOfTime.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPeriodOfTime.hasValue(MEMBER_OF_) - && this.classOfPeriodOfTime.value(MEMBER_OF_).isEmpty()) { + && this.classOfPeriodOfTime.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPeriodOfTime.hasValue(PART__OF_BY_CLASS) - && this.classOfPeriodOfTime.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPeriodOfTime.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPeriodOfTime; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java index 571717b2..978a9133 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java @@ -138,23 +138,23 @@ public final ClassOfPersonBuilder part__Of_By_Class( */ public ClassOfPerson build() throws HqdmException { if (this.classOfPerson.hasValue(HAS_SUPERCLASS) - && this.classOfPerson.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPerson.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPerson.hasValue(MEMBER__OF) - && this.classOfPerson.value(MEMBER__OF).isEmpty()) { + && this.classOfPerson.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPerson.hasValue(MEMBER_OF) - && this.classOfPerson.value(MEMBER_OF).isEmpty()) { + && this.classOfPerson.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPerson.hasValue(MEMBER_OF_) - && this.classOfPerson.value(MEMBER_OF_).isEmpty()) { + && this.classOfPerson.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPerson.hasValue(PART__OF_BY_CLASS) - && this.classOfPerson.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPerson.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPerson; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java index 3691ee45..2f557054 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java @@ -141,23 +141,23 @@ public final ClassOfPersonInPositionBuilder part__Of_By_Class( */ public ClassOfPersonInPosition build() throws HqdmException { if (this.classOfPersonInPosition.hasValue(HAS_SUPERCLASS) - && this.classOfPersonInPosition.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPersonInPosition.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPersonInPosition.hasValue(MEMBER__OF) - && this.classOfPersonInPosition.value(MEMBER__OF).isEmpty()) { + && this.classOfPersonInPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPersonInPosition.hasValue(MEMBER_OF) - && this.classOfPersonInPosition.value(MEMBER_OF).isEmpty()) { + && this.classOfPersonInPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPersonInPosition.hasValue(MEMBER_OF_) - && this.classOfPersonInPosition.value(MEMBER_OF_).isEmpty()) { + && this.classOfPersonInPosition.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPersonInPosition.hasValue(PART__OF_BY_CLASS) - && this.classOfPersonInPosition.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPersonInPosition.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPersonInPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java index 147383ce..c13fb38c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java @@ -141,23 +141,23 @@ public final ClassOfPhysicalObjectBuilder part__Of_By_Class( */ public ClassOfPhysicalObject build() throws HqdmException { if (this.classOfPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPhysicalObject.hasValue(MEMBER__OF) - && this.classOfPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPhysicalObject.hasValue(MEMBER_OF) - && this.classOfPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPhysicalObject.hasValue(MEMBER_OF_) - && this.classOfPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfPhysicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPhysicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalPropertyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalPropertyBuilder.java index 133d2c36..29e48036 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalPropertyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalPropertyBuilder.java @@ -86,15 +86,15 @@ public final ClassOfPhysicalPropertyBuilder member_Of(final ClassOfClass classOf */ public ClassOfPhysicalProperty build() throws HqdmException { if (this.classOfPhysicalProperty.hasValue(HAS_SUPERCLASS) - && this.classOfPhysicalProperty.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPhysicalProperty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPhysicalProperty.hasValue(MEMBER__OF) - && this.classOfPhysicalProperty.value(MEMBER__OF).isEmpty()) { + && this.classOfPhysicalProperty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPhysicalProperty.hasValue(MEMBER_OF) - && this.classOfPhysicalProperty.value(MEMBER_OF).isEmpty()) { + && this.classOfPhysicalProperty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfPhysicalProperty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalQuantityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalQuantityBuilder.java index 7f80324b..fb1e17be 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalQuantityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalQuantityBuilder.java @@ -86,15 +86,15 @@ public final ClassOfPhysicalQuantityBuilder member_Of(final ClassOfClass classOf */ public ClassOfPhysicalQuantity build() throws HqdmException { if (this.classOfPhysicalQuantity.hasValue(HAS_SUPERCLASS) - && this.classOfPhysicalQuantity.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPhysicalQuantity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPhysicalQuantity.hasValue(MEMBER__OF) - && this.classOfPhysicalQuantity.value(MEMBER__OF).isEmpty()) { + && this.classOfPhysicalQuantity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPhysicalQuantity.hasValue(MEMBER_OF) - && this.classOfPhysicalQuantity.value(MEMBER_OF).isEmpty()) { + && this.classOfPhysicalQuantity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfPhysicalQuantity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java index 8cf2e9e0..a43e903c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java @@ -141,23 +141,23 @@ public final ClassOfPointInTimeBuilder part__Of_By_Class( */ public ClassOfPointInTime build() throws HqdmException { if (this.classOfPointInTime.hasValue(HAS_SUPERCLASS) - && this.classOfPointInTime.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPointInTime.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPointInTime.hasValue(MEMBER__OF) - && this.classOfPointInTime.value(MEMBER__OF).isEmpty()) { + && this.classOfPointInTime.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPointInTime.hasValue(MEMBER_OF) - && this.classOfPointInTime.value(MEMBER_OF).isEmpty()) { + && this.classOfPointInTime.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPointInTime.hasValue(MEMBER_OF_) - && this.classOfPointInTime.value(MEMBER_OF_).isEmpty()) { + && this.classOfPointInTime.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPointInTime.hasValue(PART__OF_BY_CLASS) - && this.classOfPointInTime.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPointInTime.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPointInTime; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java index aed74b34..903f8af6 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java @@ -139,23 +139,23 @@ public final ClassOfPositionBuilder part__Of_By_Class( */ public ClassOfPosition build() throws HqdmException { if (this.classOfPosition.hasValue(HAS_SUPERCLASS) - && this.classOfPosition.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPosition.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPosition.hasValue(MEMBER__OF) - && this.classOfPosition.value(MEMBER__OF).isEmpty()) { + && this.classOfPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPosition.hasValue(MEMBER_OF) - && this.classOfPosition.value(MEMBER_OF).isEmpty()) { + && this.classOfPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPosition.hasValue(MEMBER_OF_) - && this.classOfPosition.value(MEMBER_OF_).isEmpty()) { + && this.classOfPosition.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPosition.hasValue(PART__OF_BY_CLASS) - && this.classOfPosition.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPosition.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java index ee928795..a9019ade 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java @@ -141,23 +141,23 @@ public final ClassOfPossibleWorldBuilder part__Of_By_Class( */ public ClassOfPossibleWorld build() throws HqdmException { if (this.classOfPossibleWorld.hasValue(HAS_SUPERCLASS) - && this.classOfPossibleWorld.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfPossibleWorld.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfPossibleWorld.hasValue(MEMBER__OF) - && this.classOfPossibleWorld.value(MEMBER__OF).isEmpty()) { + && this.classOfPossibleWorld.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfPossibleWorld.hasValue(MEMBER_OF) - && this.classOfPossibleWorld.value(MEMBER_OF).isEmpty()) { + && this.classOfPossibleWorld.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfPossibleWorld.hasValue(MEMBER_OF_) - && this.classOfPossibleWorld.value(MEMBER_OF_).isEmpty()) { + && this.classOfPossibleWorld.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfPossibleWorld.hasValue(PART__OF_BY_CLASS) - && this.classOfPossibleWorld.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfPossibleWorld.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfPossibleWorld; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java index 1607d659..f5ac6729 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java @@ -179,31 +179,31 @@ public final ClassOfReachingAgreementBuilder part_Of_By_Class_( */ public ClassOfReachingAgreement build() throws HqdmException { if (this.classOfReachingAgreement.hasValue(HAS_SUPERCLASS) - && this.classOfReachingAgreement.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfReachingAgreement.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfReachingAgreement.hasValue(MEMBER__OF) - && this.classOfReachingAgreement.value(MEMBER__OF).isEmpty()) { + && this.classOfReachingAgreement.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfReachingAgreement.hasValue(MEMBER_OF) - && this.classOfReachingAgreement.value(MEMBER_OF).isEmpty()) { + && this.classOfReachingAgreement.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfReachingAgreement.hasValue(MEMBER_OF_) - && this.classOfReachingAgreement.value(MEMBER_OF_).isEmpty()) { + && this.classOfReachingAgreement.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfReachingAgreement.hasValue(PART__OF_BY_CLASS) - && this.classOfReachingAgreement.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfReachingAgreement.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfReachingAgreement.hasValue(PART_OF_BY_CLASS) - && this.classOfReachingAgreement.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfReachingAgreement.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfReachingAgreement.hasValue(PART_OF_BY_CLASS_) - && this.classOfReachingAgreement.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfReachingAgreement.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfReachingAgreement; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRelationshipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRelationshipBuilder.java index bab98fc8..9b96d1e5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRelationshipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRelationshipBuilder.java @@ -86,15 +86,15 @@ public final ClassOfRelationshipBuilder member_Of(final ClassOfClass classOfClas */ public ClassOfRelationship build() throws HqdmException { if (this.classOfRelationship.hasValue(HAS_SUPERCLASS) - && this.classOfRelationship.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfRelationship.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfRelationship.hasValue(MEMBER__OF) - && this.classOfRelationship.value(MEMBER__OF).isEmpty()) { + && this.classOfRelationship.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfRelationship.hasValue(MEMBER_OF) - && this.classOfRelationship.value(MEMBER_OF).isEmpty()) { + && this.classOfRelationship.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classOfRelationship; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRepresentationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRepresentationBuilder.java index ee8cb27b..b2b04d18 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRepresentationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfRepresentationBuilder.java @@ -58,7 +58,7 @@ public final ClassOfRepresentationBuilder has_Superclass(final Class clazz) { */ public ClassOfRepresentation build() throws HqdmException { if (this.classOfRepresentation.hasValue(HAS_SUPERCLASS) - && this.classOfRepresentation.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfRepresentation.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } return this.classOfRepresentation; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java index 0613b142..3175c3d9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java @@ -142,23 +142,23 @@ public final ClassOfSalesProductInstanceBuilder part__Of_By_Class( */ public ClassOfSalesProductInstance build() throws HqdmException { if (this.classOfSalesProductInstance.hasValue(HAS_SUPERCLASS) - && this.classOfSalesProductInstance.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSalesProductInstance.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSalesProductInstance.hasValue(MEMBER__OF) - && this.classOfSalesProductInstance.value(MEMBER__OF).isEmpty()) { + && this.classOfSalesProductInstance.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSalesProductInstance.hasValue(MEMBER_OF) - && this.classOfSalesProductInstance.value(MEMBER_OF).isEmpty()) { + && this.classOfSalesProductInstance.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSalesProductInstance.hasValue(MEMBER_OF_) - && this.classOfSalesProductInstance.value(MEMBER_OF_).isEmpty()) { + && this.classOfSalesProductInstance.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSalesProductInstance.hasValue(PART__OF_BY_CLASS) - && this.classOfSalesProductInstance.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSalesProductInstance.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSalesProductInstance; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java index dae1592c..70c7d9d1 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java @@ -138,23 +138,23 @@ public final ClassOfSignBuilder part__Of_By_Class( */ public ClassOfSign build() throws HqdmException { if (this.classOfSign.hasValue(HAS_SUPERCLASS) - && this.classOfSign.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSign.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSign.hasValue(MEMBER__OF) - && this.classOfSign.value(MEMBER__OF).isEmpty()) { + && this.classOfSign.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSign.hasValue(MEMBER_OF) - && this.classOfSign.value(MEMBER_OF).isEmpty()) { + && this.classOfSign.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSign.hasValue(MEMBER_OF_) - && this.classOfSign.value(MEMBER_OF_).isEmpty()) { + && this.classOfSign.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSign.hasValue(PART__OF_BY_CLASS) - && this.classOfSign.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSign.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSign; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java index c07131ed..417ba0fb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java @@ -183,31 +183,31 @@ public final ClassOfSociallyConstructedActivityBuilder part_Of_By_Class_( */ public ClassOfSociallyConstructedActivity build() throws HqdmException { if (this.classOfSociallyConstructedActivity.hasValue(HAS_SUPERCLASS) - && this.classOfSociallyConstructedActivity.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSociallyConstructedActivity.hasValue(MEMBER__OF) - && this.classOfSociallyConstructedActivity.value(MEMBER__OF).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSociallyConstructedActivity.hasValue(MEMBER_OF) - && this.classOfSociallyConstructedActivity.value(MEMBER_OF).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSociallyConstructedActivity.hasValue(MEMBER_OF_) - && this.classOfSociallyConstructedActivity.value(MEMBER_OF_).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSociallyConstructedActivity.hasValue(PART__OF_BY_CLASS) - && this.classOfSociallyConstructedActivity.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.classOfSociallyConstructedActivity.hasValue(PART_OF_BY_CLASS) - && this.classOfSociallyConstructedActivity.value(PART_OF_BY_CLASS).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.classOfSociallyConstructedActivity.hasValue(PART_OF_BY_CLASS_) - && this.classOfSociallyConstructedActivity.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.classOfSociallyConstructedActivity.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return this.classOfSociallyConstructedActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java index a18afc93..7677f7d3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java @@ -144,23 +144,23 @@ public final ClassOfSociallyConstructedObjectBuilder part__Of_By_Class( */ public ClassOfSociallyConstructedObject build() throws HqdmException { if (this.classOfSociallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.classOfSociallyConstructedObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSociallyConstructedObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSociallyConstructedObject.hasValue(MEMBER__OF) - && this.classOfSociallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.classOfSociallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSociallyConstructedObject.hasValue(MEMBER_OF) - && this.classOfSociallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.classOfSociallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSociallyConstructedObject.hasValue(MEMBER_OF_) - && this.classOfSociallyConstructedObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfSociallyConstructedObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSociallyConstructedObject.hasValue(PART__OF_BY_CLASS) - && this.classOfSociallyConstructedObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSociallyConstructedObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSociallyConstructedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java index f1917192..598d6ea4 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java @@ -141,23 +141,23 @@ public final ClassOfSpatioTemporalExtentBuilder part__Of_By_Class( */ public ClassOfSpatioTemporalExtent build() throws HqdmException { if (this.classOfSpatioTemporalExtent.hasValue(HAS_SUPERCLASS) - && this.classOfSpatioTemporalExtent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSpatioTemporalExtent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSpatioTemporalExtent.hasValue(MEMBER__OF) - && this.classOfSpatioTemporalExtent.value(MEMBER__OF).isEmpty()) { + && this.classOfSpatioTemporalExtent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSpatioTemporalExtent.hasValue(MEMBER_OF) - && this.classOfSpatioTemporalExtent.value(MEMBER_OF).isEmpty()) { + && this.classOfSpatioTemporalExtent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSpatioTemporalExtent.hasValue(MEMBER_OF_) - && this.classOfSpatioTemporalExtent.value(MEMBER_OF_).isEmpty()) { + && this.classOfSpatioTemporalExtent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSpatioTemporalExtent.hasValue(PART__OF_BY_CLASS) - && this.classOfSpatioTemporalExtent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSpatioTemporalExtent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSpatioTemporalExtent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java index ce8583a1..1f8b76a4 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java @@ -138,23 +138,23 @@ public final ClassOfStateBuilder part__Of_By_Class( */ public ClassOfState build() throws HqdmException { if (this.classOfState.hasValue(HAS_SUPERCLASS) - && this.classOfState.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfState.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfState.hasValue(MEMBER__OF) - && this.classOfState.value(MEMBER__OF).isEmpty()) { + && this.classOfState.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfState.hasValue(MEMBER_OF) - && this.classOfState.value(MEMBER_OF).isEmpty()) { + && this.classOfState.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfState.hasValue(MEMBER_OF_) - && this.classOfState.value(MEMBER_OF_).isEmpty()) { + && this.classOfState.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfState.hasValue(PART__OF_BY_CLASS) - && this.classOfState.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfState.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfState; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java index 4f9821dd..48866410 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfActivityBuilder part__Of_By_Class( */ public ClassOfStateOfActivity build() throws HqdmException { if (this.classOfStateOfActivity.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfActivity.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfActivity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfActivity.hasValue(MEMBER__OF) - && this.classOfStateOfActivity.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfActivity.hasValue(MEMBER_OF) - && this.classOfStateOfActivity.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfActivity.hasValue(MEMBER_OF_) - && this.classOfStateOfActivity.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfActivity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfActivity.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfActivity.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfActivity.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java index d2b5426f..b6fcbff5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java @@ -142,23 +142,23 @@ public final ClassOfStateOfAmountOfMoneyBuilder part__Of_By_Class( */ public ClassOfStateOfAmountOfMoney build() throws HqdmException { if (this.classOfStateOfAmountOfMoney.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfAmountOfMoney.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfAmountOfMoney.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfAmountOfMoney.hasValue(MEMBER__OF) - && this.classOfStateOfAmountOfMoney.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfAmountOfMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfAmountOfMoney.hasValue(MEMBER_OF) - && this.classOfStateOfAmountOfMoney.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfAmountOfMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfAmountOfMoney.hasValue(MEMBER_OF_) - && this.classOfStateOfAmountOfMoney.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfAmountOfMoney.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfAmountOfMoney.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfAmountOfMoney.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfAmountOfMoney.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfAmountOfMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java index c396ba6c..eb08f449 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfAssociationBuilder part__Of_By_Class( */ public ClassOfStateOfAssociation build() throws HqdmException { if (this.classOfStateOfAssociation.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfAssociation.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfAssociation.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfAssociation.hasValue(MEMBER__OF) - && this.classOfStateOfAssociation.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfAssociation.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfAssociation.hasValue(MEMBER_OF) - && this.classOfStateOfAssociation.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfAssociation.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfAssociation.hasValue(MEMBER_OF_) - && this.classOfStateOfAssociation.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfAssociation.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfAssociation.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfAssociation.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfAssociation.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfAssociation; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java index dbee8f47..15f00853 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java @@ -143,23 +143,23 @@ public final ClassOfStateOfBiologicalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfBiologicalObject build() throws HqdmException { if (this.classOfStateOfBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfBiologicalObject.hasValue(MEMBER__OF) - && this.classOfStateOfBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfBiologicalObject.hasValue(MEMBER_OF) - && this.classOfStateOfBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfBiologicalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfBiologicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfBiologicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java index 3fcf7adc..3f5484f1 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java @@ -143,23 +143,23 @@ public final ClassOfStateOfBiologicalSystemBuilder part__Of_By_Class( */ public ClassOfStateOfBiologicalSystem build() throws HqdmException { if (this.classOfStateOfBiologicalSystem.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfBiologicalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfBiologicalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfBiologicalSystem.hasValue(MEMBER__OF) - && this.classOfStateOfBiologicalSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfBiologicalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfBiologicalSystem.hasValue(MEMBER_OF) - && this.classOfStateOfBiologicalSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfBiologicalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfBiologicalSystem.hasValue(MEMBER_OF_) - && this.classOfStateOfBiologicalSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfBiologicalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfBiologicalSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfBiologicalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfBiologicalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfBiologicalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java index fcbc029c..0baa0fb7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java @@ -145,24 +145,24 @@ public final ClassOfStateOfBiologicalSystemComponentBuilder part__Of_By_Class( */ public ClassOfStateOfBiologicalSystemComponent build() throws HqdmException { if (this.classOfStateOfBiologicalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfBiologicalSystemComponent.value(HAS_SUPERCLASS) + && this.classOfStateOfBiologicalSystemComponent.values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfBiologicalSystemComponent.hasValue(MEMBER__OF) - && this.classOfStateOfBiologicalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfBiologicalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfBiologicalSystemComponent.hasValue(MEMBER_OF) - && this.classOfStateOfBiologicalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfBiologicalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfBiologicalSystemComponent.hasValue(MEMBER_OF_) - && this.classOfStateOfBiologicalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfBiologicalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfBiologicalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfBiologicalSystemComponent.value(PART__OF_BY_CLASS) + && this.classOfStateOfBiologicalSystemComponent.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java index 26eca36b..7b0dfb7c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java @@ -143,23 +143,23 @@ public final ClassOfStateOfFunctionalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfFunctionalObject build() throws HqdmException { if (this.classOfStateOfFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfFunctionalObject.hasValue(MEMBER__OF) - && this.classOfStateOfFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfFunctionalObject.hasValue(MEMBER_OF) - && this.classOfStateOfFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfFunctionalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfFunctionalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfFunctionalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java index 4b64369d..9c026d14 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java @@ -143,23 +143,23 @@ public final ClassOfStateOfFunctionalSystemBuilder part__Of_By_Class( */ public ClassOfStateOfFunctionalSystem build() throws HqdmException { if (this.classOfStateOfFunctionalSystem.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfFunctionalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfFunctionalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfFunctionalSystem.hasValue(MEMBER__OF) - && this.classOfStateOfFunctionalSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfFunctionalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfFunctionalSystem.hasValue(MEMBER_OF) - && this.classOfStateOfFunctionalSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfFunctionalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfFunctionalSystem.hasValue(MEMBER_OF_) - && this.classOfStateOfFunctionalSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfFunctionalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfFunctionalSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfFunctionalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfFunctionalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfFunctionalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java index 3dc8f7be..c985eb2f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java @@ -145,24 +145,24 @@ public final ClassOfStateOfFunctionalSystemComponentBuilder part__Of_By_Class( */ public ClassOfStateOfFunctionalSystemComponent build() throws HqdmException { if (this.classOfStateOfFunctionalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfFunctionalSystemComponent.value(HAS_SUPERCLASS) + && this.classOfStateOfFunctionalSystemComponent.values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.classOfStateOfFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.classOfStateOfFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfFunctionalSystemComponent.hasValue(MEMBER_OF_) - && this.classOfStateOfFunctionalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfFunctionalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfFunctionalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfFunctionalSystemComponent.value(PART__OF_BY_CLASS) + && this.classOfStateOfFunctionalSystemComponent.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java index f8dc4bbe..63b9a9a9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java @@ -147,27 +147,27 @@ public final ClassOfStateOfIntentionallyConstructedObjectBuilder part__Of_By_Cla */ public ClassOfStateOfIntentionallyConstructedObject build() throws HqdmException { if (this.classOfStateOfIntentionallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfIntentionallyConstructedObject.value(HAS_SUPERCLASS) + && this.classOfStateOfIntentionallyConstructedObject.values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfIntentionallyConstructedObject.hasValue(MEMBER__OF) - && this.classOfStateOfIntentionallyConstructedObject.value(MEMBER__OF) + && this.classOfStateOfIntentionallyConstructedObject.values(MEMBER__OF) .isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfIntentionallyConstructedObject.hasValue(MEMBER_OF) - && this.classOfStateOfIntentionallyConstructedObject.value(MEMBER_OF) + && this.classOfStateOfIntentionallyConstructedObject.values(MEMBER_OF) .isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfIntentionallyConstructedObject.hasValue(MEMBER_OF_) - && this.classOfStateOfIntentionallyConstructedObject.value(MEMBER_OF_) + && this.classOfStateOfIntentionallyConstructedObject.values(MEMBER_OF_) .isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfIntentionallyConstructedObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfIntentionallyConstructedObject.value(PART__OF_BY_CLASS) + && this.classOfStateOfIntentionallyConstructedObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java index 2da9473d..146ef17c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java @@ -145,23 +145,23 @@ public final ClassOfStateOfOrdinaryBiologicalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfOrdinaryBiologicalObject build() throws HqdmException { if (this.classOfStateOfOrdinaryBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfOrdinaryBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfOrdinaryBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfOrdinaryBiologicalObject.hasValue(MEMBER__OF) - && this.classOfStateOfOrdinaryBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfOrdinaryBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfOrdinaryBiologicalObject.hasValue(MEMBER_OF) - && this.classOfStateOfOrdinaryBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfOrdinaryBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfOrdinaryBiologicalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfOrdinaryBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfOrdinaryBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfOrdinaryBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfOrdinaryBiologicalObject.value(PART__OF_BY_CLASS) + && this.classOfStateOfOrdinaryBiologicalObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java index f09884b4..a3bbd1b0 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java @@ -145,23 +145,23 @@ public final ClassOfStateOfOrdinaryFunctionalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfOrdinaryFunctionalObject build() throws HqdmException { if (this.classOfStateOfOrdinaryFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfOrdinaryFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfOrdinaryFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfOrdinaryFunctionalObject.hasValue(MEMBER__OF) - && this.classOfStateOfOrdinaryFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfOrdinaryFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfOrdinaryFunctionalObject.hasValue(MEMBER_OF) - && this.classOfStateOfOrdinaryFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfOrdinaryFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfOrdinaryFunctionalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfOrdinaryFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfOrdinaryFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfOrdinaryFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfOrdinaryFunctionalObject.value(PART__OF_BY_CLASS) + && this.classOfStateOfOrdinaryFunctionalObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java index 1eafbaee..cbfdaa89 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java @@ -145,23 +145,23 @@ public final ClassOfStateOfOrdinaryPhysicalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfOrdinaryPhysicalObject build() throws HqdmException { if (this.classOfStateOfOrdinaryPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfOrdinaryPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfOrdinaryPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfOrdinaryPhysicalObject.hasValue(MEMBER__OF) - && this.classOfStateOfOrdinaryPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfOrdinaryPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfOrdinaryPhysicalObject.hasValue(MEMBER_OF) - && this.classOfStateOfOrdinaryPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfOrdinaryPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfOrdinaryPhysicalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfOrdinaryPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfOrdinaryPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfOrdinaryPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfOrdinaryPhysicalObject.value(PART__OF_BY_CLASS) + && this.classOfStateOfOrdinaryPhysicalObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java index 3b2ec3d5..5316e8f2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java @@ -142,23 +142,23 @@ public final ClassOfStateOfOrganizationBuilder part__Of_By_Class( */ public ClassOfStateOfOrganization build() throws HqdmException { if (this.classOfStateOfOrganization.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfOrganization.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfOrganization.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfOrganization.hasValue(MEMBER__OF) - && this.classOfStateOfOrganization.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfOrganization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfOrganization.hasValue(MEMBER_OF) - && this.classOfStateOfOrganization.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfOrganization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfOrganization.hasValue(MEMBER_OF_) - && this.classOfStateOfOrganization.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfOrganization.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfOrganization.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfOrganization.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfOrganization.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfOrganization; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java index 4a060f9a..23629050 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java @@ -145,23 +145,23 @@ public final ClassOfStateOfOrganizationComponentBuilder part__Of_By_Class( */ public ClassOfStateOfOrganizationComponent build() throws HqdmException { if (this.classOfStateOfOrganizationComponent.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfOrganizationComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfOrganizationComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfOrganizationComponent.hasValue(MEMBER__OF) - && this.classOfStateOfOrganizationComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfOrganizationComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfOrganizationComponent.hasValue(MEMBER_OF) - && this.classOfStateOfOrganizationComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfOrganizationComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfOrganizationComponent.hasValue(MEMBER_OF_) - && this.classOfStateOfOrganizationComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfOrganizationComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfOrganizationComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfOrganizationComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfOrganizationComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfOrganizationComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java index 26265edb..868ed003 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfPartyBuilder part__Of_By_Class( */ public ClassOfStateOfParty build() throws HqdmException { if (this.classOfStateOfParty.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfParty.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfParty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfParty.hasValue(MEMBER__OF) - && this.classOfStateOfParty.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfParty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfParty.hasValue(MEMBER_OF) - && this.classOfStateOfParty.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfParty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfParty.hasValue(MEMBER_OF_) - && this.classOfStateOfParty.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfParty.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfParty.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfParty.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfParty.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfParty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java index b60f95fb..b9688784 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfPersonBuilder part__Of_By_Class( */ public ClassOfStateOfPerson build() throws HqdmException { if (this.classOfStateOfPerson.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfPerson.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfPerson.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfPerson.hasValue(MEMBER__OF) - && this.classOfStateOfPerson.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfPerson.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfPerson.hasValue(MEMBER_OF) - && this.classOfStateOfPerson.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfPerson.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfPerson.hasValue(MEMBER_OF_) - && this.classOfStateOfPerson.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfPerson.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfPerson.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfPerson.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfPerson.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfPerson; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java index c3c56b5c..d6bf50ab 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java @@ -142,23 +142,23 @@ public final ClassOfStateOfPhysicalObjectBuilder part__Of_By_Class( */ public ClassOfStateOfPhysicalObject build() throws HqdmException { if (this.classOfStateOfPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfPhysicalObject.hasValue(MEMBER__OF) - && this.classOfStateOfPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfPhysicalObject.hasValue(MEMBER_OF) - && this.classOfStateOfPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfPhysicalObject.hasValue(MEMBER_OF_) - && this.classOfStateOfPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfPhysicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfPhysicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java index 3db284d5..f532538a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfPositionBuilder part__Of_By_Class( */ public ClassOfStateOfPosition build() throws HqdmException { if (this.classOfStateOfPosition.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfPosition.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfPosition.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfPosition.hasValue(MEMBER__OF) - && this.classOfStateOfPosition.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfPosition.hasValue(MEMBER_OF) - && this.classOfStateOfPosition.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfPosition.hasValue(MEMBER_OF_) - && this.classOfStateOfPosition.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfPosition.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfPosition.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfPosition.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfPosition.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java index b2e6a39e..43cf750d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java @@ -144,23 +144,23 @@ public final ClassOfStateOfSalesProductInstanceBuilder part__Of_By_Class( */ public ClassOfStateOfSalesProductInstance build() throws HqdmException { if (this.classOfStateOfSalesProductInstance.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSalesProductInstance.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfSalesProductInstance.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSalesProductInstance.hasValue(MEMBER__OF) - && this.classOfStateOfSalesProductInstance.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSalesProductInstance.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSalesProductInstance.hasValue(MEMBER_OF) - && this.classOfStateOfSalesProductInstance.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSalesProductInstance.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSalesProductInstance.hasValue(MEMBER_OF_) - && this.classOfStateOfSalesProductInstance.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSalesProductInstance.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSalesProductInstance.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSalesProductInstance.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfSalesProductInstance.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfSalesProductInstance; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java index 41e1a28b..dff69e28 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfSignBuilder part__Of_By_Class( */ public ClassOfStateOfSign build() throws HqdmException { if (this.classOfStateOfSign.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSign.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfSign.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSign.hasValue(MEMBER__OF) - && this.classOfStateOfSign.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSign.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSign.hasValue(MEMBER_OF) - && this.classOfStateOfSign.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSign.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSign.hasValue(MEMBER_OF_) - && this.classOfStateOfSign.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSign.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSign.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSign.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfSign.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfSign; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java index 6c7f9cbf..b4aaa3a5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java @@ -146,24 +146,24 @@ public final ClassOfStateOfSociallyConstructedActivityBuilder part__Of_By_Class( */ public ClassOfStateOfSociallyConstructedActivity build() throws HqdmException { if (this.classOfStateOfSociallyConstructedActivity.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSociallyConstructedActivity.value(HAS_SUPERCLASS) + && this.classOfStateOfSociallyConstructedActivity.values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSociallyConstructedActivity.hasValue(MEMBER__OF) - && this.classOfStateOfSociallyConstructedActivity.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSociallyConstructedActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSociallyConstructedActivity.hasValue(MEMBER_OF) - && this.classOfStateOfSociallyConstructedActivity.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSociallyConstructedActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSociallyConstructedActivity.hasValue(MEMBER_OF_) - && this.classOfStateOfSociallyConstructedActivity.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSociallyConstructedActivity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSociallyConstructedActivity.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSociallyConstructedActivity.value(PART__OF_BY_CLASS) + && this.classOfStateOfSociallyConstructedActivity.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java index b4ba4501..af7d32a9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java @@ -145,24 +145,24 @@ public final ClassOfStateOfSociallyConstructedObjectBuilder part__Of_By_Class( */ public ClassOfStateOfSociallyConstructedObject build() throws HqdmException { if (this.classOfStateOfSociallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSociallyConstructedObject.value(HAS_SUPERCLASS) + && this.classOfStateOfSociallyConstructedObject.values(HAS_SUPERCLASS) .isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSociallyConstructedObject.hasValue(MEMBER__OF) - && this.classOfStateOfSociallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSociallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSociallyConstructedObject.hasValue(MEMBER_OF) - && this.classOfStateOfSociallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSociallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSociallyConstructedObject.hasValue(MEMBER_OF_) - && this.classOfStateOfSociallyConstructedObject.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSociallyConstructedObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSociallyConstructedObject.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSociallyConstructedObject.value(PART__OF_BY_CLASS) + && this.classOfStateOfSociallyConstructedObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java index 628236c3..c8055724 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java @@ -141,23 +141,23 @@ public final ClassOfStateOfSystemBuilder part__Of_By_Class( */ public ClassOfStateOfSystem build() throws HqdmException { if (this.classOfStateOfSystem.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSystem.hasValue(MEMBER__OF) - && this.classOfStateOfSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSystem.hasValue(MEMBER_OF) - && this.classOfStateOfSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSystem.hasValue(MEMBER_OF_) - && this.classOfStateOfSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java index f4ccbab6..bbd5345a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java @@ -142,23 +142,23 @@ public final ClassOfStateOfSystemComponentBuilder part__Of_By_Class( */ public ClassOfStateOfSystemComponent build() throws HqdmException { if (this.classOfStateOfSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfStateOfSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfStateOfSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfStateOfSystemComponent.hasValue(MEMBER__OF) - && this.classOfStateOfSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfStateOfSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfStateOfSystemComponent.hasValue(MEMBER_OF) - && this.classOfStateOfSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfStateOfSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfStateOfSystemComponent.hasValue(MEMBER_OF_) - && this.classOfStateOfSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfStateOfSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfStateOfSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfStateOfSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfStateOfSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfStateOfSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java index a5917622..d89a8f65 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java @@ -138,23 +138,23 @@ public final ClassOfSystemBuilder part__Of_By_Class( */ public ClassOfSystem build() throws HqdmException { if (this.classOfSystem.hasValue(HAS_SUPERCLASS) - && this.classOfSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSystem.hasValue(MEMBER__OF) - && this.classOfSystem.value(MEMBER__OF).isEmpty()) { + && this.classOfSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSystem.hasValue(MEMBER_OF) - && this.classOfSystem.value(MEMBER_OF).isEmpty()) { + && this.classOfSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSystem.hasValue(MEMBER_OF_) - && this.classOfSystem.value(MEMBER_OF_).isEmpty()) { + && this.classOfSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSystem.hasValue(PART__OF_BY_CLASS) - && this.classOfSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java index 634002c9..362c2df8 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java @@ -141,23 +141,23 @@ public final ClassOfSystemComponentBuilder part__Of_By_Class( */ public ClassOfSystemComponent build() throws HqdmException { if (this.classOfSystemComponent.hasValue(HAS_SUPERCLASS) - && this.classOfSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.classOfSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.classOfSystemComponent.hasValue(MEMBER__OF) - && this.classOfSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.classOfSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classOfSystemComponent.hasValue(MEMBER_OF) - && this.classOfSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.classOfSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.classOfSystemComponent.hasValue(MEMBER_OF_) - && this.classOfSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.classOfSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.classOfSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.classOfSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.classOfSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.classOfSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java index 05004eb4..cc2fcd2f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java @@ -107,11 +107,11 @@ public Classification build() throws HqdmException { throw new HqdmException("Property Not Set: member"); } if (this.classification.hasValue(MEMBER__OF) - && this.classification.value(MEMBER__OF).isEmpty()) { + && this.classification.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.classification.hasValue(MEMBER_OF) - && this.classification.value(MEMBER_OF).isEmpty()) { + && this.classification.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return this.classification; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CompositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CompositionBuilder.java index c2f7e385..24ace293 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CompositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CompositionBuilder.java @@ -100,11 +100,11 @@ public final CompositionBuilder whole_M(final SpatioTemporalExtent spatioTempora */ public Composition build() throws HqdmException { if (this.composition.hasValue(MEMBER__OF) - && this.composition.value(MEMBER__OF).isEmpty()) { + && this.composition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.composition.hasValue(MEMBER_OF) - && this.composition.value(MEMBER_OF).isEmpty()) { + && this.composition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.composition.hasValue(PART)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java index 4bdedcaf..2f7874bb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java @@ -321,59 +321,59 @@ public final ContractExecutionBuilder temporal_Part_Of(final Individual individu */ public ContractExecution build() throws HqdmException { if (this.contractExecution.hasValue(AGGREGATED_INTO) - && this.contractExecution.value(AGGREGATED_INTO).isEmpty()) { + && this.contractExecution.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.contractExecution.hasValue(BEGINNING) - && this.contractExecution.value(BEGINNING).isEmpty()) { + && this.contractExecution.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.contractExecution.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.contractExecution.hasValue(DETERMINES) - && this.contractExecution.value(DETERMINES).isEmpty()) { + && this.contractExecution.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.contractExecution.hasValue(ENDING) - && this.contractExecution.value(ENDING).isEmpty()) { + && this.contractExecution.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.contractExecution.hasValue(MEMBER__OF) - && this.contractExecution.value(MEMBER__OF).isEmpty()) { + && this.contractExecution.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.contractExecution.hasValue(MEMBER_OF) - && this.contractExecution.value(MEMBER_OF).isEmpty()) { + && this.contractExecution.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.contractExecution.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.contractExecution.hasValue(PART__OF) - && this.contractExecution.value(PART__OF).isEmpty()) { + && this.contractExecution.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.contractExecution.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.contractExecution.hasValue(PART_OF_) - && this.contractExecution.value(PART_OF_).isEmpty()) { + && this.contractExecution.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.contractExecution.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.contractExecution.hasValue(REFERENCES) - && this.contractExecution.value(REFERENCES).isEmpty()) { + && this.contractExecution.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.contractExecution.hasValue(TEMPORAL__PART_OF) - && this.contractExecution.value(TEMPORAL__PART_OF).isEmpty()) { + && this.contractExecution.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.contractExecution.hasValue(TEMPORAL_PART_OF) - && this.contractExecution.value(TEMPORAL_PART_OF).isEmpty()) { + && this.contractExecution.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.contractExecution; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java index 86e51581..f0fadc7f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java @@ -339,60 +339,60 @@ public final ContractProcessBuilder temporal_Part_Of(final Individual individual */ public ContractProcess build() throws HqdmException { if (this.contractProcess.hasValue(AGGREGATED_INTO) - && this.contractProcess.value(AGGREGATED_INTO).isEmpty()) { + && this.contractProcess.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.contractProcess.hasValue(BEGINNING) - && this.contractProcess.value(BEGINNING).isEmpty()) { + && this.contractProcess.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.contractProcess.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.contractProcess.hasValue(DETERMINES) - && this.contractProcess.value(DETERMINES).isEmpty()) { + && this.contractProcess.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.contractProcess.hasValue(ENDING) - && this.contractProcess.value(ENDING).isEmpty()) { + && this.contractProcess.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.contractProcess.hasValue(MEMBER__OF) - && this.contractProcess.value(MEMBER__OF).isEmpty()) { + && this.contractProcess.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.contractProcess.hasValue(MEMBER_OF) - && this.contractProcess.value(MEMBER_OF).isEmpty()) { + && this.contractProcess.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.contractProcess.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.contractProcess.hasValue(PART__OF) - && this.contractProcess.value(PART__OF).isEmpty()) { + && this.contractProcess.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.contractProcess.hasValue(PART_OF) - && this.contractProcess.value(PART_OF).isEmpty()) { + && this.contractProcess.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.contractProcess.hasValue(PART_OF_) - && this.contractProcess.value(PART_OF_).isEmpty()) { + && this.contractProcess.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.contractProcess.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.contractProcess.hasValue(REFERENCES) - && this.contractProcess.value(REFERENCES).isEmpty()) { + && this.contractProcess.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.contractProcess.hasValue(TEMPORAL__PART_OF) - && this.contractProcess.value(TEMPORAL__PART_OF).isEmpty()) { + && this.contractProcess.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.contractProcess.hasValue(TEMPORAL_PART_OF) - && this.contractProcess.value(TEMPORAL_PART_OF).isEmpty()) { + && this.contractProcess.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.contractProcess; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java index 82eaa6a7..c9628983 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java @@ -138,23 +138,23 @@ public final CurrencyBuilder part__Of_By_Class( */ public Currency build() throws HqdmException { if (this.currency.hasValue(HAS_SUPERCLASS) - && this.currency.value(HAS_SUPERCLASS).isEmpty()) { + && this.currency.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.currency.hasValue(MEMBER__OF) - && this.currency.value(MEMBER__OF).isEmpty()) { + && this.currency.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.currency.hasValue(MEMBER_OF) - && this.currency.value(MEMBER_OF).isEmpty()) { + && this.currency.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.currency.hasValue(MEMBER_OF_) - && this.currency.value(MEMBER_OF_).isEmpty()) { + && this.currency.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.currency.hasValue(PART__OF_BY_CLASS) - && this.currency.value(PART__OF_BY_CLASS).isEmpty()) { + && this.currency.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return this.currency; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinedRelationshipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinedRelationshipBuilder.java index 292c222c..a5811cfc 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinedRelationshipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinedRelationshipBuilder.java @@ -108,11 +108,11 @@ public DefinedRelationship build() throws HqdmException { throw new HqdmException("Property Not Set: involves"); } if (this.definedRelationship.hasValue(MEMBER__OF) - && this.definedRelationship.value(MEMBER__OF).isEmpty()) { + && this.definedRelationship.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.definedRelationship.hasValue(MEMBER_OF) - && this.definedRelationship.value(MEMBER_OF).isEmpty()) { + && this.definedRelationship.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.definedRelationship.hasValue(MEMBER_OF_KIND)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java index dfeb5bf3..94e5c50e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java @@ -229,30 +229,30 @@ public final EmployeeBuilder temporal_Part_Of(final Person person) { */ public Employee build() throws HqdmException { if (this.employee.hasValue(AGGREGATED_INTO) - && this.employee.value(AGGREGATED_INTO).isEmpty()) { + && this.employee.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.employee.hasValue(BEGINNING) - && this.employee.value(BEGINNING).isEmpty()) { + && this.employee.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.employee.hasValue(ENDING) - && this.employee.value(ENDING).isEmpty()) { + && this.employee.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.employee.hasValue(MEMBER__OF) - && this.employee.value(MEMBER__OF).isEmpty()) { + && this.employee.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.employee.hasValue(MEMBER_OF) - && this.employee.value(MEMBER_OF).isEmpty()) { + && this.employee.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.employee.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.employee.hasValue(PART__OF) - && this.employee.value(PART__OF).isEmpty()) { + && this.employee.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.employee.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -262,11 +262,11 @@ public Employee build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.employee.hasValue(TEMPORAL__PART_OF) - && this.employee.value(TEMPORAL__PART_OF).isEmpty()) { + && this.employee.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.employee.hasValue(TEMPORAL_PART_OF) - && this.employee.value(TEMPORAL_PART_OF).isEmpty()) { + && this.employee.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.employee; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java index 72189cab..9fb3cfa2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java @@ -229,30 +229,30 @@ public final EmployerBuilder temporal_Part_Of(final Party party) { */ public Employer build() throws HqdmException { if (this.employer.hasValue(AGGREGATED_INTO) - && this.employer.value(AGGREGATED_INTO).isEmpty()) { + && this.employer.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.employer.hasValue(BEGINNING) - && this.employer.value(BEGINNING).isEmpty()) { + && this.employer.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.employer.hasValue(ENDING) - && this.employer.value(ENDING).isEmpty()) { + && this.employer.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.employer.hasValue(MEMBER__OF) - && this.employer.value(MEMBER__OF).isEmpty()) { + && this.employer.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.employer.hasValue(MEMBER_OF) - && this.employer.value(MEMBER_OF).isEmpty()) { + && this.employer.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.employer.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.employer.hasValue(PART__OF) - && this.employer.value(PART__OF).isEmpty()) { + && this.employer.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.employer.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -262,11 +262,11 @@ public Employer build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.employer.hasValue(TEMPORAL__PART_OF) - && this.employer.value(TEMPORAL__PART_OF).isEmpty()) { + && this.employer.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.employer.hasValue(TEMPORAL_PART_OF) - && this.employer.value(TEMPORAL_PART_OF).isEmpty()) { + && this.employer.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.employer; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java index fc0335f4..27bdc522 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java @@ -253,41 +253,41 @@ public final EmploymentBuilder temporal_Part_Of(final Individual individual) { */ public Employment build() throws HqdmException { if (this.employment.hasValue(AGGREGATED_INTO) - && this.employment.value(AGGREGATED_INTO).isEmpty()) { + && this.employment.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.employment.hasValue(BEGINNING) - && this.employment.value(BEGINNING).isEmpty()) { + && this.employment.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.employment.hasValue(ENDING) - && this.employment.value(ENDING).isEmpty()) { + && this.employment.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.employment.hasValue(MEMBER__OF) - && this.employment.value(MEMBER__OF).isEmpty()) { + && this.employment.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.employment.hasValue(MEMBER_OF) - && this.employment.value(MEMBER_OF).isEmpty()) { + && this.employment.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.employment.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.employment.hasValue(PART__OF) - && this.employment.value(PART__OF).isEmpty()) { + && this.employment.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.employment.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.employment.hasValue(TEMPORAL__PART_OF) - && this.employment.value(TEMPORAL__PART_OF).isEmpty()) { + && this.employment.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.employment.hasValue(TEMPORAL_PART_OF) - && this.employment.value(TEMPORAL_PART_OF).isEmpty()) { + && this.employment.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return this.employment; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java index 1b3df0b8..11db2cd3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java @@ -183,34 +183,34 @@ public final EndingOfOwnershipBuilder temporal__Part_Of(final SpatioTemporalExte */ public EndingOfOwnership build() throws HqdmException { if (this.endingOfOwnership.hasValue(AGGREGATED_INTO) - && this.endingOfOwnership.value(AGGREGATED_INTO).isEmpty()) { + && this.endingOfOwnership.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.endingOfOwnership.hasValue(BEGINNING) - && this.endingOfOwnership.value(BEGINNING).isEmpty()) { + && this.endingOfOwnership.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.endingOfOwnership.hasValue(ENDING) - && this.endingOfOwnership.value(ENDING).isEmpty()) { + && this.endingOfOwnership.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.endingOfOwnership.hasValue(MEMBER__OF) - && this.endingOfOwnership.value(MEMBER__OF).isEmpty()) { + && this.endingOfOwnership.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.endingOfOwnership.hasValue(MEMBER_OF) - && this.endingOfOwnership.value(MEMBER_OF).isEmpty()) { + && this.endingOfOwnership.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.endingOfOwnership.hasValue(PART__OF) - && this.endingOfOwnership.value(PART__OF).isEmpty()) { + && this.endingOfOwnership.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.endingOfOwnership.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.endingOfOwnership.hasValue(TEMPORAL__PART_OF) - && this.endingOfOwnership.value(TEMPORAL__PART_OF).isEmpty()) { + && this.endingOfOwnership.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return this.endingOfOwnership; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EnumeratedClassBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EnumeratedClassBuilder.java index eba5b534..be206986 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EnumeratedClassBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EnumeratedClassBuilder.java @@ -86,15 +86,15 @@ public final EnumeratedClassBuilder member_Of(final ClassOfClass classOfClass) { */ public EnumeratedClass build() throws HqdmException { if (this.enumeratedClass.hasValue(HAS_SUPERCLASS) - && this.enumeratedClass.value(HAS_SUPERCLASS).isEmpty()) { + && this.enumeratedClass.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.enumeratedClass.hasValue(MEMBER__OF) - && this.enumeratedClass.value(MEMBER__OF).isEmpty()) { + && this.enumeratedClass.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.enumeratedClass.hasValue(MEMBER_OF) - && this.enumeratedClass.value(MEMBER_OF).isEmpty()) { + && this.enumeratedClass.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return enumeratedClass; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java index e1d3df92..64fb1399 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java @@ -182,34 +182,34 @@ public final EventBuilder temporal__Part_Of(final SpatioTemporalExtent spatioTem */ public Event build() throws HqdmException { if (this.event.hasValue(AGGREGATED_INTO) - && this.event.value(AGGREGATED_INTO).isEmpty()) { + && this.event.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.event.hasValue(BEGINNING) - && this.event.value(BEGINNING).isEmpty()) { + && this.event.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.event.hasValue(ENDING) - && this.event.value(ENDING).isEmpty()) { + && this.event.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.event.hasValue(MEMBER__OF) - && this.event.value(MEMBER__OF).isEmpty()) { + && this.event.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.event.hasValue(MEMBER_OF) - && this.event.value(MEMBER_OF).isEmpty()) { + && this.event.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.event.hasValue(PART__OF) - && this.event.value(PART__OF).isEmpty()) { + && this.event.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.event.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.event.hasValue(TEMPORAL__PART_OF) - && this.event.value(TEMPORAL__PART_OF).isEmpty()) { + && this.event.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return event; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java index 6791434a..2fa9ee15 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java @@ -338,59 +338,59 @@ public final ExchangeOfGoodsAndMoneyBuilder temporal_Part_Of(final Individual in */ public ExchangeOfGoodsAndMoney build() throws HqdmException { if (this.exchangeOfGoodsAndMoney.hasValue(AGGREGATED_INTO) - && this.exchangeOfGoodsAndMoney.value(AGGREGATED_INTO).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.exchangeOfGoodsAndMoney.hasValue(BEGINNING) - && this.exchangeOfGoodsAndMoney.value(BEGINNING).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.exchangeOfGoodsAndMoney.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.exchangeOfGoodsAndMoney.hasValue(DETERMINES) - && this.exchangeOfGoodsAndMoney.value(DETERMINES).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.exchangeOfGoodsAndMoney.hasValue(ENDING) - && this.exchangeOfGoodsAndMoney.value(ENDING).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.exchangeOfGoodsAndMoney.hasValue(MEMBER__OF) - && this.exchangeOfGoodsAndMoney.value(MEMBER__OF).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.exchangeOfGoodsAndMoney.hasValue(MEMBER_OF) - && this.exchangeOfGoodsAndMoney.value(MEMBER_OF).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.exchangeOfGoodsAndMoney.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.exchangeOfGoodsAndMoney.hasValue(PART__OF) - && this.exchangeOfGoodsAndMoney.value(PART__OF).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.exchangeOfGoodsAndMoney.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.exchangeOfGoodsAndMoney.hasValue(PART_OF_) - && this.exchangeOfGoodsAndMoney.value(PART_OF_).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.exchangeOfGoodsAndMoney.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.exchangeOfGoodsAndMoney.hasValue(REFERENCES) - && this.exchangeOfGoodsAndMoney.value(REFERENCES).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.exchangeOfGoodsAndMoney.hasValue(TEMPORAL__PART_OF) - && this.exchangeOfGoodsAndMoney.value(TEMPORAL__PART_OF).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.exchangeOfGoodsAndMoney.hasValue(TEMPORAL_PART_OF) - && this.exchangeOfGoodsAndMoney.value(TEMPORAL_PART_OF).isEmpty()) { + && this.exchangeOfGoodsAndMoney.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return exchangeOfGoodsAndMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionBuilder.java index 7be4fd4f..4ac5de3a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionBuilder.java @@ -73,11 +73,11 @@ public final FunctionBuilder member_Of(final ClassOfRelationship classOfRelation */ public Function_ build() throws HqdmException { if (this.function.hasValue(MEMBER__OF) - && this.function.value(MEMBER__OF).isEmpty()) { + && this.function.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.function.hasValue(MEMBER_OF) - && this.function.value(MEMBER_OF).isEmpty()) { + && this.function.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return function; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java index 5e1ec70a..31bcaaf6 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java @@ -236,45 +236,45 @@ public final FunctionalObjectBuilder temporal_Part_Of(final Individual individua */ public FunctionalObject build() throws HqdmException { if (this.functionalObject.hasValue(AGGREGATED_INTO) - && this.functionalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.functionalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.functionalObject.hasValue(BEGINNING) - && this.functionalObject.value(BEGINNING).isEmpty()) { + && this.functionalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.functionalObject.hasValue(ENDING) - && this.functionalObject.value(ENDING).isEmpty()) { + && this.functionalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (!this.functionalObject.hasValue(INTENDED_ROLE)) { throw new HqdmException("Property Not Set: intended_role"); } if (this.functionalObject.hasValue(MEMBER__OF) - && this.functionalObject.value(MEMBER__OF).isEmpty()) { + && this.functionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.functionalObject.hasValue(MEMBER_OF) - && this.functionalObject.value(MEMBER_OF).isEmpty()) { + && this.functionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.functionalObject.hasValue(MEMBER_OF_KIND) - && this.functionalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.functionalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.functionalObject.hasValue(PART__OF) - && this.functionalObject.value(PART__OF).isEmpty()) { + && this.functionalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.functionalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.functionalObject.hasValue(TEMPORAL__PART_OF) - && this.functionalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.functionalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.functionalObject.hasValue(TEMPORAL_PART_OF) - && this.functionalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.functionalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return functionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java index 183a2446..1e94d168 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java @@ -227,45 +227,45 @@ public final FunctionalSystemBuilder temporal_Part_Of(final System system) { */ public FunctionalSystem build() throws HqdmException { if (this.functionalSystem.hasValue(AGGREGATED_INTO) - && this.functionalSystem.value(AGGREGATED_INTO).isEmpty()) { + && this.functionalSystem.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.functionalSystem.hasValue(BEGINNING) - && this.functionalSystem.value(BEGINNING).isEmpty()) { + && this.functionalSystem.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.functionalSystem.hasValue(ENDING) - && this.functionalSystem.value(ENDING).isEmpty()) { + && this.functionalSystem.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (!this.functionalSystem.hasValue(INTENDED_ROLE)) { throw new HqdmException("Property Not Set: intended_role"); } if (this.functionalSystem.hasValue(MEMBER__OF) - && this.functionalSystem.value(MEMBER__OF).isEmpty()) { + && this.functionalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.functionalSystem.hasValue(MEMBER_OF) - && this.functionalSystem.value(MEMBER_OF).isEmpty()) { + && this.functionalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.functionalSystem.hasValue(MEMBER_OF_KIND) - && this.functionalSystem.value(MEMBER_OF_KIND).isEmpty()) { + && this.functionalSystem.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.functionalSystem.hasValue(PART__OF) - && this.functionalSystem.value(PART__OF).isEmpty()) { + && this.functionalSystem.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.functionalSystem.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.functionalSystem.hasValue(TEMPORAL__PART_OF) - && this.functionalSystem.value(TEMPORAL__PART_OF).isEmpty()) { + && this.functionalSystem.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.functionalSystem.hasValue(TEMPORAL_PART_OF) - && this.functionalSystem.value(TEMPORAL_PART_OF).isEmpty()) { + && this.functionalSystem.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return functionalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java index 0192e069..2409602a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java @@ -258,47 +258,47 @@ public final FunctionalSystemComponentBuilder temporal_Part_Of(final Individual */ public FunctionalSystemComponent build() throws HqdmException { if (this.functionalSystemComponent.hasValue(AGGREGATED_INTO) - && this.functionalSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.functionalSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.functionalSystemComponent.hasValue(BEGINNING) - && this.functionalSystemComponent.value(BEGINNING).isEmpty()) { + && this.functionalSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.functionalSystemComponent.hasValue(COMPONENT_OF)) { throw new HqdmException("Property Not Set: component_of"); } if (this.functionalSystemComponent.hasValue(ENDING) - && this.functionalSystemComponent.value(ENDING).isEmpty()) { + && this.functionalSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (!this.functionalSystemComponent.hasValue(INTENDED_ROLE)) { throw new HqdmException("Property Not Set: intended_role"); } if (this.functionalSystemComponent.hasValue(MEMBER__OF) - && this.functionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.functionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.functionalSystemComponent.hasValue(MEMBER_OF) - && this.functionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.functionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.functionalSystemComponent.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.functionalSystemComponent.hasValue(PART__OF) - && this.functionalSystemComponent.value(PART__OF).isEmpty()) { + && this.functionalSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.functionalSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.functionalSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.functionalSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.functionalSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.functionalSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.functionalSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.functionalSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return functionalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java index 9855fa56..3be4e5a4 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java @@ -206,38 +206,38 @@ public final InPlaceBiologicalComponentBuilder temporal_Part_Of( */ public InPlaceBiologicalComponent build() throws HqdmException { if (this.inPlaceBiologicalComponent.hasValue(AGGREGATED_INTO) - && this.inPlaceBiologicalComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.inPlaceBiologicalComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.inPlaceBiologicalComponent.hasValue(BEGINNING) - && this.inPlaceBiologicalComponent.value(BEGINNING).isEmpty()) { + && this.inPlaceBiologicalComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.inPlaceBiologicalComponent.hasValue(ENDING) - && this.inPlaceBiologicalComponent.value(ENDING).isEmpty()) { + && this.inPlaceBiologicalComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.inPlaceBiologicalComponent.hasValue(MEMBER__OF) - && this.inPlaceBiologicalComponent.value(MEMBER__OF).isEmpty()) { + && this.inPlaceBiologicalComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.inPlaceBiologicalComponent.hasValue(MEMBER_OF) - && this.inPlaceBiologicalComponent.value(MEMBER_OF).isEmpty()) { + && this.inPlaceBiologicalComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.inPlaceBiologicalComponent.hasValue(PART__OF) - && this.inPlaceBiologicalComponent.value(PART__OF).isEmpty()) { + && this.inPlaceBiologicalComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.inPlaceBiologicalComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.inPlaceBiologicalComponent.hasValue(TEMPORAL__PART_OF) - && this.inPlaceBiologicalComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.inPlaceBiologicalComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.inPlaceBiologicalComponent.hasValue(TEMPORAL_PART_OF) - && this.inPlaceBiologicalComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.inPlaceBiologicalComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return inPlaceBiologicalComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java index ec6d21bf..b2f26bfc 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java @@ -222,42 +222,42 @@ public final IndividualBuilder temporal_Part_Of(final Individual individual) { */ public Individual build() throws HqdmException { if (this.individual.hasValue(AGGREGATED_INTO) - && this.individual.value(AGGREGATED_INTO).isEmpty()) { + && this.individual.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.individual.hasValue(BEGINNING) - && this.individual.value(BEGINNING).isEmpty()) { + && this.individual.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.individual.hasValue(ENDING) - && this.individual.value(ENDING).isEmpty()) { + && this.individual.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.individual.hasValue(MEMBER__OF) - && this.individual.value(MEMBER__OF).isEmpty()) { + && this.individual.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.individual.hasValue(MEMBER_OF) - && this.individual.value(MEMBER_OF).isEmpty()) { + && this.individual.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.individual.hasValue(MEMBER_OF_KIND) - && this.individual.value(MEMBER_OF_KIND).isEmpty()) { + && this.individual.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.individual.hasValue(PART__OF) - && this.individual.value(PART__OF).isEmpty()) { + && this.individual.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.individual.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.individual.hasValue(TEMPORAL__PART_OF) - && this.individual.value(TEMPORAL__PART_OF).isEmpty()) { + && this.individual.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.individual.hasValue(TEMPORAL_PART_OF) - && this.individual.value(TEMPORAL_PART_OF).isEmpty()) { + && this.individual.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return individual; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java index a4aca1ef..9c057d7e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java @@ -216,38 +216,38 @@ public final InstalledFunctionalSystemComponentBuilder temporal_Part_Of( */ public InstalledFunctionalSystemComponent build() throws HqdmException { if (this.installedFunctionalSystemComponent.hasValue(AGGREGATED_INTO) - && this.installedFunctionalSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.installedFunctionalSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.installedFunctionalSystemComponent.hasValue(BEGINNING) - && this.installedFunctionalSystemComponent.value(BEGINNING).isEmpty()) { + && this.installedFunctionalSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.installedFunctionalSystemComponent.hasValue(ENDING) - && this.installedFunctionalSystemComponent.value(ENDING).isEmpty()) { + && this.installedFunctionalSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.installedFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.installedFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.installedFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.installedFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.installedFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.installedFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.installedFunctionalSystemComponent.hasValue(PART__OF) - && this.installedFunctionalSystemComponent.value(PART__OF).isEmpty()) { + && this.installedFunctionalSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.installedFunctionalSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.installedFunctionalSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.installedFunctionalSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.installedFunctionalSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.installedFunctionalSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.installedFunctionalSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.installedFunctionalSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return installedFunctionalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java index 5a1cb9a1..11482f6e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java @@ -199,38 +199,38 @@ public final InstalledObjectBuilder temporal_Part_Of(final OrdinaryPhysicalObjec */ public InstalledObject build() throws HqdmException { if (this.installedObject.hasValue(AGGREGATED_INTO) - && this.installedObject.value(AGGREGATED_INTO).isEmpty()) { + && this.installedObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.installedObject.hasValue(BEGINNING) - && this.installedObject.value(BEGINNING).isEmpty()) { + && this.installedObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.installedObject.hasValue(ENDING) - && this.installedObject.value(ENDING).isEmpty()) { + && this.installedObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.installedObject.hasValue(MEMBER__OF) - && this.installedObject.value(MEMBER__OF).isEmpty()) { + && this.installedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.installedObject.hasValue(MEMBER_OF) - && this.installedObject.value(MEMBER_OF).isEmpty()) { + && this.installedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.installedObject.hasValue(PART__OF) - && this.installedObject.value(PART__OF).isEmpty()) { + && this.installedObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.installedObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.installedObject.hasValue(TEMPORAL__PART_OF) - && this.installedObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.installedObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.installedObject.hasValue(TEMPORAL_PART_OF) - && this.installedObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.installedObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return installedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java index da4aa1f4..10755eba 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java @@ -237,42 +237,42 @@ public final IntentionallyConstructedObjectBuilder temporal_Part_Of(final Indivi */ public IntentionallyConstructedObject build() throws HqdmException { if (this.intentionallyConstructedObject.hasValue(AGGREGATED_INTO) - && this.intentionallyConstructedObject.value(AGGREGATED_INTO).isEmpty()) { + && this.intentionallyConstructedObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.intentionallyConstructedObject.hasValue(BEGINNING) - && this.intentionallyConstructedObject.value(BEGINNING).isEmpty()) { + && this.intentionallyConstructedObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.intentionallyConstructedObject.hasValue(ENDING) - && this.intentionallyConstructedObject.value(ENDING).isEmpty()) { + && this.intentionallyConstructedObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.intentionallyConstructedObject.hasValue(MEMBER__OF) - && this.intentionallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.intentionallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.intentionallyConstructedObject.hasValue(MEMBER_OF) - && this.intentionallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.intentionallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.intentionallyConstructedObject.hasValue(MEMBER_OF_KIND) - && this.intentionallyConstructedObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.intentionallyConstructedObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.intentionallyConstructedObject.hasValue(PART__OF) - && this.intentionallyConstructedObject.value(PART__OF).isEmpty()) { + && this.intentionallyConstructedObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.intentionallyConstructedObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.intentionallyConstructedObject.hasValue(TEMPORAL__PART_OF) - && this.intentionallyConstructedObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.intentionallyConstructedObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.intentionallyConstructedObject.hasValue(TEMPORAL_PART_OF) - && this.intentionallyConstructedObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.intentionallyConstructedObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return intentionallyConstructedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java index 61216743..3bfef431 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java @@ -198,35 +198,35 @@ public final KindOfActivityBuilder references_By_Class(final Class clazz) { */ public KindOfActivity build() throws HqdmException { if (this.kindOfActivity.hasValue(CAUSES_BY_CLASS) - && this.kindOfActivity.value(CAUSES_BY_CLASS).isEmpty()) { + && this.kindOfActivity.values(CAUSES_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: causes_by_class"); } if (this.kindOfActivity.hasValue(DETERMINES_BY_CLASS) - && this.kindOfActivity.value(DETERMINES_BY_CLASS).isEmpty()) { + && this.kindOfActivity.values(DETERMINES_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: determines_by_class"); } if (this.kindOfActivity.hasValue(HAS_SUPERCLASS) - && this.kindOfActivity.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfActivity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfActivity.hasValue(MEMBER__OF) - && this.kindOfActivity.value(MEMBER__OF).isEmpty()) { + && this.kindOfActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfActivity.hasValue(MEMBER_OF) - && this.kindOfActivity.value(MEMBER_OF).isEmpty()) { + && this.kindOfActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfActivity.hasValue(MEMBER_OF_) - && this.kindOfActivity.value(MEMBER_OF_).isEmpty()) { + && this.kindOfActivity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfActivity.hasValue(PART__OF_BY_CLASS) - && this.kindOfActivity.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfActivity.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.kindOfActivity.hasValue(REFERENCES_BY_CLASS) - && this.kindOfActivity.value(REFERENCES_BY_CLASS).isEmpty()) { + && this.kindOfActivity.values(REFERENCES_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: references_by_class"); } return kindOfActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java index ab98833f..4745dade 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java @@ -155,23 +155,23 @@ public final KindOfAssociationBuilder part__Of_By_Class( */ public KindOfAssociation build() throws HqdmException { if (this.kindOfAssociation.hasValue(HAS_SUPERCLASS) - && this.kindOfAssociation.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfAssociation.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfAssociation.hasValue(MEMBER__OF) - && this.kindOfAssociation.value(MEMBER__OF).isEmpty()) { + && this.kindOfAssociation.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfAssociation.hasValue(MEMBER_OF) - && this.kindOfAssociation.value(MEMBER_OF).isEmpty()) { + && this.kindOfAssociation.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfAssociation.hasValue(MEMBER_OF_) - && this.kindOfAssociation.value(MEMBER_OF_).isEmpty()) { + && this.kindOfAssociation.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfAssociation.hasValue(PART__OF_BY_CLASS) - && this.kindOfAssociation.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfAssociation.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfAssociation; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java index be3ea6c4..8ca885bb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java @@ -141,23 +141,23 @@ public final KindOfBiologicalObjectBuilder part__Of_By_Class( */ public KindOfBiologicalObject build() throws HqdmException { if (this.kindOfBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfBiologicalObject.hasValue(MEMBER__OF) - && this.kindOfBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfBiologicalObject.hasValue(MEMBER_OF) - && this.kindOfBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfBiologicalObject.hasValue(MEMBER_OF_) - && this.kindOfBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfBiologicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfBiologicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java index c1ce47a4..da03ed4a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java @@ -176,26 +176,26 @@ public KindOfBiologicalSystem build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfBiologicalSystem.hasValue(HAS_SUPERCLASS) - && this.kindOfBiologicalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfBiologicalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfBiologicalSystem.hasValue(MEMBER__OF) - && this.kindOfBiologicalSystem.value(MEMBER__OF).isEmpty()) { + && this.kindOfBiologicalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfBiologicalSystem.hasValue(MEMBER_OF) - && this.kindOfBiologicalSystem.value(MEMBER_OF).isEmpty()) { + && this.kindOfBiologicalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfBiologicalSystem.hasValue(MEMBER_OF_) - && this.kindOfBiologicalSystem.value(MEMBER_OF_).isEmpty()) { + && this.kindOfBiologicalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (!this.kindOfBiologicalSystem.hasValue(NATURAL_ROLE_BY_CLASS)) { throw new HqdmException("Property Not Set: natural_role_by_class"); } if (this.kindOfBiologicalSystem.hasValue(PART__OF_BY_CLASS) - && this.kindOfBiologicalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfBiologicalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfBiologicalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java index d60124ce..432c601d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java @@ -143,23 +143,23 @@ public final KindOfBiologicalSystemComponentBuilder part__Of_By_Class( */ public KindOfBiologicalSystemComponent build() throws HqdmException { if (this.kindOfBiologicalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.kindOfBiologicalSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfBiologicalSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfBiologicalSystemComponent.hasValue(MEMBER__OF) - && this.kindOfBiologicalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.kindOfBiologicalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfBiologicalSystemComponent.hasValue(MEMBER_OF) - && this.kindOfBiologicalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.kindOfBiologicalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfBiologicalSystemComponent.hasValue(MEMBER_OF_) - && this.kindOfBiologicalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.kindOfBiologicalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfBiologicalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.kindOfBiologicalSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfBiologicalSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfBiologicalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java index 630a4715..2e33fe93 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java @@ -155,26 +155,26 @@ public final KindOfFunctionalObjectBuilder part__Of_By_Class( */ public KindOfFunctionalObject build() throws HqdmException { if (this.kindOfFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (!this.kindOfFunctionalObject.hasValue(INTENDED_ROLE_BY_CLASS)) { throw new HqdmException("Property Not Set: intended_role_by_class"); } if (this.kindOfFunctionalObject.hasValue(MEMBER__OF) - && this.kindOfFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfFunctionalObject.hasValue(MEMBER_OF) - && this.kindOfFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfFunctionalObject.hasValue(MEMBER_OF_) - && this.kindOfFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfFunctionalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfFunctionalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java index 74842633..b68db045 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java @@ -162,23 +162,23 @@ public KindOfFunctionalSystem build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfFunctionalSystem.hasValue(HAS_SUPERCLASS) - && this.kindOfFunctionalSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfFunctionalSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfFunctionalSystem.hasValue(MEMBER__OF) - && this.kindOfFunctionalSystem.value(MEMBER__OF).isEmpty()) { + && this.kindOfFunctionalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfFunctionalSystem.hasValue(MEMBER_OF) - && this.kindOfFunctionalSystem.value(MEMBER_OF).isEmpty()) { + && this.kindOfFunctionalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfFunctionalSystem.hasValue(MEMBER_OF_) - && this.kindOfFunctionalSystem.value(MEMBER_OF_).isEmpty()) { + && this.kindOfFunctionalSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfFunctionalSystem.hasValue(PART__OF_BY_CLASS) - && this.kindOfFunctionalSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfFunctionalSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfFunctionalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java index 9f7ff426..3645fede 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java @@ -143,23 +143,23 @@ public final KindOfFunctionalSystemComponentBuilder part__Of_By_Class( */ public KindOfFunctionalSystemComponent build() throws HqdmException { if (this.kindOfFunctionalSystemComponent.hasValue(HAS_SUPERCLASS) - && this.kindOfFunctionalSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfFunctionalSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.kindOfFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.kindOfFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.kindOfFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.kindOfFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfFunctionalSystemComponent.hasValue(MEMBER_OF_) - && this.kindOfFunctionalSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.kindOfFunctionalSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfFunctionalSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.kindOfFunctionalSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfFunctionalSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfFunctionalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java index 9a20b598..2157103e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java @@ -139,23 +139,23 @@ public final KindOfIndividualBuilder part__Of_By_Class( */ public KindOfIndividual build() throws HqdmException { if (this.kindOfIndividual.hasValue(HAS_SUPERCLASS) - && this.kindOfIndividual.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfIndividual.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfIndividual.hasValue(MEMBER__OF) - && this.kindOfIndividual.value(MEMBER__OF).isEmpty()) { + && this.kindOfIndividual.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfIndividual.hasValue(MEMBER_OF) - && this.kindOfIndividual.value(MEMBER_OF).isEmpty()) { + && this.kindOfIndividual.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfIndividual.hasValue(MEMBER_OF_) - && this.kindOfIndividual.value(MEMBER_OF_).isEmpty()) { + && this.kindOfIndividual.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfIndividual.hasValue(PART__OF_BY_CLASS) - && this.kindOfIndividual.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfIndividual.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfIndividual; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java index 72e64c01..6b32c2c3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java @@ -145,23 +145,23 @@ public final KindOfIntentionallyConstructedObjectBuilder part__Of_By_Class( */ public KindOfIntentionallyConstructedObject build() throws HqdmException { if (this.kindOfIntentionallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.kindOfIntentionallyConstructedObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfIntentionallyConstructedObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfIntentionallyConstructedObject.hasValue(MEMBER__OF) - && this.kindOfIntentionallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfIntentionallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfIntentionallyConstructedObject.hasValue(MEMBER_OF) - && this.kindOfIntentionallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfIntentionallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfIntentionallyConstructedObject.hasValue(MEMBER_OF_) - && this.kindOfIntentionallyConstructedObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfIntentionallyConstructedObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfIntentionallyConstructedObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfIntentionallyConstructedObject.value(PART__OF_BY_CLASS) + && this.kindOfIntentionallyConstructedObject.values(PART__OF_BY_CLASS) .isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java index 34a5f85b..ceb41d58 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java @@ -143,23 +143,23 @@ public final KindOfOrdinaryBiologicalObjectBuilder part__Of_By_Class( */ public KindOfOrdinaryBiologicalObject build() throws HqdmException { if (this.kindOfOrdinaryBiologicalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfOrdinaryBiologicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfOrdinaryBiologicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfOrdinaryBiologicalObject.hasValue(MEMBER__OF) - && this.kindOfOrdinaryBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfOrdinaryBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfOrdinaryBiologicalObject.hasValue(MEMBER_OF) - && this.kindOfOrdinaryBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfOrdinaryBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfOrdinaryBiologicalObject.hasValue(MEMBER_OF_) - && this.kindOfOrdinaryBiologicalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfOrdinaryBiologicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfOrdinaryBiologicalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfOrdinaryBiologicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfOrdinaryBiologicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfOrdinaryBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java index fd6c512c..d97cfd54 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java @@ -158,26 +158,26 @@ public final KindOfOrdinaryFunctionalObjectBuilder part__Of_By_Class( */ public KindOfOrdinaryFunctionalObject build() throws HqdmException { if (this.kindOfOrdinaryFunctionalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfOrdinaryFunctionalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfOrdinaryFunctionalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (!this.kindOfOrdinaryFunctionalObject.hasValue(INTENDED_ROLE_BY_CLASS)) { throw new HqdmException("Property Not Set: intended_role_by_class"); } if (this.kindOfOrdinaryFunctionalObject.hasValue(MEMBER__OF) - && this.kindOfOrdinaryFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfOrdinaryFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfOrdinaryFunctionalObject.hasValue(MEMBER_OF) - && this.kindOfOrdinaryFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfOrdinaryFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfOrdinaryFunctionalObject.hasValue(MEMBER_OF_) - && this.kindOfOrdinaryFunctionalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfOrdinaryFunctionalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfOrdinaryFunctionalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfOrdinaryFunctionalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfOrdinaryFunctionalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfOrdinaryFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java index 77f74f56..bc7c2b90 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java @@ -142,23 +142,23 @@ public final KindOfOrdinaryPhysicalObjectBuilder part__Of_By_Class( */ public KindOfOrdinaryPhysicalObject build() throws HqdmException { if (this.kindOfOrdinaryPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfOrdinaryPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfOrdinaryPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfOrdinaryPhysicalObject.hasValue(MEMBER__OF) - && this.kindOfOrdinaryPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfOrdinaryPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfOrdinaryPhysicalObject.hasValue(MEMBER_OF) - && this.kindOfOrdinaryPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfOrdinaryPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfOrdinaryPhysicalObject.hasValue(MEMBER_OF_) - && this.kindOfOrdinaryPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfOrdinaryPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfOrdinaryPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfOrdinaryPhysicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfOrdinaryPhysicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfOrdinaryPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationBuilder.java index 3e9d18aa..64cd0ef2 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationBuilder.java @@ -163,23 +163,23 @@ public KindOfOrganization build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfOrganization.hasValue(HAS_SUPERCLASS) - && this.kindOfOrganization.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfOrganization.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfOrganization.hasValue(MEMBER__OF) - && this.kindOfOrganization.value(MEMBER__OF).isEmpty()) { + && this.kindOfOrganization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfOrganization.hasValue(MEMBER_OF) - && this.kindOfOrganization.value(MEMBER_OF).isEmpty()) { + && this.kindOfOrganization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfOrganization.hasValue(MEMBER_OF_) - && this.kindOfOrganization.value(MEMBER_OF_).isEmpty()) { + && this.kindOfOrganization.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfOrganization.hasValue(PART__OF_BY_CLASS) - && this.kindOfOrganization.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfOrganization.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfOrganization; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java index 302d4581..f6a80451 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java @@ -142,23 +142,23 @@ public final KindOfOrganizationComponentBuilder part__Of_By_Class( */ public KindOfOrganizationComponent build() throws HqdmException { if (this.kindOfOrganizationComponent.hasValue(HAS_SUPERCLASS) - && this.kindOfOrganizationComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfOrganizationComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfOrganizationComponent.hasValue(MEMBER__OF) - && this.kindOfOrganizationComponent.value(MEMBER__OF).isEmpty()) { + && this.kindOfOrganizationComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfOrganizationComponent.hasValue(MEMBER_OF) - && this.kindOfOrganizationComponent.value(MEMBER_OF).isEmpty()) { + && this.kindOfOrganizationComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfOrganizationComponent.hasValue(MEMBER_OF_) - && this.kindOfOrganizationComponent.value(MEMBER_OF_).isEmpty()) { + && this.kindOfOrganizationComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfOrganizationComponent.hasValue(PART__OF_BY_CLASS) - && this.kindOfOrganizationComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfOrganizationComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfOrganizationComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java index 9cf6fdc2..9d88ea07 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java @@ -159,23 +159,23 @@ public KindOfParty build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfParty.hasValue(HAS_SUPERCLASS) - && this.kindOfParty.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfParty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfParty.hasValue(MEMBER__OF) - && this.kindOfParty.value(MEMBER__OF).isEmpty()) { + && this.kindOfParty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfParty.hasValue(MEMBER_OF) - && this.kindOfParty.value(MEMBER_OF).isEmpty()) { + && this.kindOfParty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfParty.hasValue(MEMBER_OF_) - && this.kindOfParty.value(MEMBER_OF_).isEmpty()) { + && this.kindOfParty.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfParty.hasValue(PART__OF_BY_CLASS) - && this.kindOfParty.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfParty.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfParty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java index a9ef9479..eba93a31 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java @@ -159,23 +159,23 @@ public KindOfPerson build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfPerson.hasValue(HAS_SUPERCLASS) - && this.kindOfPerson.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfPerson.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfPerson.hasValue(MEMBER__OF) - && this.kindOfPerson.value(MEMBER__OF).isEmpty()) { + && this.kindOfPerson.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfPerson.hasValue(MEMBER_OF) - && this.kindOfPerson.value(MEMBER_OF).isEmpty()) { + && this.kindOfPerson.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfPerson.hasValue(MEMBER_OF_) - && this.kindOfPerson.value(MEMBER_OF_).isEmpty()) { + && this.kindOfPerson.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfPerson.hasValue(PART__OF_BY_CLASS) - && this.kindOfPerson.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfPerson.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfPerson; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java index 04cbf554..db354ca3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java @@ -141,23 +141,23 @@ public final KindOfPhysicalObjectBuilder part__Of_By_Class( */ public KindOfPhysicalObject build() throws HqdmException { if (this.kindOfPhysicalObject.hasValue(HAS_SUPERCLASS) - && this.kindOfPhysicalObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfPhysicalObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfPhysicalObject.hasValue(MEMBER__OF) - && this.kindOfPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfPhysicalObject.hasValue(MEMBER_OF) - && this.kindOfPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfPhysicalObject.hasValue(MEMBER_OF_) - && this.kindOfPhysicalObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfPhysicalObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfPhysicalObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfPhysicalObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfPhysicalObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalPropertyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalPropertyBuilder.java index 44495bf7..1343ec87 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalPropertyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalPropertyBuilder.java @@ -86,15 +86,15 @@ public final KindOfPhysicalPropertyBuilder member_Of(final ClassOfClass classOfC */ public KindOfPhysicalProperty build() throws HqdmException { if (this.kindOfPhysicalProperty.hasValue(HAS_SUPERCLASS) - && this.kindOfPhysicalProperty.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfPhysicalProperty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfPhysicalProperty.hasValue(MEMBER__OF) - && this.kindOfPhysicalProperty.value(MEMBER__OF).isEmpty()) { + && this.kindOfPhysicalProperty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfPhysicalProperty.hasValue(MEMBER_OF) - && this.kindOfPhysicalProperty.value(MEMBER_OF).isEmpty()) { + && this.kindOfPhysicalProperty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return kindOfPhysicalProperty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalQuantityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalQuantityBuilder.java index 94d9ad44..cc9dae61 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalQuantityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalQuantityBuilder.java @@ -86,15 +86,15 @@ public final KindOfPhysicalQuantityBuilder member_Of(final ClassOfClass classOfC */ public KindOfPhysicalQuantity build() throws HqdmException { if (this.kindOfPhysicalQuantity.hasValue(HAS_SUPERCLASS) - && this.kindOfPhysicalQuantity.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfPhysicalQuantity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfPhysicalQuantity.hasValue(MEMBER__OF) - && this.kindOfPhysicalQuantity.value(MEMBER__OF).isEmpty()) { + && this.kindOfPhysicalQuantity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfPhysicalQuantity.hasValue(MEMBER_OF) - && this.kindOfPhysicalQuantity.value(MEMBER_OF).isEmpty()) { + && this.kindOfPhysicalQuantity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return kindOfPhysicalQuantity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java index 8a29f8e6..49eff319 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java @@ -139,23 +139,23 @@ public final KindOfPositionBuilder part__Of_By_Class( */ public KindOfPosition build() throws HqdmException { if (this.kindOfPosition.hasValue(HAS_SUPERCLASS) - && this.kindOfPosition.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfPosition.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfPosition.hasValue(MEMBER__OF) - && this.kindOfPosition.value(MEMBER__OF).isEmpty()) { + && this.kindOfPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfPosition.hasValue(MEMBER_OF) - && this.kindOfPosition.value(MEMBER_OF).isEmpty()) { + && this.kindOfPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfPosition.hasValue(MEMBER_OF_) - && this.kindOfPosition.value(MEMBER_OF_).isEmpty()) { + && this.kindOfPosition.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfPosition.hasValue(PART__OF_BY_CLASS) - && this.kindOfPosition.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfPosition.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithRestrictionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithRestrictionBuilder.java index 4078cc08..4a573150 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithRestrictionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithRestrictionBuilder.java @@ -116,15 +116,15 @@ public final KindOfRelationshipWithRestrictionBuilder roles_M(final Class clazz) */ public KindOfRelationshipWithRestriction build() throws HqdmException { if (this.kindOfRelationshipWithRestriction.hasValue(HAS_SUPERCLASS) - && this.kindOfRelationshipWithRestriction.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfRelationshipWithRestriction.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfRelationshipWithRestriction.hasValue(MEMBER__OF) - && this.kindOfRelationshipWithRestriction.value(MEMBER__OF).isEmpty()) { + && this.kindOfRelationshipWithRestriction.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfRelationshipWithRestriction.hasValue(MEMBER_OF) - && this.kindOfRelationshipWithRestriction.value(MEMBER_OF).isEmpty()) { + && this.kindOfRelationshipWithRestriction.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.kindOfRelationshipWithRestriction.hasValue(REQUIRED_ROLE_PLAYER)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithSignatureBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithSignatureBuilder.java index d006fae3..a9f90c97 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithSignatureBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfRelationshipWithSignatureBuilder.java @@ -99,15 +99,15 @@ public final KindOfRelationshipWithSignatureBuilder roles_M(final Class clazz) { */ public KindOfRelationshipWithSignature build() throws HqdmException { if (this.kindOfRelationshipWithSignature.hasValue(HAS_SUPERCLASS) - && this.kindOfRelationshipWithSignature.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfRelationshipWithSignature.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfRelationshipWithSignature.hasValue(MEMBER__OF) - && this.kindOfRelationshipWithSignature.value(MEMBER__OF).isEmpty()) { + && this.kindOfRelationshipWithSignature.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfRelationshipWithSignature.hasValue(MEMBER_OF) - && this.kindOfRelationshipWithSignature.value(MEMBER_OF).isEmpty()) { + && this.kindOfRelationshipWithSignature.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.kindOfRelationshipWithSignature.hasValue(ROLES)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java index 0d4fcc15..53b4358a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java @@ -142,23 +142,23 @@ public final KindOfSociallyConstructedObjectBuilder part__Of_By_Class( */ public KindOfSociallyConstructedObject build() throws HqdmException { if (this.kindOfSociallyConstructedObject.hasValue(HAS_SUPERCLASS) - && this.kindOfSociallyConstructedObject.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfSociallyConstructedObject.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfSociallyConstructedObject.hasValue(MEMBER__OF) - && this.kindOfSociallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.kindOfSociallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfSociallyConstructedObject.hasValue(MEMBER_OF) - && this.kindOfSociallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.kindOfSociallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfSociallyConstructedObject.hasValue(MEMBER_OF_) - && this.kindOfSociallyConstructedObject.value(MEMBER_OF_).isEmpty()) { + && this.kindOfSociallyConstructedObject.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfSociallyConstructedObject.hasValue(PART__OF_BY_CLASS) - && this.kindOfSociallyConstructedObject.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfSociallyConstructedObject.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfSociallyConstructedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java index 220776bf..56d9d0e8 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java @@ -158,23 +158,23 @@ public KindOfSystem build() throws HqdmException { throw new HqdmException("Property Not Set: has_component_by_class"); } if (this.kindOfSystem.hasValue(HAS_SUPERCLASS) - && this.kindOfSystem.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfSystem.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfSystem.hasValue(MEMBER__OF) - && this.kindOfSystem.value(MEMBER__OF).isEmpty()) { + && this.kindOfSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfSystem.hasValue(MEMBER_OF) - && this.kindOfSystem.value(MEMBER_OF).isEmpty()) { + && this.kindOfSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfSystem.hasValue(MEMBER_OF_) - && this.kindOfSystem.value(MEMBER_OF_).isEmpty()) { + && this.kindOfSystem.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfSystem.hasValue(PART__OF_BY_CLASS) - && this.kindOfSystem.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfSystem.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java index 5636fb20..cc5304c3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java @@ -141,23 +141,23 @@ public final KindOfSystemComponentBuilder part__Of_By_Class( */ public KindOfSystemComponent build() throws HqdmException { if (this.kindOfSystemComponent.hasValue(HAS_SUPERCLASS) - && this.kindOfSystemComponent.value(HAS_SUPERCLASS).isEmpty()) { + && this.kindOfSystemComponent.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.kindOfSystemComponent.hasValue(MEMBER__OF) - && this.kindOfSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.kindOfSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.kindOfSystemComponent.hasValue(MEMBER_OF) - && this.kindOfSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.kindOfSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.kindOfSystemComponent.hasValue(MEMBER_OF_) - && this.kindOfSystemComponent.value(MEMBER_OF_).isEmpty()) { + && this.kindOfSystemComponent.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.kindOfSystemComponent.hasValue(PART__OF_BY_CLASS) - && this.kindOfSystemComponent.value(PART__OF_BY_CLASS).isEmpty()) { + && this.kindOfSystemComponent.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return kindOfSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java index dbc8591a..34590ed4 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java @@ -216,42 +216,42 @@ public final LanguageCommunityBuilder temporal_Part_Of(final LanguageCommunity l */ public LanguageCommunity build() throws HqdmException { if (this.languageCommunity.hasValue(AGGREGATED_INTO) - && this.languageCommunity.value(AGGREGATED_INTO).isEmpty()) { + && this.languageCommunity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.languageCommunity.hasValue(BEGINNING) - && this.languageCommunity.value(BEGINNING).isEmpty()) { + && this.languageCommunity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.languageCommunity.hasValue(ENDING) - && this.languageCommunity.value(ENDING).isEmpty()) { + && this.languageCommunity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.languageCommunity.hasValue(MEMBER__OF) - && this.languageCommunity.value(MEMBER__OF).isEmpty()) { + && this.languageCommunity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.languageCommunity.hasValue(MEMBER_OF) - && this.languageCommunity.value(MEMBER_OF).isEmpty()) { + && this.languageCommunity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.languageCommunity.hasValue(MEMBER_OF_KIND) - && this.languageCommunity.value(MEMBER_OF_KIND).isEmpty()) { + && this.languageCommunity.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.languageCommunity.hasValue(PART__OF) - && this.languageCommunity.value(PART__OF).isEmpty()) { + && this.languageCommunity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.languageCommunity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.languageCommunity.hasValue(TEMPORAL__PART_OF) - && this.languageCommunity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.languageCommunity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.languageCommunity.hasValue(TEMPORAL_PART_OF) - && this.languageCommunity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.languageCommunity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return languageCommunity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java index 99296900..4d44ec25 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java @@ -230,30 +230,30 @@ public final MoneyAssetBuilder temporal_Part_Of(final PhysicalObject physicalObj */ public MoneyAsset build() throws HqdmException { if (this.moneyAsset.hasValue(AGGREGATED_INTO) - && this.moneyAsset.value(AGGREGATED_INTO).isEmpty()) { + && this.moneyAsset.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.moneyAsset.hasValue(BEGINNING) - && this.moneyAsset.value(BEGINNING).isEmpty()) { + && this.moneyAsset.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.moneyAsset.hasValue(ENDING) - && this.moneyAsset.value(ENDING).isEmpty()) { + && this.moneyAsset.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.moneyAsset.hasValue(MEMBER__OF) - && this.moneyAsset.value(MEMBER__OF).isEmpty()) { + && this.moneyAsset.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.moneyAsset.hasValue(MEMBER_OF) - && this.moneyAsset.value(MEMBER_OF).isEmpty()) { + && this.moneyAsset.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.moneyAsset.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.moneyAsset.hasValue(PART__OF) - && this.moneyAsset.value(PART__OF).isEmpty()) { + && this.moneyAsset.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.moneyAsset.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -263,11 +263,11 @@ public MoneyAsset build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.moneyAsset.hasValue(TEMPORAL__PART_OF) - && this.moneyAsset.value(TEMPORAL__PART_OF).isEmpty()) { + && this.moneyAsset.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.moneyAsset.hasValue(TEMPORAL_PART_OF) - && this.moneyAsset.value(TEMPORAL_PART_OF).isEmpty()) { + && this.moneyAsset.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return moneyAsset; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java index 5ad08596..5cf7e909 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java @@ -341,59 +341,59 @@ public final OfferAndAcceptanceForGoodsBuilder temporal_Part_Of(final Individual */ public OfferAndAcceptanceForGoods build() throws HqdmException { if (this.offerAndAcceptanceForGoods.hasValue(AGGREGATED_INTO) - && this.offerAndAcceptanceForGoods.value(AGGREGATED_INTO).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.offerAndAcceptanceForGoods.hasValue(BEGINNING) - && this.offerAndAcceptanceForGoods.value(BEGINNING).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.offerAndAcceptanceForGoods.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.offerAndAcceptanceForGoods.hasValue(DETERMINES) - && this.offerAndAcceptanceForGoods.value(DETERMINES).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.offerAndAcceptanceForGoods.hasValue(ENDING) - && this.offerAndAcceptanceForGoods.value(ENDING).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.offerAndAcceptanceForGoods.hasValue(MEMBER__OF) - && this.offerAndAcceptanceForGoods.value(MEMBER__OF).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.offerAndAcceptanceForGoods.hasValue(MEMBER_OF) - && this.offerAndAcceptanceForGoods.value(MEMBER_OF).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.offerAndAcceptanceForGoods.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.offerAndAcceptanceForGoods.hasValue(PART__OF) - && this.offerAndAcceptanceForGoods.value(PART__OF).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.offerAndAcceptanceForGoods.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.offerAndAcceptanceForGoods.hasValue(PART_OF_) - && this.offerAndAcceptanceForGoods.value(PART_OF_).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.offerAndAcceptanceForGoods.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.offerAndAcceptanceForGoods.hasValue(REFERENCES) - && this.offerAndAcceptanceForGoods.value(REFERENCES).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.offerAndAcceptanceForGoods.hasValue(TEMPORAL__PART_OF) - && this.offerAndAcceptanceForGoods.value(TEMPORAL__PART_OF).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.offerAndAcceptanceForGoods.hasValue(TEMPORAL_PART_OF) - && this.offerAndAcceptanceForGoods.value(TEMPORAL_PART_OF).isEmpty()) { + && this.offerAndAcceptanceForGoods.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return offerAndAcceptanceForGoods; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java index 87e34c36..bdf3423b 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java @@ -321,60 +321,60 @@ public final OfferBuilder temporal_Part_Of(final Individual individual) { */ public Offer build() throws HqdmException { if (this.offer.hasValue(AGGREGATED_INTO) - && this.offer.value(AGGREGATED_INTO).isEmpty()) { + && this.offer.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.offer.hasValue(BEGINNING) - && this.offer.value(BEGINNING).isEmpty()) { + && this.offer.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.offer.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.offer.hasValue(DETERMINES) - && this.offer.value(DETERMINES).isEmpty()) { + && this.offer.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.offer.hasValue(ENDING) - && this.offer.value(ENDING).isEmpty()) { + && this.offer.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.offer.hasValue(MEMBER__OF) - && this.offer.value(MEMBER__OF).isEmpty()) { + && this.offer.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.offer.hasValue(MEMBER_OF) - && this.offer.value(MEMBER_OF).isEmpty()) { + && this.offer.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.offer.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.offer.hasValue(PART__OF) - && this.offer.value(PART__OF).isEmpty()) { + && this.offer.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.offer.hasValue(PART_OF) - && this.offer.value(PART_OF).isEmpty()) { + && this.offer.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.offer.hasValue(PART_OF_) - && this.offer.value(PART_OF_).isEmpty()) { + && this.offer.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.offer.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.offer.hasValue(REFERENCES) - && this.offer.value(REFERENCES).isEmpty()) { + && this.offer.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.offer.hasValue(TEMPORAL__PART_OF) - && this.offer.value(TEMPORAL__PART_OF).isEmpty()) { + && this.offer.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.offer.hasValue(TEMPORAL_PART_OF) - && this.offer.value(TEMPORAL_PART_OF).isEmpty()) { + && this.offer.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return offer; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java index 7fe703d7..e98cce11 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java @@ -322,45 +322,45 @@ public final OfferForGoodsBuilder temporal_Part_Of(final Individual individual) */ public OfferForGoods build() throws HqdmException { if (this.offerForGoods.hasValue(AGGREGATED_INTO) - && this.offerForGoods.value(AGGREGATED_INTO).isEmpty()) { + && this.offerForGoods.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.offerForGoods.hasValue(BEGINNING) - && this.offerForGoods.value(BEGINNING).isEmpty()) { + && this.offerForGoods.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.offerForGoods.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.offerForGoods.hasValue(DETERMINES) - && this.offerForGoods.value(DETERMINES).isEmpty()) { + && this.offerForGoods.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.offerForGoods.hasValue(ENDING) - && this.offerForGoods.value(ENDING).isEmpty()) { + && this.offerForGoods.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.offerForGoods.hasValue(MEMBER__OF) - && this.offerForGoods.value(MEMBER__OF).isEmpty()) { + && this.offerForGoods.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.offerForGoods.hasValue(MEMBER_OF) - && this.offerForGoods.value(MEMBER_OF).isEmpty()) { + && this.offerForGoods.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.offerForGoods.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.offerForGoods.hasValue(PART__OF) - && this.offerForGoods.value(PART__OF).isEmpty()) { + && this.offerForGoods.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.offerForGoods.hasValue(PART_OF) - && this.offerForGoods.value(PART_OF).isEmpty()) { + && this.offerForGoods.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.offerForGoods.hasValue(PART_OF_) - && this.offerForGoods.value(PART_OF_).isEmpty()) { + && this.offerForGoods.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.offerForGoods.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -370,11 +370,11 @@ public OfferForGoods build() throws HqdmException { throw new HqdmException("Property Not Set: references"); } if (this.offerForGoods.hasValue(TEMPORAL__PART_OF) - && this.offerForGoods.value(TEMPORAL__PART_OF).isEmpty()) { + && this.offerForGoods.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.offerForGoods.hasValue(TEMPORAL_PART_OF) - && this.offerForGoods.value(TEMPORAL_PART_OF).isEmpty()) { + && this.offerForGoods.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return offerForGoods; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java index 67ef17b8..cdb414ea 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java @@ -236,34 +236,34 @@ public Offering build() throws HqdmException { throw new HqdmException("Property Not Set: consideration_by_class"); } if (this.offering.hasValue(HAS_SUPERCLASS) - && this.offering.value(HAS_SUPERCLASS).isEmpty()) { + && this.offering.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.offering.hasValue(MEMBER__OF) - && this.offering.value(MEMBER__OF).isEmpty()) { + && this.offering.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.offering.hasValue(MEMBER_OF) - && this.offering.value(MEMBER_OF).isEmpty()) { + && this.offering.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.offering.hasValue(MEMBER_OF_) - && this.offering.value(MEMBER_OF_).isEmpty()) { + && this.offering.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (!this.offering.hasValue(OFFEROR)) { throw new HqdmException("Property Not Set: offeror"); } if (this.offering.hasValue(PART__OF_BY_CLASS) - && this.offering.value(PART__OF_BY_CLASS).isEmpty()) { + && this.offering.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.offering.hasValue(PART_OF_BY_CLASS) - && this.offering.value(PART_OF_BY_CLASS).isEmpty()) { + && this.offering.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.offering.hasValue(PART_OF_BY_CLASS_) - && this.offering.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.offering.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } if (!this.offering.hasValue(PERIOD_OFFERED)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java index c52ce803..f9b728fe 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java @@ -221,42 +221,42 @@ public final OrdinaryBiologicalObjectBuilder temporal_Part_Of( */ public OrdinaryBiologicalObject build() throws HqdmException { if (this.ordinaryBiologicalObject.hasValue(AGGREGATED_INTO) - && this.ordinaryBiologicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.ordinaryBiologicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.ordinaryBiologicalObject.hasValue(BEGINNING) - && this.ordinaryBiologicalObject.value(BEGINNING).isEmpty()) { + && this.ordinaryBiologicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.ordinaryBiologicalObject.hasValue(ENDING) - && this.ordinaryBiologicalObject.value(ENDING).isEmpty()) { + && this.ordinaryBiologicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.ordinaryBiologicalObject.hasValue(MEMBER__OF) - && this.ordinaryBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.ordinaryBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.ordinaryBiologicalObject.hasValue(MEMBER_OF) - && this.ordinaryBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.ordinaryBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.ordinaryBiologicalObject.hasValue(MEMBER_OF_KIND) - && this.ordinaryBiologicalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.ordinaryBiologicalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.ordinaryBiologicalObject.hasValue(PART__OF) - && this.ordinaryBiologicalObject.value(PART__OF).isEmpty()) { + && this.ordinaryBiologicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.ordinaryBiologicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.ordinaryBiologicalObject.hasValue(TEMPORAL__PART_OF) - && this.ordinaryBiologicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.ordinaryBiologicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.ordinaryBiologicalObject.hasValue(TEMPORAL_PART_OF) - && this.ordinaryBiologicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.ordinaryBiologicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return ordinaryBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java index 6c3863a8..6047e8f5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java @@ -243,45 +243,45 @@ public final OrdinaryFunctionalObjectBuilder temporal_Part_Of(final Individual i */ public OrdinaryFunctionalObject build() throws HqdmException { if (this.ordinaryFunctionalObject.hasValue(AGGREGATED_INTO) - && this.ordinaryFunctionalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.ordinaryFunctionalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.ordinaryFunctionalObject.hasValue(BEGINNING) - && this.ordinaryFunctionalObject.value(BEGINNING).isEmpty()) { + && this.ordinaryFunctionalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.ordinaryFunctionalObject.hasValue(ENDING) - && this.ordinaryFunctionalObject.value(ENDING).isEmpty()) { + && this.ordinaryFunctionalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (!this.ordinaryFunctionalObject.hasValue(INTENDED_ROLE)) { throw new HqdmException("Property Not Set: intended_role"); } if (this.ordinaryFunctionalObject.hasValue(MEMBER__OF) - && this.ordinaryFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.ordinaryFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.ordinaryFunctionalObject.hasValue(MEMBER_OF) - && this.ordinaryFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.ordinaryFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.ordinaryFunctionalObject.hasValue(MEMBER_OF_KIND) - && this.ordinaryFunctionalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.ordinaryFunctionalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.ordinaryFunctionalObject.hasValue(PART__OF) - && this.ordinaryFunctionalObject.value(PART__OF).isEmpty()) { + && this.ordinaryFunctionalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.ordinaryFunctionalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.ordinaryFunctionalObject.hasValue(TEMPORAL__PART_OF) - && this.ordinaryFunctionalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.ordinaryFunctionalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.ordinaryFunctionalObject.hasValue(TEMPORAL_PART_OF) - && this.ordinaryFunctionalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.ordinaryFunctionalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return ordinaryFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java index a4b6b998..9cb18c4d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java @@ -228,42 +228,42 @@ public final OrdinaryPhysicalObjectBuilder temporal_Part_Of(final Individual ind */ public OrdinaryPhysicalObject build() throws HqdmException { if (this.ordinaryPhysicalObject.hasValue(AGGREGATED_INTO) - && this.ordinaryPhysicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.ordinaryPhysicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.ordinaryPhysicalObject.hasValue(BEGINNING) - && this.ordinaryPhysicalObject.value(BEGINNING).isEmpty()) { + && this.ordinaryPhysicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.ordinaryPhysicalObject.hasValue(ENDING) - && this.ordinaryPhysicalObject.value(ENDING).isEmpty()) { + && this.ordinaryPhysicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.ordinaryPhysicalObject.hasValue(MEMBER__OF) - && this.ordinaryPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.ordinaryPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.ordinaryPhysicalObject.hasValue(MEMBER_OF) - && this.ordinaryPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.ordinaryPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.ordinaryPhysicalObject.hasValue(MEMBER_OF_KIND) - && this.ordinaryPhysicalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.ordinaryPhysicalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.ordinaryPhysicalObject.hasValue(PART__OF) - && this.ordinaryPhysicalObject.value(PART__OF).isEmpty()) { + && this.ordinaryPhysicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.ordinaryPhysicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.ordinaryPhysicalObject.hasValue(TEMPORAL__PART_OF) - && this.ordinaryPhysicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.ordinaryPhysicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.ordinaryPhysicalObject.hasValue(TEMPORAL_PART_OF) - && this.ordinaryPhysicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.ordinaryPhysicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return ordinaryPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java index c7d2fac3..877d6f8f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java @@ -213,42 +213,42 @@ public final OrganizationBuilder temporal_Part_Of(final Organization organizatio */ public Organization build() throws HqdmException { if (this.organization.hasValue(AGGREGATED_INTO) - && this.organization.value(AGGREGATED_INTO).isEmpty()) { + && this.organization.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.organization.hasValue(BEGINNING) - && this.organization.value(BEGINNING).isEmpty()) { + && this.organization.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.organization.hasValue(ENDING) - && this.organization.value(ENDING).isEmpty()) { + && this.organization.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.organization.hasValue(MEMBER__OF) - && this.organization.value(MEMBER__OF).isEmpty()) { + && this.organization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.organization.hasValue(MEMBER_OF) - && this.organization.value(MEMBER_OF).isEmpty()) { + && this.organization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.organization.hasValue(MEMBER_OF_KIND) - && this.organization.value(MEMBER_OF_KIND).isEmpty()) { + && this.organization.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.organization.hasValue(PART__OF) - && this.organization.value(PART__OF).isEmpty()) { + && this.organization.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.organization.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.organization.hasValue(TEMPORAL__PART_OF) - && this.organization.value(TEMPORAL__PART_OF).isEmpty()) { + && this.organization.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.organization.hasValue(TEMPORAL_PART_OF) - && this.organization.value(TEMPORAL_PART_OF).isEmpty()) { + && this.organization.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return organization; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java index 221789d8..f1b3a872 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java @@ -232,45 +232,45 @@ public final OrganizationComponentBuilder temporal_Part_Of(final OrganizationCom */ public OrganizationComponent build() throws HqdmException { if (this.organizationComponent.hasValue(AGGREGATED_INTO) - && this.organizationComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.organizationComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.organizationComponent.hasValue(BEGINNING) - && this.organizationComponent.value(BEGINNING).isEmpty()) { + && this.organizationComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.organizationComponent.hasValue(COMPONENT_OF)) { throw new HqdmException("Property Not Set: component_of"); } if (this.organizationComponent.hasValue(ENDING) - && this.organizationComponent.value(ENDING).isEmpty()) { + && this.organizationComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.organizationComponent.hasValue(MEMBER__OF) - && this.organizationComponent.value(MEMBER__OF).isEmpty()) { + && this.organizationComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.organizationComponent.hasValue(MEMBER_OF) - && this.organizationComponent.value(MEMBER_OF).isEmpty()) { + && this.organizationComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.organizationComponent.hasValue(MEMBER_OF_KIND) - && this.organizationComponent.value(MEMBER_OF_KIND).isEmpty()) { + && this.organizationComponent.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.organizationComponent.hasValue(PART__OF) - && this.organizationComponent.value(PART__OF).isEmpty()) { + && this.organizationComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.organizationComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.organizationComponent.hasValue(TEMPORAL__PART_OF) - && this.organizationComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.organizationComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.organizationComponent.hasValue(TEMPORAL_PART_OF) - && this.organizationComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.organizationComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return organizationComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java index 7787df41..fcb56f4a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java @@ -229,30 +229,30 @@ public final OwnerBuilder temporal_Part_Of(final Party party) { */ public Owner build() throws HqdmException { if (this.owner.hasValue(AGGREGATED_INTO) - && this.owner.value(AGGREGATED_INTO).isEmpty()) { + && this.owner.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.owner.hasValue(BEGINNING) - && this.owner.value(BEGINNING).isEmpty()) { + && this.owner.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.owner.hasValue(ENDING) - && this.owner.value(ENDING).isEmpty()) { + && this.owner.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.owner.hasValue(MEMBER__OF) - && this.owner.value(MEMBER__OF).isEmpty()) { + && this.owner.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.owner.hasValue(MEMBER_OF) - && this.owner.value(MEMBER_OF).isEmpty()) { + && this.owner.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.owner.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.owner.hasValue(PART__OF) - && this.owner.value(PART__OF).isEmpty()) { + && this.owner.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.owner.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -262,11 +262,11 @@ public Owner build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.owner.hasValue(TEMPORAL__PART_OF) - && this.owner.value(TEMPORAL__PART_OF).isEmpty()) { + && this.owner.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.owner.hasValue(TEMPORAL_PART_OF) - && this.owner.value(TEMPORAL_PART_OF).isEmpty()) { + && this.owner.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return owner; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java index 786b012a..d321e960 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java @@ -260,40 +260,40 @@ public final OwnershipBuilder temporal_Part_Of(final Individual individual) { */ public Ownership build() throws HqdmException { if (this.ownership.hasValue(AGGREGATED_INTO) - && this.ownership.value(AGGREGATED_INTO).isEmpty()) { + && this.ownership.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (!this.ownership.hasValue(BEGINNING)) { throw new HqdmException("Property Not Set: beginning"); } if (this.ownership.hasValue(ENDING) - && this.ownership.value(ENDING).isEmpty()) { + && this.ownership.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.ownership.hasValue(MEMBER__OF) - && this.ownership.value(MEMBER__OF).isEmpty()) { + && this.ownership.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.ownership.hasValue(MEMBER_OF) - && this.ownership.value(MEMBER_OF).isEmpty()) { + && this.ownership.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.ownership.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.ownership.hasValue(PART__OF) - && this.ownership.value(PART__OF).isEmpty()) { + && this.ownership.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.ownership.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.ownership.hasValue(TEMPORAL__PART_OF) - && this.ownership.value(TEMPORAL__PART_OF).isEmpty()) { + && this.ownership.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.ownership.hasValue(TEMPORAL_PART_OF) - && this.ownership.value(TEMPORAL_PART_OF).isEmpty()) { + && this.ownership.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return ownership; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java index 67493c62..e90e6e88 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java @@ -231,45 +231,45 @@ public final ParticipantBuilder temporal_Part_Of(final PhysicalObject physicalOb */ public Participant build() throws HqdmException { if (this.participant.hasValue(AGGREGATED_INTO) - && this.participant.value(AGGREGATED_INTO).isEmpty()) { + && this.participant.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.participant.hasValue(BEGINNING) - && this.participant.value(BEGINNING).isEmpty()) { + && this.participant.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.participant.hasValue(ENDING) - && this.participant.value(ENDING).isEmpty()) { + && this.participant.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.participant.hasValue(MEMBER__OF) - && this.participant.value(MEMBER__OF).isEmpty()) { + && this.participant.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.participant.hasValue(MEMBER_OF) - && this.participant.value(MEMBER_OF).isEmpty()) { + && this.participant.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.participant.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.participant.hasValue(PART__OF) - && this.participant.value(PART__OF).isEmpty()) { + && this.participant.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.participant.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.participant.hasValue(PARTICIPANT_IN) - && this.participant.value(PARTICIPANT_IN).isEmpty()) { + && this.participant.values(PARTICIPANT_IN).isEmpty()) { throw new HqdmException("Property Not Set: participant_in"); } if (this.participant.hasValue(TEMPORAL__PART_OF) - && this.participant.value(TEMPORAL__PART_OF).isEmpty()) { + && this.participant.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.participant.hasValue(TEMPORAL_PART_OF) - && this.participant.value(TEMPORAL_PART_OF).isEmpty()) { + && this.participant.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return participant; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java index a32fe1e1..6b292ea3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java @@ -212,42 +212,42 @@ public final PartyBuilder temporal_Part_Of(final Party party) { */ public Party build() throws HqdmException { if (this.party.hasValue(AGGREGATED_INTO) - && this.party.value(AGGREGATED_INTO).isEmpty()) { + && this.party.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.party.hasValue(BEGINNING) - && this.party.value(BEGINNING).isEmpty()) { + && this.party.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.party.hasValue(ENDING) - && this.party.value(ENDING).isEmpty()) { + && this.party.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.party.hasValue(MEMBER__OF) - && this.party.value(MEMBER__OF).isEmpty()) { + && this.party.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.party.hasValue(MEMBER_OF) - && this.party.value(MEMBER_OF).isEmpty()) { + && this.party.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.party.hasValue(MEMBER_OF_KIND) - && this.party.value(MEMBER_OF_KIND).isEmpty()) { + && this.party.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.party.hasValue(PART__OF) - && this.party.value(PART__OF).isEmpty()) { + && this.party.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.party.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.party.hasValue(TEMPORAL__PART_OF) - && this.party.value(TEMPORAL__PART_OF).isEmpty()) { + && this.party.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.party.hasValue(TEMPORAL_PART_OF) - && this.party.value(TEMPORAL_PART_OF).isEmpty()) { + && this.party.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return party; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java index ead72b4b..1e5fc293 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java @@ -138,23 +138,23 @@ public final PatternBuilder part__Of_By_Class( */ public Pattern build() throws HqdmException { if (this.pattern.hasValue(HAS_SUPERCLASS) - && this.pattern.value(HAS_SUPERCLASS).isEmpty()) { + && this.pattern.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.pattern.hasValue(MEMBER__OF) - && this.pattern.value(MEMBER__OF).isEmpty()) { + && this.pattern.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.pattern.hasValue(MEMBER_OF) - && this.pattern.value(MEMBER_OF).isEmpty()) { + && this.pattern.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.pattern.hasValue(MEMBER_OF_) - && this.pattern.value(MEMBER_OF_).isEmpty()) { + && this.pattern.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.pattern.hasValue(PART__OF_BY_CLASS) - && this.pattern.value(PART__OF_BY_CLASS).isEmpty()) { + && this.pattern.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return pattern; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java index 588de6d4..af0a7bba 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java @@ -223,42 +223,42 @@ public final PeriodOfTimeBuilder temporal_Part_Of_(final PossibleWorld possibleW */ public PeriodOfTime build() throws HqdmException { if (this.periodOfTime.hasValue(AGGREGATED_INTO) - && this.periodOfTime.value(AGGREGATED_INTO).isEmpty()) { + && this.periodOfTime.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.periodOfTime.hasValue(BEGINNING) - && this.periodOfTime.value(BEGINNING).isEmpty()) { + && this.periodOfTime.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.periodOfTime.hasValue(ENDING) - && this.periodOfTime.value(ENDING).isEmpty()) { + && this.periodOfTime.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.periodOfTime.hasValue(MEMBER__OF) - && this.periodOfTime.value(MEMBER__OF).isEmpty()) { + && this.periodOfTime.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.periodOfTime.hasValue(MEMBER_OF) - && this.periodOfTime.value(MEMBER_OF).isEmpty()) { + && this.periodOfTime.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.periodOfTime.hasValue(PART__OF) - && this.periodOfTime.value(PART__OF).isEmpty()) { + && this.periodOfTime.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.periodOfTime.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.periodOfTime.hasValue(TEMPORAL__PART_OF) - && this.periodOfTime.value(TEMPORAL__PART_OF).isEmpty()) { + && this.periodOfTime.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.periodOfTime.hasValue(TEMPORAL_PART_OF) - && this.periodOfTime.value(TEMPORAL_PART_OF).isEmpty()) { + && this.periodOfTime.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } if (this.periodOfTime.hasValue(TEMPORAL_PART_OF_) - && this.periodOfTime.value(TEMPORAL_PART_OF_).isEmpty()) { + && this.periodOfTime.values(TEMPORAL_PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of_"); } return periodOfTime; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java index 6bdf77ae..50919bed 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java @@ -236,45 +236,45 @@ public final PersonBuilder temporal_Part_Of( */ public Person build() throws HqdmException { if (this.person.hasValue(AGGREGATED_INTO) - && this.person.value(AGGREGATED_INTO).isEmpty()) { + && this.person.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.person.hasValue(BEGINNING) - && this.person.value(BEGINNING).isEmpty()) { + && this.person.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.person.hasValue(ENDING) - && this.person.value(ENDING).isEmpty()) { + && this.person.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.person.hasValue(MEMBER__OF) - && this.person.value(MEMBER__OF).isEmpty()) { + && this.person.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.person.hasValue(MEMBER_OF) - && this.person.value(MEMBER_OF).isEmpty()) { + && this.person.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.person.hasValue(MEMBER_OF_KIND) - && this.person.value(MEMBER_OF_KIND).isEmpty()) { + && this.person.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (!this.person.hasValue(NATURAL_ROLE)) { throw new HqdmException("Property Not Set: natural_role"); } if (this.person.hasValue(PART__OF) - && this.person.value(PART__OF).isEmpty()) { + && this.person.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.person.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.person.hasValue(TEMPORAL__PART_OF) - && this.person.value(TEMPORAL__PART_OF).isEmpty()) { + && this.person.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.person.hasValue(TEMPORAL_PART_OF) - && this.person.value(TEMPORAL_PART_OF).isEmpty()) { + && this.person.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return person; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java index eff1ecd2..43ec07ac 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java @@ -199,38 +199,38 @@ public final PersonInPositionBuilder temporal_Part_Of(final Position position) { */ public PersonInPosition build() throws HqdmException { if (this.personInPosition.hasValue(AGGREGATED_INTO) - && this.personInPosition.value(AGGREGATED_INTO).isEmpty()) { + && this.personInPosition.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.personInPosition.hasValue(BEGINNING) - && this.personInPosition.value(BEGINNING).isEmpty()) { + && this.personInPosition.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.personInPosition.hasValue(ENDING) - && this.personInPosition.value(ENDING).isEmpty()) { + && this.personInPosition.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.personInPosition.hasValue(MEMBER__OF) - && this.personInPosition.value(MEMBER__OF).isEmpty()) { + && this.personInPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.personInPosition.hasValue(MEMBER_OF) - && this.personInPosition.value(MEMBER_OF).isEmpty()) { + && this.personInPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.personInPosition.hasValue(PART__OF) - && this.personInPosition.value(PART__OF).isEmpty()) { + && this.personInPosition.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.personInPosition.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.personInPosition.hasValue(TEMPORAL__PART_OF) - && this.personInPosition.value(TEMPORAL__PART_OF).isEmpty()) { + && this.personInPosition.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.personInPosition.hasValue(TEMPORAL_PART_OF) - && this.personInPosition.value(TEMPORAL_PART_OF).isEmpty()) { + && this.personInPosition.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return personInPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java index 8d8264fd..75e7b993 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java @@ -223,42 +223,42 @@ public final PhysicalObjectBuilder temporal_Part_Of(final Individual individual) */ public PhysicalObject build() throws HqdmException { if (this.physicalObject.hasValue(AGGREGATED_INTO) - && this.physicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.physicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.physicalObject.hasValue(BEGINNING) - && this.physicalObject.value(BEGINNING).isEmpty()) { + && this.physicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.physicalObject.hasValue(ENDING) - && this.physicalObject.value(ENDING).isEmpty()) { + && this.physicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.physicalObject.hasValue(MEMBER__OF) - && this.physicalObject.value(MEMBER__OF).isEmpty()) { + && this.physicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.physicalObject.hasValue(MEMBER_OF) - && this.physicalObject.value(MEMBER_OF).isEmpty()) { + && this.physicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.physicalObject.hasValue(MEMBER_OF_KIND) - && this.physicalObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.physicalObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.physicalObject.hasValue(PART__OF) - && this.physicalObject.value(PART__OF).isEmpty()) { + && this.physicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.physicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.physicalObject.hasValue(TEMPORAL__PART_OF) - && this.physicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.physicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.physicalObject.hasValue(TEMPORAL_PART_OF) - && this.physicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.physicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return physicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java index f0e6d3df..d42d6cdb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java @@ -154,26 +154,26 @@ public final PhysicalPropertyBuilder part__Of_By_Class( */ public PhysicalProperty build() throws HqdmException { if (this.physicalProperty.hasValue(HAS_SUPERCLASS) - && this.physicalProperty.value(HAS_SUPERCLASS).isEmpty()) { + && this.physicalProperty.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.physicalProperty.hasValue(MEMBER__OF) - && this.physicalProperty.value(MEMBER__OF).isEmpty()) { + && this.physicalProperty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.physicalProperty.hasValue(MEMBER_OF) - && this.physicalProperty.value(MEMBER_OF).isEmpty()) { + && this.physicalProperty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.physicalProperty.hasValue(MEMBER_OF_) - && this.physicalProperty.value(MEMBER_OF_).isEmpty()) { + && this.physicalProperty.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (!this.physicalProperty.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.physicalProperty.hasValue(PART__OF_BY_CLASS) - && this.physicalProperty.value(PART__OF_BY_CLASS).isEmpty()) { + && this.physicalProperty.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return physicalProperty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java index 662872ca..a4a45ec5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java @@ -155,23 +155,23 @@ public final PhysicalPropertyRangeBuilder ranges_Over_M(final PhysicalProperty p */ public PhysicalPropertyRange build() throws HqdmException { if (this.physicalPropertyRange.hasValue(HAS_SUPERCLASS) - && this.physicalPropertyRange.value(HAS_SUPERCLASS).isEmpty()) { + && this.physicalPropertyRange.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.physicalPropertyRange.hasValue(MEMBER__OF) - && this.physicalPropertyRange.value(MEMBER__OF).isEmpty()) { + && this.physicalPropertyRange.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.physicalPropertyRange.hasValue(MEMBER_OF) - && this.physicalPropertyRange.value(MEMBER_OF).isEmpty()) { + && this.physicalPropertyRange.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.physicalPropertyRange.hasValue(MEMBER_OF_) - && this.physicalPropertyRange.value(MEMBER_OF_).isEmpty()) { + && this.physicalPropertyRange.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.physicalPropertyRange.hasValue(PART__OF_BY_CLASS) - && this.physicalPropertyRange.value(PART__OF_BY_CLASS).isEmpty()) { + && this.physicalPropertyRange.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (!this.physicalPropertyRange.hasValue(RANGES_OVER)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java index 4049e18e..4c54f0dd 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java @@ -154,26 +154,26 @@ public final PhysicalQuantityBuilder part__Of_By_Class( */ public PhysicalQuantity build() throws HqdmException { if (this.physicalQuantity.hasValue(HAS_SUPERCLASS) - && this.physicalQuantity.value(HAS_SUPERCLASS).isEmpty()) { + && this.physicalQuantity.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.physicalQuantity.hasValue(MEMBER__OF) - && this.physicalQuantity.value(MEMBER__OF).isEmpty()) { + && this.physicalQuantity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.physicalQuantity.hasValue(MEMBER_OF) - && this.physicalQuantity.value(MEMBER_OF).isEmpty()) { + && this.physicalQuantity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.physicalQuantity.hasValue(MEMBER_OF_) - && this.physicalQuantity.value(MEMBER_OF_).isEmpty()) { + && this.physicalQuantity.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (!this.physicalQuantity.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.physicalQuantity.hasValue(PART__OF_BY_CLASS) - && this.physicalQuantity.value(PART__OF_BY_CLASS).isEmpty()) { + && this.physicalQuantity.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return physicalQuantity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java index c08bf5c8..2ce903ff 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java @@ -185,26 +185,26 @@ public final PhysicalQuantityRangeBuilder upper_Bound_M(final PhysicalQuantity p */ public PhysicalQuantityRange build() throws HqdmException { if (this.physicalQuantityRange.hasValue(HAS_SUPERCLASS) - && this.physicalQuantityRange.value(HAS_SUPERCLASS).isEmpty()) { + && this.physicalQuantityRange.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (!this.physicalQuantityRange.hasValue(LOWER_BOUND)) { throw new HqdmException("Property Not Set: lower_bound"); } if (this.physicalQuantityRange.hasValue(MEMBER__OF) - && this.physicalQuantityRange.value(MEMBER__OF).isEmpty()) { + && this.physicalQuantityRange.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.physicalQuantityRange.hasValue(MEMBER_OF) - && this.physicalQuantityRange.value(MEMBER_OF).isEmpty()) { + && this.physicalQuantityRange.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.physicalQuantityRange.hasValue(MEMBER_OF_) - && this.physicalQuantityRange.value(MEMBER_OF_).isEmpty()) { + && this.physicalQuantityRange.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.physicalQuantityRange.hasValue(PART__OF_BY_CLASS) - && this.physicalQuantityRange.value(PART__OF_BY_CLASS).isEmpty()) { + && this.physicalQuantityRange.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (!this.physicalQuantityRange.hasValue(RANGES_OVER)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java index 0260a903..4e0e4c15 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java @@ -238,46 +238,46 @@ public final PlanBuilder temporal_Part_Of_(final PossibleWorld possibleWorld) { */ public Plan build() throws HqdmException { if (this.plan.hasValue(AGGREGATED_INTO) - && this.plan.value(AGGREGATED_INTO).isEmpty()) { + && this.plan.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.plan.hasValue(BEGINNING) - && this.plan.value(BEGINNING).isEmpty()) { + && this.plan.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.plan.hasValue(ENDING) - && this.plan.value(ENDING).isEmpty()) { + && this.plan.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.plan.hasValue(MEMBER__OF) - && this.plan.value(MEMBER__OF).isEmpty()) { + && this.plan.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.plan.hasValue(MEMBER_OF) - && this.plan.value(MEMBER_OF).isEmpty()) { + && this.plan.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.plan.hasValue(MEMBER_OF_KIND) - && this.plan.value(MEMBER_OF_KIND).isEmpty()) { + && this.plan.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.plan.hasValue(PART__OF) - && this.plan.value(PART__OF).isEmpty()) { + && this.plan.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.plan.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.plan.hasValue(TEMPORAL__PART_OF) - && this.plan.value(TEMPORAL__PART_OF).isEmpty()) { + && this.plan.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.plan.hasValue(TEMPORAL_PART_OF) - && this.plan.value(TEMPORAL_PART_OF).isEmpty()) { + && this.plan.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } if (this.plan.hasValue(TEMPORAL_PART_OF_) - && this.plan.value(TEMPORAL_PART_OF_).isEmpty()) { + && this.plan.values(TEMPORAL_PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of_"); } return plan; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java index 2976fe18..264e6fca 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java @@ -183,34 +183,34 @@ public final PointInTimeBuilder temporal__Part_Of(final SpatioTemporalExtent spa */ public PointInTime build() throws HqdmException { if (this.pointInTime.hasValue(AGGREGATED_INTO) - && this.pointInTime.value(AGGREGATED_INTO).isEmpty()) { + && this.pointInTime.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.pointInTime.hasValue(BEGINNING) - && this.pointInTime.value(BEGINNING).isEmpty()) { + && this.pointInTime.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.pointInTime.hasValue(ENDING) - && this.pointInTime.value(ENDING).isEmpty()) { + && this.pointInTime.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.pointInTime.hasValue(MEMBER__OF) - && this.pointInTime.value(MEMBER__OF).isEmpty()) { + && this.pointInTime.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.pointInTime.hasValue(MEMBER_OF) - && this.pointInTime.value(MEMBER_OF).isEmpty()) { + && this.pointInTime.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.pointInTime.hasValue(PART__OF) - && this.pointInTime.value(PART__OF).isEmpty()) { + && this.pointInTime.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.pointInTime.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.pointInTime.hasValue(TEMPORAL__PART_OF) - && this.pointInTime.value(TEMPORAL__PART_OF).isEmpty()) { + && this.pointInTime.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return pointInTime; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java index d6226fe7..98f950fb 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java @@ -228,45 +228,45 @@ public final PositionBuilder temporal_Part_Of(final OrganizationComponent organi */ public Position build() throws HqdmException { if (this.position.hasValue(AGGREGATED_INTO) - && this.position.value(AGGREGATED_INTO).isEmpty()) { + && this.position.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.position.hasValue(BEGINNING) - && this.position.value(BEGINNING).isEmpty()) { + && this.position.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.position.hasValue(COMPONENT_OF)) { throw new HqdmException("Property Not Set: component_of"); } if (this.position.hasValue(ENDING) - && this.position.value(ENDING).isEmpty()) { + && this.position.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.position.hasValue(MEMBER__OF) - && this.position.value(MEMBER__OF).isEmpty()) { + && this.position.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.position.hasValue(MEMBER_OF) - && this.position.value(MEMBER_OF).isEmpty()) { + && this.position.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.position.hasValue(MEMBER_OF_KIND) - && this.position.value(MEMBER_OF_KIND).isEmpty()) { + && this.position.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.position.hasValue(PART__OF) - && this.position.value(PART__OF).isEmpty()) { + && this.position.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.position.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.position.hasValue(TEMPORAL__PART_OF) - && this.position.value(TEMPORAL__PART_OF).isEmpty()) { + && this.position.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.position.hasValue(TEMPORAL_PART_OF) - && this.position.value(TEMPORAL_PART_OF).isEmpty()) { + && this.position.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return position; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java index 822f34e4..a2d88e59 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java @@ -237,46 +237,46 @@ public final PossibleWorldBuilder temporal_Part_Of_(final PossibleWorld possible */ public PossibleWorld build() throws HqdmException { if (this.possibleWorld.hasValue(AGGREGATED_INTO) - && this.possibleWorld.value(AGGREGATED_INTO).isEmpty()) { + && this.possibleWorld.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.possibleWorld.hasValue(BEGINNING) - && this.possibleWorld.value(BEGINNING).isEmpty()) { + && this.possibleWorld.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.possibleWorld.hasValue(ENDING) - && this.possibleWorld.value(ENDING).isEmpty()) { + && this.possibleWorld.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.possibleWorld.hasValue(MEMBER__OF) - && this.possibleWorld.value(MEMBER__OF).isEmpty()) { + && this.possibleWorld.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.possibleWorld.hasValue(MEMBER_OF) - && this.possibleWorld.value(MEMBER_OF).isEmpty()) { + && this.possibleWorld.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.possibleWorld.hasValue(MEMBER_OF_KIND) - && this.possibleWorld.value(MEMBER_OF_KIND).isEmpty()) { + && this.possibleWorld.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.possibleWorld.hasValue(PART__OF) - && this.possibleWorld.value(PART__OF).isEmpty()) { + && this.possibleWorld.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.possibleWorld.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.possibleWorld.hasValue(TEMPORAL__PART_OF) - && this.possibleWorld.value(TEMPORAL__PART_OF).isEmpty()) { + && this.possibleWorld.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.possibleWorld.hasValue(TEMPORAL_PART_OF) - && this.possibleWorld.value(TEMPORAL_PART_OF).isEmpty()) { + && this.possibleWorld.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } if (this.possibleWorld.hasValue(TEMPORAL_PART_OF_) - && this.possibleWorld.value(TEMPORAL_PART_OF_).isEmpty()) { + && this.possibleWorld.values(TEMPORAL_PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of_"); } return possibleWorld; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java index 8c169555..13bbfbd3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java @@ -138,23 +138,23 @@ public final PriceBuilder part__Of_By_Class( */ public Price build() throws HqdmException { if (this.price.hasValue(HAS_SUPERCLASS) - && this.price.value(HAS_SUPERCLASS).isEmpty()) { + && this.price.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.price.hasValue(MEMBER__OF) - && this.price.value(MEMBER__OF).isEmpty()) { + && this.price.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.price.hasValue(MEMBER_OF) - && this.price.value(MEMBER_OF).isEmpty()) { + && this.price.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.price.hasValue(MEMBER_OF_) - && this.price.value(MEMBER_OF_).isEmpty()) { + && this.price.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.price.hasValue(PART__OF_BY_CLASS) - && this.price.value(PART__OF_BY_CLASS).isEmpty()) { + && this.price.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return price; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java index 0a50d74a..bddeb1ff 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java @@ -138,23 +138,23 @@ public final ProductBrandBuilder part__Of_By_Class( */ public ProductBrand build() throws HqdmException { if (this.productBrand.hasValue(HAS_SUPERCLASS) - && this.productBrand.value(HAS_SUPERCLASS).isEmpty()) { + && this.productBrand.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.productBrand.hasValue(MEMBER__OF) - && this.productBrand.value(MEMBER__OF).isEmpty()) { + && this.productBrand.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.productBrand.hasValue(MEMBER_OF) - && this.productBrand.value(MEMBER_OF).isEmpty()) { + && this.productBrand.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.productBrand.hasValue(MEMBER_OF_) - && this.productBrand.value(MEMBER_OF_).isEmpty()) { + && this.productBrand.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.productBrand.hasValue(PART__OF_BY_CLASS) - && this.productBrand.value(PART__OF_BY_CLASS).isEmpty()) { + && this.productBrand.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return productBrand; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java index 2df3f82f..24e8c69d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java @@ -238,34 +238,34 @@ public ProductOffering build() throws HqdmException { throw new HqdmException("Property Not Set: consideration_by_class"); } if (this.productOffering.hasValue(HAS_SUPERCLASS) - && this.productOffering.value(HAS_SUPERCLASS).isEmpty()) { + && this.productOffering.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.productOffering.hasValue(MEMBER__OF) - && this.productOffering.value(MEMBER__OF).isEmpty()) { + && this.productOffering.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.productOffering.hasValue(MEMBER_OF) - && this.productOffering.value(MEMBER_OF).isEmpty()) { + && this.productOffering.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.productOffering.hasValue(MEMBER_OF_) - && this.productOffering.value(MEMBER_OF_).isEmpty()) { + && this.productOffering.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (!this.productOffering.hasValue(OFFEROR)) { throw new HqdmException("Property Not Set: offeror"); } if (this.productOffering.hasValue(PART__OF_BY_CLASS) - && this.productOffering.value(PART__OF_BY_CLASS).isEmpty()) { + && this.productOffering.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.productOffering.hasValue(PART_OF_BY_CLASS) - && this.productOffering.value(PART_OF_BY_CLASS).isEmpty()) { + && this.productOffering.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.productOffering.hasValue(PART_OF_BY_CLASS_) - && this.productOffering.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.productOffering.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } if (!this.productOffering.hasValue(PERIOD_OFFERED)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java index 6e3a2096..2fb6394e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java @@ -321,59 +321,59 @@ public final ReachingAgreementBuilder temporal_Part_Of(final Individual individu */ public ReachingAgreement build() throws HqdmException { if (this.reachingAgreement.hasValue(AGGREGATED_INTO) - && this.reachingAgreement.value(AGGREGATED_INTO).isEmpty()) { + && this.reachingAgreement.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.reachingAgreement.hasValue(BEGINNING) - && this.reachingAgreement.value(BEGINNING).isEmpty()) { + && this.reachingAgreement.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.reachingAgreement.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.reachingAgreement.hasValue(DETERMINES) - && this.reachingAgreement.value(DETERMINES).isEmpty()) { + && this.reachingAgreement.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.reachingAgreement.hasValue(ENDING) - && this.reachingAgreement.value(ENDING).isEmpty()) { + && this.reachingAgreement.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.reachingAgreement.hasValue(MEMBER__OF) - && this.reachingAgreement.value(MEMBER__OF).isEmpty()) { + && this.reachingAgreement.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.reachingAgreement.hasValue(MEMBER_OF) - && this.reachingAgreement.value(MEMBER_OF).isEmpty()) { + && this.reachingAgreement.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.reachingAgreement.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.reachingAgreement.hasValue(PART__OF) - && this.reachingAgreement.value(PART__OF).isEmpty()) { + && this.reachingAgreement.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.reachingAgreement.hasValue(PART_OF)) { throw new HqdmException("Property Not Set: part_of"); } if (this.reachingAgreement.hasValue(PART_OF_) - && this.reachingAgreement.value(PART_OF_).isEmpty()) { + && this.reachingAgreement.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.reachingAgreement.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.reachingAgreement.hasValue(REFERENCES) - && this.reachingAgreement.value(REFERENCES).isEmpty()) { + && this.reachingAgreement.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.reachingAgreement.hasValue(TEMPORAL__PART_OF) - && this.reachingAgreement.value(TEMPORAL__PART_OF).isEmpty()) { + && this.reachingAgreement.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.reachingAgreement.hasValue(TEMPORAL_PART_OF) - && this.reachingAgreement.value(TEMPORAL_PART_OF).isEmpty()) { + && this.reachingAgreement.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return reachingAgreement; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java index bfd1d00d..9abddeb7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java @@ -239,45 +239,45 @@ public final RecognizingLanguageCommunityBuilder temporal_Part_Of(final Language */ public RecognizingLanguageCommunity build() throws HqdmException { if (this.recognizingLanguageCommunity.hasValue(AGGREGATED_INTO) - && this.recognizingLanguageCommunity.value(AGGREGATED_INTO).isEmpty()) { + && this.recognizingLanguageCommunity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.recognizingLanguageCommunity.hasValue(BEGINNING) - && this.recognizingLanguageCommunity.value(BEGINNING).isEmpty()) { + && this.recognizingLanguageCommunity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.recognizingLanguageCommunity.hasValue(ENDING) - && this.recognizingLanguageCommunity.value(ENDING).isEmpty()) { + && this.recognizingLanguageCommunity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.recognizingLanguageCommunity.hasValue(MEMBER__OF) - && this.recognizingLanguageCommunity.value(MEMBER__OF).isEmpty()) { + && this.recognizingLanguageCommunity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.recognizingLanguageCommunity.hasValue(MEMBER_OF) - && this.recognizingLanguageCommunity.value(MEMBER_OF).isEmpty()) { + && this.recognizingLanguageCommunity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.recognizingLanguageCommunity.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.recognizingLanguageCommunity.hasValue(PART__OF) - && this.recognizingLanguageCommunity.value(PART__OF).isEmpty()) { + && this.recognizingLanguageCommunity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.recognizingLanguageCommunity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.recognizingLanguageCommunity.hasValue(PARTICIPANT_IN) - && this.recognizingLanguageCommunity.value(PARTICIPANT_IN).isEmpty()) { + && this.recognizingLanguageCommunity.values(PARTICIPANT_IN).isEmpty()) { throw new HqdmException("Property Not Set: participant_in"); } if (this.recognizingLanguageCommunity.hasValue(TEMPORAL__PART_OF) - && this.recognizingLanguageCommunity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.recognizingLanguageCommunity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.recognizingLanguageCommunity.hasValue(TEMPORAL_PART_OF) - && this.recognizingLanguageCommunity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.recognizingLanguageCommunity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return recognizingLanguageCommunity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RelationshipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RelationshipBuilder.java index 31a31dff..78dfe0f9 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RelationshipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RelationshipBuilder.java @@ -73,11 +73,11 @@ public final RelationshipBuilder member_Of(final ClassOfRelationship classOfRela */ public Relationship build() throws HqdmException { if (this.relationship.hasValue(MEMBER__OF) - && this.relationship.value(MEMBER__OF).isEmpty()) { + && this.relationship.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.relationship.hasValue(MEMBER_OF) - && this.relationship.value(MEMBER_OF).isEmpty()) { + && this.relationship.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return relationship; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java index 5c501cdb..79442c74 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java @@ -301,23 +301,23 @@ public final RepresentationBySignBuilder temporal_Part_Of(final Individual indiv */ public RepresentationBySign build() throws HqdmException { if (this.representationBySign.hasValue(AGGREGATED_INTO) - && this.representationBySign.value(AGGREGATED_INTO).isEmpty()) { + && this.representationBySign.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.representationBySign.hasValue(BEGINNING) - && this.representationBySign.value(BEGINNING).isEmpty()) { + && this.representationBySign.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.representationBySign.hasValue(ENDING) - && this.representationBySign.value(ENDING).isEmpty()) { + && this.representationBySign.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.representationBySign.hasValue(MEMBER__OF) - && this.representationBySign.value(MEMBER__OF).isEmpty()) { + && this.representationBySign.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.representationBySign.hasValue(MEMBER_OF) - && this.representationBySign.value(MEMBER_OF).isEmpty()) { + && this.representationBySign.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.representationBySign.hasValue(MEMBER_OF_)) { @@ -327,7 +327,7 @@ public RepresentationBySign build() throws HqdmException { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.representationBySign.hasValue(PART__OF) - && this.representationBySign.value(PART__OF).isEmpty()) { + && this.representationBySign.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.representationBySign.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -337,11 +337,11 @@ public RepresentationBySign build() throws HqdmException { throw new HqdmException("Property Not Set: represents"); } if (this.representationBySign.hasValue(TEMPORAL__PART_OF) - && this.representationBySign.value(TEMPORAL__PART_OF).isEmpty()) { + && this.representationBySign.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.representationBySign.hasValue(TEMPORAL_PART_OF) - && this.representationBySign.value(TEMPORAL_PART_OF).isEmpty()) { + && this.representationBySign.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return representationBySign; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java index 44257ebc..f19db0db 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java @@ -214,30 +214,30 @@ public final RequirementBuilder temporal__Part_Of(final SpatioTemporalExtent spa */ public Requirement build() throws HqdmException { if (this.requirement.hasValue(AGGREGATED_INTO) - && this.requirement.value(AGGREGATED_INTO).isEmpty()) { + && this.requirement.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.requirement.hasValue(BEGINNING) - && this.requirement.value(BEGINNING).isEmpty()) { + && this.requirement.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.requirement.hasValue(DEFINED_BY)) { throw new HqdmException("Property Not Set: defined_by"); } if (this.requirement.hasValue(ENDING) - && this.requirement.value(ENDING).isEmpty()) { + && this.requirement.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.requirement.hasValue(MEMBER__OF) - && this.requirement.value(MEMBER__OF).isEmpty()) { + && this.requirement.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.requirement.hasValue(MEMBER_OF) - && this.requirement.value(MEMBER_OF).isEmpty()) { + && this.requirement.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.requirement.hasValue(PART__OF) - && this.requirement.value(PART__OF).isEmpty()) { + && this.requirement.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.requirement.hasValue(PART_OF_PLAN)) { @@ -247,7 +247,7 @@ public Requirement build() throws HqdmException { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.requirement.hasValue(TEMPORAL__PART_OF) - && this.requirement.value(TEMPORAL__PART_OF).isEmpty()) { + && this.requirement.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return requirement; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java index ce592241..fe2ab0d5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java @@ -156,26 +156,26 @@ public final RequirementSpecificationBuilder part__Of_By_Class( */ public RequirementSpecification build() throws HqdmException { if (this.requirementSpecification.hasValue(HAS_SUPERCLASS) - && this.requirementSpecification.value(HAS_SUPERCLASS).isEmpty()) { + && this.requirementSpecification.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (!this.requirementSpecification.hasValue(INTERSECTION_OF)) { throw new HqdmException("Property Not Set: intersection_of"); } if (this.requirementSpecification.hasValue(MEMBER__OF) - && this.requirementSpecification.value(MEMBER__OF).isEmpty()) { + && this.requirementSpecification.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.requirementSpecification.hasValue(MEMBER_OF) - && this.requirementSpecification.value(MEMBER_OF).isEmpty()) { + && this.requirementSpecification.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.requirementSpecification.hasValue(MEMBER_OF_) - && this.requirementSpecification.value(MEMBER_OF_).isEmpty()) { + && this.requirementSpecification.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.requirementSpecification.hasValue(PART__OF_BY_CLASS) - && this.requirementSpecification.value(PART__OF_BY_CLASS).isEmpty()) { + && this.requirementSpecification.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } return requirementSpecification; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java index cf32a465..f7414ee3 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java @@ -170,31 +170,31 @@ public final RoleBuilder part_Of_By_Class_(final KindOfAssociation kindOfAssocia */ public Role build() throws HqdmException { if (this.role.hasValue(HAS_SUPERCLASS) - && this.role.value(HAS_SUPERCLASS).isEmpty()) { + && this.role.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.role.hasValue(MEMBER__OF) - && this.role.value(MEMBER__OF).isEmpty()) { + && this.role.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.role.hasValue(MEMBER_OF) - && this.role.value(MEMBER_OF).isEmpty()) { + && this.role.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.role.hasValue(MEMBER_OF_) - && this.role.value(MEMBER_OF_).isEmpty()) { + && this.role.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.role.hasValue(PART__OF_BY_CLASS) - && this.role.value(PART__OF_BY_CLASS).isEmpty()) { + && this.role.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.role.hasValue(PART_OF_BY_CLASS) - && this.role.value(PART_OF_BY_CLASS).isEmpty()) { + && this.role.values(PART_OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class"); } if (this.role.hasValue(PART_OF_BY_CLASS_) - && this.role.value(PART_OF_BY_CLASS_).isEmpty()) { + && this.role.values(PART_OF_BY_CLASS_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_by_class_"); } return role; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java index b2d12806..3de1c93e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java @@ -340,60 +340,60 @@ public final SaleOfGoodsBuilder temporal_Part_Of(final Individual individual) { */ public SaleOfGoods build() throws HqdmException { if (this.saleOfGoods.hasValue(AGGREGATED_INTO) - && this.saleOfGoods.value(AGGREGATED_INTO).isEmpty()) { + && this.saleOfGoods.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.saleOfGoods.hasValue(BEGINNING) - && this.saleOfGoods.value(BEGINNING).isEmpty()) { + && this.saleOfGoods.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.saleOfGoods.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.saleOfGoods.hasValue(DETERMINES) - && this.saleOfGoods.value(DETERMINES).isEmpty()) { + && this.saleOfGoods.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.saleOfGoods.hasValue(ENDING) - && this.saleOfGoods.value(ENDING).isEmpty()) { + && this.saleOfGoods.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.saleOfGoods.hasValue(MEMBER__OF) - && this.saleOfGoods.value(MEMBER__OF).isEmpty()) { + && this.saleOfGoods.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.saleOfGoods.hasValue(MEMBER_OF) - && this.saleOfGoods.value(MEMBER_OF).isEmpty()) { + && this.saleOfGoods.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.saleOfGoods.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.saleOfGoods.hasValue(PART__OF) - && this.saleOfGoods.value(PART__OF).isEmpty()) { + && this.saleOfGoods.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.saleOfGoods.hasValue(PART_OF) - && this.saleOfGoods.value(PART_OF).isEmpty()) { + && this.saleOfGoods.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.saleOfGoods.hasValue(PART_OF_) - && this.saleOfGoods.value(PART_OF_).isEmpty()) { + && this.saleOfGoods.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.saleOfGoods.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.saleOfGoods.hasValue(REFERENCES) - && this.saleOfGoods.value(REFERENCES).isEmpty()) { + && this.saleOfGoods.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.saleOfGoods.hasValue(TEMPORAL__PART_OF) - && this.saleOfGoods.value(TEMPORAL__PART_OF).isEmpty()) { + && this.saleOfGoods.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.saleOfGoods.hasValue(TEMPORAL_PART_OF) - && this.saleOfGoods.value(TEMPORAL_PART_OF).isEmpty()) { + && this.saleOfGoods.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return saleOfGoods; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java index c4f5d0ee..001db230 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java @@ -171,31 +171,31 @@ public final SalesProductBuilder sold_Under(final ProductBrand productBrand) { */ public SalesProduct build() throws HqdmException { if (this.salesProduct.hasValue(HAS_SUPERCLASS) - && this.salesProduct.value(HAS_SUPERCLASS).isEmpty()) { + && this.salesProduct.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.salesProduct.hasValue(MEETS_SPECIFICATION) - && this.salesProduct.value(MEETS_SPECIFICATION).isEmpty()) { + && this.salesProduct.values(MEETS_SPECIFICATION).isEmpty()) { throw new HqdmException("Property Not Set: meets_specification"); } if (this.salesProduct.hasValue(MEMBER__OF) - && this.salesProduct.value(MEMBER__OF).isEmpty()) { + && this.salesProduct.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.salesProduct.hasValue(MEMBER_OF) - && this.salesProduct.value(MEMBER_OF).isEmpty()) { + && this.salesProduct.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.salesProduct.hasValue(MEMBER_OF_) - && this.salesProduct.value(MEMBER_OF_).isEmpty()) { + && this.salesProduct.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.salesProduct.hasValue(PART__OF_BY_CLASS) - && this.salesProduct.value(PART__OF_BY_CLASS).isEmpty()) { + && this.salesProduct.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.salesProduct.hasValue(SOLD_UNDER) - && this.salesProduct.value(SOLD_UNDER).isEmpty()) { + && this.salesProduct.values(SOLD_UNDER).isEmpty()) { throw new HqdmException("Property Not Set: sold_under"); } return salesProduct; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java index 669be0a2..5df8735b 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java @@ -232,45 +232,45 @@ public final SalesProductInstanceBuilder temporal_Part_Of(final SalesProductInst */ public SalesProductInstance build() throws HqdmException { if (this.salesProductInstance.hasValue(AGGREGATED_INTO) - && this.salesProductInstance.value(AGGREGATED_INTO).isEmpty()) { + && this.salesProductInstance.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.salesProductInstance.hasValue(BEGINNING) - && this.salesProductInstance.value(BEGINNING).isEmpty()) { + && this.salesProductInstance.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.salesProductInstance.hasValue(ENDING) - && this.salesProductInstance.value(ENDING).isEmpty()) { + && this.salesProductInstance.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (!this.salesProductInstance.hasValue(INTENDED_ROLE)) { throw new HqdmException("Property Not Set: intended_role"); } if (this.salesProductInstance.hasValue(MEMBER__OF) - && this.salesProductInstance.value(MEMBER__OF).isEmpty()) { + && this.salesProductInstance.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.salesProductInstance.hasValue(MEMBER_OF) - && this.salesProductInstance.value(MEMBER_OF).isEmpty()) { + && this.salesProductInstance.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.salesProductInstance.hasValue(MEMBER_OF_KIND) - && this.salesProductInstance.value(MEMBER_OF_KIND).isEmpty()) { + && this.salesProductInstance.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.salesProductInstance.hasValue(PART__OF) - && this.salesProductInstance.value(PART__OF).isEmpty()) { + && this.salesProductInstance.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.salesProductInstance.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.salesProductInstance.hasValue(TEMPORAL__PART_OF) - && this.salesProductInstance.value(TEMPORAL__PART_OF).isEmpty()) { + && this.salesProductInstance.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.salesProductInstance.hasValue(TEMPORAL_PART_OF) - && this.salesProductInstance.value(TEMPORAL_PART_OF).isEmpty()) { + && this.salesProductInstance.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return salesProductInstance; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java index 612554e3..cb5ed468 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java @@ -167,31 +167,31 @@ public final SalesProductVersionBuilder successor(final SalesProductVersion sale */ public SalesProductVersion build() throws HqdmException { if (this.salesProductVersion.hasValue(HAS_SUPERCLASS) - && this.salesProductVersion.value(HAS_SUPERCLASS).isEmpty()) { + && this.salesProductVersion.values(HAS_SUPERCLASS).isEmpty()) { throw new HqdmException("Property Not Set: has_superclass"); } if (this.salesProductVersion.hasValue(MEMBER__OF) - && this.salesProductVersion.value(MEMBER__OF).isEmpty()) { + && this.salesProductVersion.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.salesProductVersion.hasValue(MEMBER_OF) - && this.salesProductVersion.value(MEMBER_OF).isEmpty()) { + && this.salesProductVersion.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.salesProductVersion.hasValue(MEMBER_OF_) - && this.salesProductVersion.value(MEMBER_OF_).isEmpty()) { + && this.salesProductVersion.values(MEMBER_OF_).isEmpty()) { throw new HqdmException("Property Not Set: member_of_"); } if (this.salesProductVersion.hasValue(PART__OF_BY_CLASS) - && this.salesProductVersion.value(PART__OF_BY_CLASS).isEmpty()) { + && this.salesProductVersion.values(PART__OF_BY_CLASS).isEmpty()) { throw new HqdmException("Property Not Set: part__of_by_class"); } if (this.salesProductVersion.hasValue(SOLD_AS) - && this.salesProductVersion.value(SOLD_AS).isEmpty()) { + && this.salesProductVersion.values(SOLD_AS).isEmpty()) { throw new HqdmException("Property Not Set: sold_as"); } if (this.salesProductVersion.hasValue(SUCCESSOR) - && this.salesProductVersion.value(SUCCESSOR).isEmpty()) { + && this.salesProductVersion.values(SUCCESSOR).isEmpty()) { throw new HqdmException("Property Not Set: successor"); } return salesProductVersion; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ScaleBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ScaleBuilder.java index 24a85923..e54361f5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ScaleBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ScaleBuilder.java @@ -114,15 +114,15 @@ public Scale build() throws HqdmException { throw new HqdmException("Property Not Set: domain"); } if (this.scale.hasValue(MEMBER__OF) - && this.scale.value(MEMBER__OF).isEmpty()) { + && this.scale.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.scale.hasValue(MEMBER_OF) - && this.scale.value(MEMBER_OF).isEmpty()) { + && this.scale.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.scale.hasValue(UNIT) - && this.scale.value(UNIT).isEmpty()) { + && this.scale.values(UNIT).isEmpty()) { throw new HqdmException("Property Not Set: unit"); } return scale; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java index fca3d780..9e60c1e6 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java @@ -255,34 +255,34 @@ public final SignBuilder temporal_Part_Of(final Individual individual) { */ public Sign build() throws HqdmException { if (this.sign.hasValue(AGGREGATED_INTO) - && this.sign.value(AGGREGATED_INTO).isEmpty()) { + && this.sign.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.sign.hasValue(BEGINNING) - && this.sign.value(BEGINNING).isEmpty()) { + && this.sign.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.sign.hasValue(ENDING) - && this.sign.value(ENDING).isEmpty()) { + && this.sign.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.sign.hasValue(MEMBER__OF) - && this.sign.value(MEMBER__OF).isEmpty()) { + && this.sign.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.sign.hasValue(MEMBER_OF) - && this.sign.value(MEMBER_OF).isEmpty()) { + && this.sign.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.sign.hasValue(MEMBER_OF_)) { throw new HqdmException("Property Not Set: member_of_"); } if (this.sign.hasValue(MEMBER_OF_KIND) - && this.sign.value(MEMBER_OF_KIND).isEmpty()) { + && this.sign.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.sign.hasValue(PART__OF) - && this.sign.value(PART__OF).isEmpty()) { + && this.sign.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.sign.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -292,11 +292,11 @@ public Sign build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.sign.hasValue(TEMPORAL__PART_OF) - && this.sign.value(TEMPORAL__PART_OF).isEmpty()) { + && this.sign.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.sign.hasValue(TEMPORAL_PART_OF) - && this.sign.value(TEMPORAL_PART_OF).isEmpty()) { + && this.sign.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return sign; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java index e21905d9..d4700a55 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java @@ -329,60 +329,60 @@ public final SociallyConstructedActivityBuilder temporal_Part_Of(final Individua */ public SociallyConstructedActivity build() throws HqdmException { if (this.sociallyConstructedActivity.hasValue(AGGREGATED_INTO) - && this.sociallyConstructedActivity.value(AGGREGATED_INTO).isEmpty()) { + && this.sociallyConstructedActivity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.sociallyConstructedActivity.hasValue(BEGINNING) - && this.sociallyConstructedActivity.value(BEGINNING).isEmpty()) { + && this.sociallyConstructedActivity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.sociallyConstructedActivity.hasValue(CAUSES)) { throw new HqdmException("Property Not Set: causes"); } if (this.sociallyConstructedActivity.hasValue(DETERMINES) - && this.sociallyConstructedActivity.value(DETERMINES).isEmpty()) { + && this.sociallyConstructedActivity.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.sociallyConstructedActivity.hasValue(ENDING) - && this.sociallyConstructedActivity.value(ENDING).isEmpty()) { + && this.sociallyConstructedActivity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.sociallyConstructedActivity.hasValue(MEMBER__OF) - && this.sociallyConstructedActivity.value(MEMBER__OF).isEmpty()) { + && this.sociallyConstructedActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.sociallyConstructedActivity.hasValue(MEMBER_OF) - && this.sociallyConstructedActivity.value(MEMBER_OF).isEmpty()) { + && this.sociallyConstructedActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.sociallyConstructedActivity.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.sociallyConstructedActivity.hasValue(PART__OF) - && this.sociallyConstructedActivity.value(PART__OF).isEmpty()) { + && this.sociallyConstructedActivity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.sociallyConstructedActivity.hasValue(PART_OF) - && this.sociallyConstructedActivity.value(PART_OF).isEmpty()) { + && this.sociallyConstructedActivity.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.sociallyConstructedActivity.hasValue(PART_OF_) - && this.sociallyConstructedActivity.value(PART_OF_).isEmpty()) { + && this.sociallyConstructedActivity.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.sociallyConstructedActivity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.sociallyConstructedActivity.hasValue(REFERENCES) - && this.sociallyConstructedActivity.value(REFERENCES).isEmpty()) { + && this.sociallyConstructedActivity.values(REFERENCES).isEmpty()) { throw new HqdmException("Property Not Set: references"); } if (this.sociallyConstructedActivity.hasValue(TEMPORAL__PART_OF) - && this.sociallyConstructedActivity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.sociallyConstructedActivity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.sociallyConstructedActivity.hasValue(TEMPORAL_PART_OF) - && this.sociallyConstructedActivity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.sociallyConstructedActivity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return sociallyConstructedActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java index f15c5995..c5f2ccf7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java @@ -230,42 +230,42 @@ public final SociallyConstructedObjectBuilder temporal_Part_Of(final Individual */ public SociallyConstructedObject build() throws HqdmException { if (this.sociallyConstructedObject.hasValue(AGGREGATED_INTO) - && this.sociallyConstructedObject.value(AGGREGATED_INTO).isEmpty()) { + && this.sociallyConstructedObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.sociallyConstructedObject.hasValue(BEGINNING) - && this.sociallyConstructedObject.value(BEGINNING).isEmpty()) { + && this.sociallyConstructedObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.sociallyConstructedObject.hasValue(ENDING) - && this.sociallyConstructedObject.value(ENDING).isEmpty()) { + && this.sociallyConstructedObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.sociallyConstructedObject.hasValue(MEMBER__OF) - && this.sociallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.sociallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.sociallyConstructedObject.hasValue(MEMBER_OF) - && this.sociallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.sociallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.sociallyConstructedObject.hasValue(MEMBER_OF_KIND) - && this.sociallyConstructedObject.value(MEMBER_OF_KIND).isEmpty()) { + && this.sociallyConstructedObject.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.sociallyConstructedObject.hasValue(PART__OF) - && this.sociallyConstructedObject.value(PART__OF).isEmpty()) { + && this.sociallyConstructedObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.sociallyConstructedObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.sociallyConstructedObject.hasValue(TEMPORAL__PART_OF) - && this.sociallyConstructedObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.sociallyConstructedObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.sociallyConstructedObject.hasValue(TEMPORAL_PART_OF) - && this.sociallyConstructedObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.sociallyConstructedObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return sociallyConstructedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java index bb121f08..85dfe5c7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java @@ -169,34 +169,34 @@ public final SpatioTemporalExtentBuilder temporal__Part_Of(final SpatioTemporalE */ public SpatioTemporalExtent build() throws HqdmException { if (this.spatioTemporalExtent.hasValue(AGGREGATED_INTO) - && this.spatioTemporalExtent.value(AGGREGATED_INTO).isEmpty()) { + && this.spatioTemporalExtent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.spatioTemporalExtent.hasValue(BEGINNING) - && this.spatioTemporalExtent.value(BEGINNING).isEmpty()) { + && this.spatioTemporalExtent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.spatioTemporalExtent.hasValue(ENDING) - && this.spatioTemporalExtent.value(ENDING).isEmpty()) { + && this.spatioTemporalExtent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.spatioTemporalExtent.hasValue(MEMBER__OF) - && this.spatioTemporalExtent.value(MEMBER__OF).isEmpty()) { + && this.spatioTemporalExtent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.spatioTemporalExtent.hasValue(MEMBER_OF) - && this.spatioTemporalExtent.value(MEMBER_OF).isEmpty()) { + && this.spatioTemporalExtent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.spatioTemporalExtent.hasValue(PART__OF) - && this.spatioTemporalExtent.value(PART__OF).isEmpty()) { + && this.spatioTemporalExtent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.spatioTemporalExtent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.spatioTemporalExtent.hasValue(TEMPORAL__PART_OF) - && this.spatioTemporalExtent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.spatioTemporalExtent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } return spatioTemporalExtent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpecializationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpecializationBuilder.java index 86e1ebfb..fe940d8e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpecializationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpecializationBuilder.java @@ -98,11 +98,11 @@ public final SpecializationBuilder superclass_M(final Class clazz) { */ public Specialization build() throws HqdmException { if (this.specialization.hasValue(MEMBER__OF) - && this.specialization.value(MEMBER__OF).isEmpty()) { + && this.specialization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.specialization.hasValue(MEMBER_OF) - && this.specialization.value(MEMBER_OF).isEmpty()) { + && this.specialization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.specialization.hasValue(SUBCLASS)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java index d408f6e8..de22c8c6 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java @@ -207,38 +207,38 @@ public final StateBuilder temporal_Part_Of(final Individual individual) { */ public State build() throws HqdmException { if (this.state.hasValue(AGGREGATED_INTO) - && this.state.value(AGGREGATED_INTO).isEmpty()) { + && this.state.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.state.hasValue(BEGINNING) - && this.state.value(BEGINNING).isEmpty()) { + && this.state.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.state.hasValue(ENDING) - && this.state.value(ENDING).isEmpty()) { + && this.state.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.state.hasValue(MEMBER__OF) - && this.state.value(MEMBER__OF).isEmpty()) { + && this.state.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.state.hasValue(MEMBER_OF) - && this.state.value(MEMBER_OF).isEmpty()) { + && this.state.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.state.hasValue(PART__OF) - && this.state.value(PART__OF).isEmpty()) { + && this.state.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.state.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.state.hasValue(TEMPORAL__PART_OF) - && this.state.value(TEMPORAL__PART_OF).isEmpty()) { + && this.state.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.state.hasValue(TEMPORAL_PART_OF) - && this.state.value(TEMPORAL_PART_OF).isEmpty()) { + && this.state.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return state; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java index 95326331..11ac849f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java @@ -199,38 +199,38 @@ public final StateOfActivityBuilder temporal_Part_Of(final Activity activity) { */ public StateOfActivity build() throws HqdmException { if (this.stateOfActivity.hasValue(AGGREGATED_INTO) - && this.stateOfActivity.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfActivity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfActivity.hasValue(BEGINNING) - && this.stateOfActivity.value(BEGINNING).isEmpty()) { + && this.stateOfActivity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfActivity.hasValue(ENDING) - && this.stateOfActivity.value(ENDING).isEmpty()) { + && this.stateOfActivity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfActivity.hasValue(MEMBER__OF) - && this.stateOfActivity.value(MEMBER__OF).isEmpty()) { + && this.stateOfActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfActivity.hasValue(MEMBER_OF) - && this.stateOfActivity.value(MEMBER_OF).isEmpty()) { + && this.stateOfActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfActivity.hasValue(PART__OF) - && this.stateOfActivity.value(PART__OF).isEmpty()) { + && this.stateOfActivity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfActivity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfActivity.hasValue(TEMPORAL__PART_OF) - && this.stateOfActivity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfActivity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfActivity.hasValue(TEMPORAL_PART_OF) - && this.stateOfActivity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfActivity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java index f02966fd..49de801e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java @@ -201,38 +201,38 @@ public final StateOfAmountOfMoneyBuilder temporal_Part_Of(final AmountOfMoney am */ public StateOfAmountOfMoney build() throws HqdmException { if (this.stateOfAmountOfMoney.hasValue(AGGREGATED_INTO) - && this.stateOfAmountOfMoney.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfAmountOfMoney.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfAmountOfMoney.hasValue(BEGINNING) - && this.stateOfAmountOfMoney.value(BEGINNING).isEmpty()) { + && this.stateOfAmountOfMoney.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfAmountOfMoney.hasValue(ENDING) - && this.stateOfAmountOfMoney.value(ENDING).isEmpty()) { + && this.stateOfAmountOfMoney.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfAmountOfMoney.hasValue(MEMBER__OF) - && this.stateOfAmountOfMoney.value(MEMBER__OF).isEmpty()) { + && this.stateOfAmountOfMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfAmountOfMoney.hasValue(MEMBER_OF) - && this.stateOfAmountOfMoney.value(MEMBER_OF).isEmpty()) { + && this.stateOfAmountOfMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfAmountOfMoney.hasValue(PART__OF) - && this.stateOfAmountOfMoney.value(PART__OF).isEmpty()) { + && this.stateOfAmountOfMoney.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfAmountOfMoney.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfAmountOfMoney.hasValue(TEMPORAL__PART_OF) - && this.stateOfAmountOfMoney.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfAmountOfMoney.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfAmountOfMoney.hasValue(TEMPORAL_PART_OF) - && this.stateOfAmountOfMoney.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfAmountOfMoney.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfAmountOfMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java index a8ef15ed..f6646d79 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java @@ -199,38 +199,38 @@ public final StateOfAssociationBuilder temporal_Part_Of(final Association associ */ public StateOfAssociation build() throws HqdmException { if (this.stateOfAssociation.hasValue(AGGREGATED_INTO) - && this.stateOfAssociation.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfAssociation.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfAssociation.hasValue(BEGINNING) - && this.stateOfAssociation.value(BEGINNING).isEmpty()) { + && this.stateOfAssociation.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfAssociation.hasValue(ENDING) - && this.stateOfAssociation.value(ENDING).isEmpty()) { + && this.stateOfAssociation.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfAssociation.hasValue(MEMBER__OF) - && this.stateOfAssociation.value(MEMBER__OF).isEmpty()) { + && this.stateOfAssociation.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfAssociation.hasValue(MEMBER_OF) - && this.stateOfAssociation.value(MEMBER_OF).isEmpty()) { + && this.stateOfAssociation.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfAssociation.hasValue(PART__OF) - && this.stateOfAssociation.value(PART__OF).isEmpty()) { + && this.stateOfAssociation.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfAssociation.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfAssociation.hasValue(TEMPORAL__PART_OF) - && this.stateOfAssociation.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfAssociation.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfAssociation.hasValue(TEMPORAL_PART_OF) - && this.stateOfAssociation.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfAssociation.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfAssociation; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java index 78b79731..7dc1b7dd 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java @@ -202,38 +202,38 @@ public final StateOfBiologicalObjectBuilder temporal_Part_Of(final BiologicalObj */ public StateOfBiologicalObject build() throws HqdmException { if (this.stateOfBiologicalObject.hasValue(AGGREGATED_INTO) - && this.stateOfBiologicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfBiologicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfBiologicalObject.hasValue(BEGINNING) - && this.stateOfBiologicalObject.value(BEGINNING).isEmpty()) { + && this.stateOfBiologicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfBiologicalObject.hasValue(ENDING) - && this.stateOfBiologicalObject.value(ENDING).isEmpty()) { + && this.stateOfBiologicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfBiologicalObject.hasValue(MEMBER__OF) - && this.stateOfBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfBiologicalObject.hasValue(MEMBER_OF) - && this.stateOfBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfBiologicalObject.hasValue(PART__OF) - && this.stateOfBiologicalObject.value(PART__OF).isEmpty()) { + && this.stateOfBiologicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfBiologicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfBiologicalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfBiologicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfBiologicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfBiologicalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfBiologicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfBiologicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java index 8bc2dcd9..60e966e7 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java @@ -202,38 +202,38 @@ public final StateOfBiologicalSystemBuilder temporal_Part_Of(final BiologicalSys */ public StateOfBiologicalSystem build() throws HqdmException { if (this.stateOfBiologicalSystem.hasValue(AGGREGATED_INTO) - && this.stateOfBiologicalSystem.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfBiologicalSystem.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfBiologicalSystem.hasValue(BEGINNING) - && this.stateOfBiologicalSystem.value(BEGINNING).isEmpty()) { + && this.stateOfBiologicalSystem.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfBiologicalSystem.hasValue(ENDING) - && this.stateOfBiologicalSystem.value(ENDING).isEmpty()) { + && this.stateOfBiologicalSystem.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfBiologicalSystem.hasValue(MEMBER__OF) - && this.stateOfBiologicalSystem.value(MEMBER__OF).isEmpty()) { + && this.stateOfBiologicalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfBiologicalSystem.hasValue(MEMBER_OF) - && this.stateOfBiologicalSystem.value(MEMBER_OF).isEmpty()) { + && this.stateOfBiologicalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfBiologicalSystem.hasValue(PART__OF) - && this.stateOfBiologicalSystem.value(PART__OF).isEmpty()) { + && this.stateOfBiologicalSystem.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfBiologicalSystem.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfBiologicalSystem.hasValue(TEMPORAL__PART_OF) - && this.stateOfBiologicalSystem.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfBiologicalSystem.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfBiologicalSystem.hasValue(TEMPORAL_PART_OF) - && this.stateOfBiologicalSystem.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfBiologicalSystem.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfBiologicalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java index facf8ef2..00f9ef1f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java @@ -214,38 +214,38 @@ public final StateOfBiologicalSystemComponentBuilder temporal_Part_Of( */ public StateOfBiologicalSystemComponent build() throws HqdmException { if (this.stateOfBiologicalSystemComponent.hasValue(AGGREGATED_INTO) - && this.stateOfBiologicalSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfBiologicalSystemComponent.hasValue(BEGINNING) - && this.stateOfBiologicalSystemComponent.value(BEGINNING).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfBiologicalSystemComponent.hasValue(ENDING) - && this.stateOfBiologicalSystemComponent.value(ENDING).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfBiologicalSystemComponent.hasValue(MEMBER__OF) - && this.stateOfBiologicalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfBiologicalSystemComponent.hasValue(MEMBER_OF) - && this.stateOfBiologicalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfBiologicalSystemComponent.hasValue(PART__OF) - && this.stateOfBiologicalSystemComponent.value(PART__OF).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfBiologicalSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfBiologicalSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.stateOfBiologicalSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfBiologicalSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.stateOfBiologicalSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfBiologicalSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfBiologicalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java index e63c56f7..d290a853 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java @@ -202,38 +202,38 @@ public final StateOfFunctionalObjectBuilder temporal_Part_Of(final FunctionalObj */ public StateOfFunctionalObject build() throws HqdmException { if (this.stateOfFunctionalObject.hasValue(AGGREGATED_INTO) - && this.stateOfFunctionalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfFunctionalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfFunctionalObject.hasValue(BEGINNING) - && this.stateOfFunctionalObject.value(BEGINNING).isEmpty()) { + && this.stateOfFunctionalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfFunctionalObject.hasValue(ENDING) - && this.stateOfFunctionalObject.value(ENDING).isEmpty()) { + && this.stateOfFunctionalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfFunctionalObject.hasValue(MEMBER__OF) - && this.stateOfFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfFunctionalObject.hasValue(MEMBER_OF) - && this.stateOfFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfFunctionalObject.hasValue(PART__OF) - && this.stateOfFunctionalObject.value(PART__OF).isEmpty()) { + && this.stateOfFunctionalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfFunctionalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfFunctionalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfFunctionalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfFunctionalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfFunctionalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfFunctionalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfFunctionalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java index 6a722a7c..fd4f7c8a 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java @@ -202,38 +202,38 @@ public final StateOfFunctionalSystemBuilder temporal_Part_Of(final FunctionalSys */ public StateOfFunctionalSystem build() throws HqdmException { if (this.stateOfFunctionalSystem.hasValue(AGGREGATED_INTO) - && this.stateOfFunctionalSystem.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfFunctionalSystem.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfFunctionalSystem.hasValue(BEGINNING) - && this.stateOfFunctionalSystem.value(BEGINNING).isEmpty()) { + && this.stateOfFunctionalSystem.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfFunctionalSystem.hasValue(ENDING) - && this.stateOfFunctionalSystem.value(ENDING).isEmpty()) { + && this.stateOfFunctionalSystem.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfFunctionalSystem.hasValue(MEMBER__OF) - && this.stateOfFunctionalSystem.value(MEMBER__OF).isEmpty()) { + && this.stateOfFunctionalSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfFunctionalSystem.hasValue(MEMBER_OF) - && this.stateOfFunctionalSystem.value(MEMBER_OF).isEmpty()) { + && this.stateOfFunctionalSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfFunctionalSystem.hasValue(PART__OF) - && this.stateOfFunctionalSystem.value(PART__OF).isEmpty()) { + && this.stateOfFunctionalSystem.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfFunctionalSystem.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfFunctionalSystem.hasValue(TEMPORAL__PART_OF) - && this.stateOfFunctionalSystem.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfFunctionalSystem.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfFunctionalSystem.hasValue(TEMPORAL_PART_OF) - && this.stateOfFunctionalSystem.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfFunctionalSystem.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfFunctionalSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java index 04042f4d..28654ef5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java @@ -214,38 +214,38 @@ public final StateOfFunctionalSystemComponentBuilder temporal_Part_Of( */ public StateOfFunctionalSystemComponent build() throws HqdmException { if (this.stateOfFunctionalSystemComponent.hasValue(AGGREGATED_INTO) - && this.stateOfFunctionalSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfFunctionalSystemComponent.hasValue(BEGINNING) - && this.stateOfFunctionalSystemComponent.value(BEGINNING).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfFunctionalSystemComponent.hasValue(ENDING) - && this.stateOfFunctionalSystemComponent.value(ENDING).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfFunctionalSystemComponent.hasValue(MEMBER__OF) - && this.stateOfFunctionalSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfFunctionalSystemComponent.hasValue(MEMBER_OF) - && this.stateOfFunctionalSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfFunctionalSystemComponent.hasValue(PART__OF) - && this.stateOfFunctionalSystemComponent.value(PART__OF).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfFunctionalSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfFunctionalSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.stateOfFunctionalSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfFunctionalSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.stateOfFunctionalSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfFunctionalSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfFunctionalSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java index b356fc42..c9442a1d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java @@ -219,39 +219,39 @@ public final StateOfIntentionallyConstructedObjectBuilder temporal_Part_Of( */ public StateOfIntentionallyConstructedObject build() throws HqdmException { if (this.stateOfIntentionallyConstructedObject.hasValue(AGGREGATED_INTO) - && this.stateOfIntentionallyConstructedObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfIntentionallyConstructedObject.hasValue(BEGINNING) - && this.stateOfIntentionallyConstructedObject.value(BEGINNING).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfIntentionallyConstructedObject.hasValue(ENDING) - && this.stateOfIntentionallyConstructedObject.value(ENDING).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfIntentionallyConstructedObject.hasValue(MEMBER__OF) - && this.stateOfIntentionallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfIntentionallyConstructedObject.hasValue(MEMBER_OF) - && this.stateOfIntentionallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfIntentionallyConstructedObject.hasValue(PART__OF) - && this.stateOfIntentionallyConstructedObject.value(PART__OF).isEmpty()) { + && this.stateOfIntentionallyConstructedObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfIntentionallyConstructedObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfIntentionallyConstructedObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfIntentionallyConstructedObject.value(TEMPORAL__PART_OF) + && this.stateOfIntentionallyConstructedObject.values(TEMPORAL__PART_OF) .isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfIntentionallyConstructedObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfIntentionallyConstructedObject.value(TEMPORAL_PART_OF) + && this.stateOfIntentionallyConstructedObject.values(TEMPORAL_PART_OF) .isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java index b00c5837..84850664 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java @@ -201,38 +201,38 @@ public final StateOfLanguageCommunityBuilder temporal_Part_Of(final LanguageComm */ public StateOfLanguageCommunity build() throws HqdmException { if (this.stateOfLanguageCommunity.hasValue(AGGREGATED_INTO) - && this.stateOfLanguageCommunity.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfLanguageCommunity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfLanguageCommunity.hasValue(BEGINNING) - && this.stateOfLanguageCommunity.value(BEGINNING).isEmpty()) { + && this.stateOfLanguageCommunity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfLanguageCommunity.hasValue(ENDING) - && this.stateOfLanguageCommunity.value(ENDING).isEmpty()) { + && this.stateOfLanguageCommunity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfLanguageCommunity.hasValue(MEMBER__OF) - && this.stateOfLanguageCommunity.value(MEMBER__OF).isEmpty()) { + && this.stateOfLanguageCommunity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfLanguageCommunity.hasValue(MEMBER_OF) - && this.stateOfLanguageCommunity.value(MEMBER_OF).isEmpty()) { + && this.stateOfLanguageCommunity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfLanguageCommunity.hasValue(PART__OF) - && this.stateOfLanguageCommunity.value(PART__OF).isEmpty()) { + && this.stateOfLanguageCommunity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfLanguageCommunity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfLanguageCommunity.hasValue(TEMPORAL__PART_OF) - && this.stateOfLanguageCommunity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfLanguageCommunity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfLanguageCommunity.hasValue(TEMPORAL_PART_OF) - && this.stateOfLanguageCommunity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfLanguageCommunity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfLanguageCommunity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java index a2bbb5fe..c5cb9c1f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java @@ -213,38 +213,38 @@ public final StateOfOrdinaryBiologicalObjectBuilder temporal_Part_Of( */ public StateOfOrdinaryBiologicalObject build() throws HqdmException { if (this.stateOfOrdinaryBiologicalObject.hasValue(AGGREGATED_INTO) - && this.stateOfOrdinaryBiologicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(BEGINNING) - && this.stateOfOrdinaryBiologicalObject.value(BEGINNING).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(ENDING) - && this.stateOfOrdinaryBiologicalObject.value(ENDING).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(MEMBER__OF) - && this.stateOfOrdinaryBiologicalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(MEMBER_OF) - && this.stateOfOrdinaryBiologicalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(PART__OF) - && this.stateOfOrdinaryBiologicalObject.value(PART__OF).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfOrdinaryBiologicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfOrdinaryBiologicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfOrdinaryBiologicalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfOrdinaryBiologicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfOrdinaryBiologicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfOrdinaryBiologicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java index 57773206..9cb502b4 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java @@ -212,38 +212,38 @@ public final StateOfOrdinaryFunctionalObjectBuilder temporal_Part_Of( */ public StateOfOrdinaryFunctionalObject build() throws HqdmException { if (this.stateOfOrdinaryFunctionalObject.hasValue(AGGREGATED_INTO) - && this.stateOfOrdinaryFunctionalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(BEGINNING) - && this.stateOfOrdinaryFunctionalObject.value(BEGINNING).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(ENDING) - && this.stateOfOrdinaryFunctionalObject.value(ENDING).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(MEMBER__OF) - && this.stateOfOrdinaryFunctionalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(MEMBER_OF) - && this.stateOfOrdinaryFunctionalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(PART__OF) - && this.stateOfOrdinaryFunctionalObject.value(PART__OF).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfOrdinaryFunctionalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfOrdinaryFunctionalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfOrdinaryFunctionalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfOrdinaryFunctionalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfOrdinaryFunctionalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfOrdinaryFunctionalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java index 2a37b9a5..04b0afa1 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java @@ -210,38 +210,38 @@ public final StateOfOrdinaryPhysicalObjectBuilder temporal_Part_Of( */ public StateOfOrdinaryPhysicalObject build() throws HqdmException { if (this.stateOfOrdinaryPhysicalObject.hasValue(AGGREGATED_INTO) - && this.stateOfOrdinaryPhysicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(BEGINNING) - && this.stateOfOrdinaryPhysicalObject.value(BEGINNING).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(ENDING) - && this.stateOfOrdinaryPhysicalObject.value(ENDING).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(MEMBER__OF) - && this.stateOfOrdinaryPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(MEMBER_OF) - && this.stateOfOrdinaryPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(PART__OF) - && this.stateOfOrdinaryPhysicalObject.value(PART__OF).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfOrdinaryPhysicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfOrdinaryPhysicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfOrdinaryPhysicalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfOrdinaryPhysicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfOrdinaryPhysicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfOrdinaryPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java index da0dc2a5..c252d6cc 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java @@ -201,38 +201,38 @@ public final StateOfOrganizationBuilder temporal_Part_Of(final Organization orga */ public StateOfOrganization build() throws HqdmException { if (this.stateOfOrganization.hasValue(AGGREGATED_INTO) - && this.stateOfOrganization.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfOrganization.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfOrganization.hasValue(BEGINNING) - && this.stateOfOrganization.value(BEGINNING).isEmpty()) { + && this.stateOfOrganization.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfOrganization.hasValue(ENDING) - && this.stateOfOrganization.value(ENDING).isEmpty()) { + && this.stateOfOrganization.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfOrganization.hasValue(MEMBER__OF) - && this.stateOfOrganization.value(MEMBER__OF).isEmpty()) { + && this.stateOfOrganization.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfOrganization.hasValue(MEMBER_OF) - && this.stateOfOrganization.value(MEMBER_OF).isEmpty()) { + && this.stateOfOrganization.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfOrganization.hasValue(PART__OF) - && this.stateOfOrganization.value(PART__OF).isEmpty()) { + && this.stateOfOrganization.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfOrganization.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfOrganization.hasValue(TEMPORAL__PART_OF) - && this.stateOfOrganization.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfOrganization.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfOrganization.hasValue(TEMPORAL_PART_OF) - && this.stateOfOrganization.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfOrganization.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfOrganization; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java index 34ea4cf4..b337ffa5 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java @@ -209,38 +209,38 @@ public final StateOfOrganizationComponentBuilder temporal_Part_Of( */ public StateOfOrganizationComponent build() throws HqdmException { if (this.stateOfOrganizationComponent.hasValue(AGGREGATED_INTO) - && this.stateOfOrganizationComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfOrganizationComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfOrganizationComponent.hasValue(BEGINNING) - && this.stateOfOrganizationComponent.value(BEGINNING).isEmpty()) { + && this.stateOfOrganizationComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfOrganizationComponent.hasValue(ENDING) - && this.stateOfOrganizationComponent.value(ENDING).isEmpty()) { + && this.stateOfOrganizationComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfOrganizationComponent.hasValue(MEMBER__OF) - && this.stateOfOrganizationComponent.value(MEMBER__OF).isEmpty()) { + && this.stateOfOrganizationComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfOrganizationComponent.hasValue(MEMBER_OF) - && this.stateOfOrganizationComponent.value(MEMBER_OF).isEmpty()) { + && this.stateOfOrganizationComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfOrganizationComponent.hasValue(PART__OF) - && this.stateOfOrganizationComponent.value(PART__OF).isEmpty()) { + && this.stateOfOrganizationComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfOrganizationComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfOrganizationComponent.hasValue(TEMPORAL__PART_OF) - && this.stateOfOrganizationComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfOrganizationComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfOrganizationComponent.hasValue(TEMPORAL_PART_OF) - && this.stateOfOrganizationComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfOrganizationComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfOrganizationComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java index 0e04000c..9d3ad38f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java @@ -198,38 +198,38 @@ public final StateOfPartyBuilder temporal_Part_Of(final Party party) { */ public StateOfParty build() throws HqdmException { if (this.stateOfParty.hasValue(AGGREGATED_INTO) - && this.stateOfParty.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfParty.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfParty.hasValue(BEGINNING) - && this.stateOfParty.value(BEGINNING).isEmpty()) { + && this.stateOfParty.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfParty.hasValue(ENDING) - && this.stateOfParty.value(ENDING).isEmpty()) { + && this.stateOfParty.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfParty.hasValue(MEMBER__OF) - && this.stateOfParty.value(MEMBER__OF).isEmpty()) { + && this.stateOfParty.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfParty.hasValue(MEMBER_OF) - && this.stateOfParty.value(MEMBER_OF).isEmpty()) { + && this.stateOfParty.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfParty.hasValue(PART__OF) - && this.stateOfParty.value(PART__OF).isEmpty()) { + && this.stateOfParty.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfParty.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfParty.hasValue(TEMPORAL__PART_OF) - && this.stateOfParty.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfParty.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfParty.hasValue(TEMPORAL_PART_OF) - && this.stateOfParty.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfParty.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfParty; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java index 64dff33d..fc472629 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java @@ -198,38 +198,38 @@ public final StateOfPersonBuilder temporal_Part_Of(final Person person) { */ public StateOfPerson build() throws HqdmException { if (this.stateOfPerson.hasValue(AGGREGATED_INTO) - && this.stateOfPerson.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfPerson.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfPerson.hasValue(BEGINNING) - && this.stateOfPerson.value(BEGINNING).isEmpty()) { + && this.stateOfPerson.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfPerson.hasValue(ENDING) - && this.stateOfPerson.value(ENDING).isEmpty()) { + && this.stateOfPerson.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfPerson.hasValue(MEMBER__OF) - && this.stateOfPerson.value(MEMBER__OF).isEmpty()) { + && this.stateOfPerson.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfPerson.hasValue(MEMBER_OF) - && this.stateOfPerson.value(MEMBER_OF).isEmpty()) { + && this.stateOfPerson.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfPerson.hasValue(PART__OF) - && this.stateOfPerson.value(PART__OF).isEmpty()) { + && this.stateOfPerson.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfPerson.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfPerson.hasValue(TEMPORAL__PART_OF) - && this.stateOfPerson.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfPerson.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfPerson.hasValue(TEMPORAL_PART_OF) - && this.stateOfPerson.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfPerson.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfPerson; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java index f00365f4..7764c06e 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java @@ -201,38 +201,38 @@ public final StateOfPhysicalObjectBuilder temporal_Part_Of(final PhysicalObject */ public StateOfPhysicalObject build() throws HqdmException { if (this.stateOfPhysicalObject.hasValue(AGGREGATED_INTO) - && this.stateOfPhysicalObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfPhysicalObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfPhysicalObject.hasValue(BEGINNING) - && this.stateOfPhysicalObject.value(BEGINNING).isEmpty()) { + && this.stateOfPhysicalObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfPhysicalObject.hasValue(ENDING) - && this.stateOfPhysicalObject.value(ENDING).isEmpty()) { + && this.stateOfPhysicalObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfPhysicalObject.hasValue(MEMBER__OF) - && this.stateOfPhysicalObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfPhysicalObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfPhysicalObject.hasValue(MEMBER_OF) - && this.stateOfPhysicalObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfPhysicalObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfPhysicalObject.hasValue(PART__OF) - && this.stateOfPhysicalObject.value(PART__OF).isEmpty()) { + && this.stateOfPhysicalObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfPhysicalObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfPhysicalObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfPhysicalObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfPhysicalObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfPhysicalObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfPhysicalObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfPhysicalObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfPhysicalObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java index 16546204..a534e662 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java @@ -199,38 +199,38 @@ public final StateOfPositionBuilder temporal_Part_Of(final Position position) { */ public StateOfPosition build() throws HqdmException { if (this.stateOfPosition.hasValue(AGGREGATED_INTO) - && this.stateOfPosition.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfPosition.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfPosition.hasValue(BEGINNING) - && this.stateOfPosition.value(BEGINNING).isEmpty()) { + && this.stateOfPosition.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfPosition.hasValue(ENDING) - && this.stateOfPosition.value(ENDING).isEmpty()) { + && this.stateOfPosition.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfPosition.hasValue(MEMBER__OF) - && this.stateOfPosition.value(MEMBER__OF).isEmpty()) { + && this.stateOfPosition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfPosition.hasValue(MEMBER_OF) - && this.stateOfPosition.value(MEMBER_OF).isEmpty()) { + && this.stateOfPosition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfPosition.hasValue(PART__OF) - && this.stateOfPosition.value(PART__OF).isEmpty()) { + && this.stateOfPosition.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfPosition.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfPosition.hasValue(TEMPORAL__PART_OF) - && this.stateOfPosition.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfPosition.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfPosition.hasValue(TEMPORAL_PART_OF) - && this.stateOfPosition.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfPosition.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfPosition; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java index c0d37c59..2efa7c37 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java @@ -207,38 +207,38 @@ public final StateOfSalesProductInstanceBuilder temporal_Part_Of(final SalesProd */ public StateOfSalesProductInstance build() throws HqdmException { if (this.stateOfSalesProductInstance.hasValue(AGGREGATED_INTO) - && this.stateOfSalesProductInstance.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSalesProductInstance.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSalesProductInstance.hasValue(BEGINNING) - && this.stateOfSalesProductInstance.value(BEGINNING).isEmpty()) { + && this.stateOfSalesProductInstance.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSalesProductInstance.hasValue(ENDING) - && this.stateOfSalesProductInstance.value(ENDING).isEmpty()) { + && this.stateOfSalesProductInstance.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSalesProductInstance.hasValue(MEMBER__OF) - && this.stateOfSalesProductInstance.value(MEMBER__OF).isEmpty()) { + && this.stateOfSalesProductInstance.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSalesProductInstance.hasValue(MEMBER_OF) - && this.stateOfSalesProductInstance.value(MEMBER_OF).isEmpty()) { + && this.stateOfSalesProductInstance.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSalesProductInstance.hasValue(PART__OF) - && this.stateOfSalesProductInstance.value(PART__OF).isEmpty()) { + && this.stateOfSalesProductInstance.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSalesProductInstance.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSalesProductInstance.hasValue(TEMPORAL__PART_OF) - && this.stateOfSalesProductInstance.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSalesProductInstance.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSalesProductInstance.hasValue(TEMPORAL_PART_OF) - && this.stateOfSalesProductInstance.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSalesProductInstance.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSalesProductInstance; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java index 326cfd06..d124029c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java @@ -198,38 +198,38 @@ public final StateOfSignBuilder temporal_Part_Of(final Sign sign) { */ public StateOfSign build() throws HqdmException { if (this.stateOfSign.hasValue(AGGREGATED_INTO) - && this.stateOfSign.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSign.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSign.hasValue(BEGINNING) - && this.stateOfSign.value(BEGINNING).isEmpty()) { + && this.stateOfSign.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSign.hasValue(ENDING) - && this.stateOfSign.value(ENDING).isEmpty()) { + && this.stateOfSign.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSign.hasValue(MEMBER__OF) - && this.stateOfSign.value(MEMBER__OF).isEmpty()) { + && this.stateOfSign.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSign.hasValue(MEMBER_OF) - && this.stateOfSign.value(MEMBER_OF).isEmpty()) { + && this.stateOfSign.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSign.hasValue(PART__OF) - && this.stateOfSign.value(PART__OF).isEmpty()) { + && this.stateOfSign.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSign.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSign.hasValue(TEMPORAL__PART_OF) - && this.stateOfSign.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSign.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSign.hasValue(TEMPORAL_PART_OF) - && this.stateOfSign.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSign.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSign; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java index 88605de0..8beb9615 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java @@ -216,38 +216,38 @@ public final StateOfSociallyConstructedActivityBuilder temporal_Part_Of( */ public StateOfSociallyConstructedActivity build() throws HqdmException { if (this.stateOfSociallyConstructedActivity.hasValue(AGGREGATED_INTO) - && this.stateOfSociallyConstructedActivity.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSociallyConstructedActivity.hasValue(BEGINNING) - && this.stateOfSociallyConstructedActivity.value(BEGINNING).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSociallyConstructedActivity.hasValue(ENDING) - && this.stateOfSociallyConstructedActivity.value(ENDING).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSociallyConstructedActivity.hasValue(MEMBER__OF) - && this.stateOfSociallyConstructedActivity.value(MEMBER__OF).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSociallyConstructedActivity.hasValue(MEMBER_OF) - && this.stateOfSociallyConstructedActivity.value(MEMBER_OF).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSociallyConstructedActivity.hasValue(PART__OF) - && this.stateOfSociallyConstructedActivity.value(PART__OF).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSociallyConstructedActivity.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSociallyConstructedActivity.hasValue(TEMPORAL__PART_OF) - && this.stateOfSociallyConstructedActivity.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSociallyConstructedActivity.hasValue(TEMPORAL_PART_OF) - && this.stateOfSociallyConstructedActivity.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSociallyConstructedActivity.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSociallyConstructedActivity; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java index f8c7b84b..27d5a47d 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java @@ -214,38 +214,38 @@ public final StateOfSociallyConstructedObjectBuilder temporal_Part_Of( */ public StateOfSociallyConstructedObject build() throws HqdmException { if (this.stateOfSociallyConstructedObject.hasValue(AGGREGATED_INTO) - && this.stateOfSociallyConstructedObject.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSociallyConstructedObject.hasValue(BEGINNING) - && this.stateOfSociallyConstructedObject.value(BEGINNING).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSociallyConstructedObject.hasValue(ENDING) - && this.stateOfSociallyConstructedObject.value(ENDING).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSociallyConstructedObject.hasValue(MEMBER__OF) - && this.stateOfSociallyConstructedObject.value(MEMBER__OF).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSociallyConstructedObject.hasValue(MEMBER_OF) - && this.stateOfSociallyConstructedObject.value(MEMBER_OF).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSociallyConstructedObject.hasValue(PART__OF) - && this.stateOfSociallyConstructedObject.value(PART__OF).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSociallyConstructedObject.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSociallyConstructedObject.hasValue(TEMPORAL__PART_OF) - && this.stateOfSociallyConstructedObject.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSociallyConstructedObject.hasValue(TEMPORAL_PART_OF) - && this.stateOfSociallyConstructedObject.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSociallyConstructedObject.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSociallyConstructedObject; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java index 306711cf..3428acef 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java @@ -198,38 +198,38 @@ public final StateOfSystemBuilder temporal_Part_Of(final System system) { */ public StateOfSystem build() throws HqdmException { if (this.stateOfSystem.hasValue(AGGREGATED_INTO) - && this.stateOfSystem.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSystem.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSystem.hasValue(BEGINNING) - && this.stateOfSystem.value(BEGINNING).isEmpty()) { + && this.stateOfSystem.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSystem.hasValue(ENDING) - && this.stateOfSystem.value(ENDING).isEmpty()) { + && this.stateOfSystem.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSystem.hasValue(MEMBER__OF) - && this.stateOfSystem.value(MEMBER__OF).isEmpty()) { + && this.stateOfSystem.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSystem.hasValue(MEMBER_OF) - && this.stateOfSystem.value(MEMBER_OF).isEmpty()) { + && this.stateOfSystem.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSystem.hasValue(PART__OF) - && this.stateOfSystem.value(PART__OF).isEmpty()) { + && this.stateOfSystem.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSystem.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSystem.hasValue(TEMPORAL__PART_OF) - && this.stateOfSystem.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSystem.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSystem.hasValue(TEMPORAL_PART_OF) - && this.stateOfSystem.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSystem.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSystem; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java index 63816120..69eb6b17 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java @@ -201,38 +201,38 @@ public final StateOfSystemComponentBuilder temporal_Part_Of(final SystemComponen */ public StateOfSystemComponent build() throws HqdmException { if (this.stateOfSystemComponent.hasValue(AGGREGATED_INTO) - && this.stateOfSystemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.stateOfSystemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.stateOfSystemComponent.hasValue(BEGINNING) - && this.stateOfSystemComponent.value(BEGINNING).isEmpty()) { + && this.stateOfSystemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.stateOfSystemComponent.hasValue(ENDING) - && this.stateOfSystemComponent.value(ENDING).isEmpty()) { + && this.stateOfSystemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.stateOfSystemComponent.hasValue(MEMBER__OF) - && this.stateOfSystemComponent.value(MEMBER__OF).isEmpty()) { + && this.stateOfSystemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.stateOfSystemComponent.hasValue(MEMBER_OF) - && this.stateOfSystemComponent.value(MEMBER_OF).isEmpty()) { + && this.stateOfSystemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.stateOfSystemComponent.hasValue(PART__OF) - && this.stateOfSystemComponent.value(PART__OF).isEmpty()) { + && this.stateOfSystemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.stateOfSystemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.stateOfSystemComponent.hasValue(TEMPORAL__PART_OF) - && this.stateOfSystemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.stateOfSystemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.stateOfSystemComponent.hasValue(TEMPORAL_PART_OF) - && this.stateOfSystemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.stateOfSystemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return stateOfSystemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java index 5f8a2954..db8dbcd0 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java @@ -212,42 +212,42 @@ public final SystemBuilder temporal_Part_Of(final System system) { */ public System build() throws HqdmException { if (this.system.hasValue(AGGREGATED_INTO) - && this.system.value(AGGREGATED_INTO).isEmpty()) { + && this.system.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.system.hasValue(BEGINNING) - && this.system.value(BEGINNING).isEmpty()) { + && this.system.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.system.hasValue(ENDING) - && this.system.value(ENDING).isEmpty()) { + && this.system.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.system.hasValue(MEMBER__OF) - && this.system.value(MEMBER__OF).isEmpty()) { + && this.system.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.system.hasValue(MEMBER_OF) - && this.system.value(MEMBER_OF).isEmpty()) { + && this.system.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.system.hasValue(MEMBER_OF_KIND) - && this.system.value(MEMBER_OF_KIND).isEmpty()) { + && this.system.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.system.hasValue(PART__OF) - && this.system.value(PART__OF).isEmpty()) { + && this.system.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.system.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.system.hasValue(TEMPORAL__PART_OF) - && this.system.value(TEMPORAL__PART_OF).isEmpty()) { + && this.system.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.system.hasValue(TEMPORAL_PART_OF) - && this.system.value(TEMPORAL_PART_OF).isEmpty()) { + && this.system.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return system; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java index 2296db21..1aca040b 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java @@ -239,45 +239,45 @@ public final SystemComponentBuilder temporal_Part_Of(final Individual individual */ public SystemComponent build() throws HqdmException { if (this.systemComponent.hasValue(AGGREGATED_INTO) - && this.systemComponent.value(AGGREGATED_INTO).isEmpty()) { + && this.systemComponent.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.systemComponent.hasValue(BEGINNING) - && this.systemComponent.value(BEGINNING).isEmpty()) { + && this.systemComponent.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.systemComponent.hasValue(COMPONENT_OF)) { throw new HqdmException("Property Not Set: component_of"); } if (this.systemComponent.hasValue(ENDING) - && this.systemComponent.value(ENDING).isEmpty()) { + && this.systemComponent.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.systemComponent.hasValue(MEMBER__OF) - && this.systemComponent.value(MEMBER__OF).isEmpty()) { + && this.systemComponent.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.systemComponent.hasValue(MEMBER_OF) - && this.systemComponent.value(MEMBER_OF).isEmpty()) { + && this.systemComponent.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (this.systemComponent.hasValue(MEMBER_OF_KIND) - && this.systemComponent.value(MEMBER_OF_KIND).isEmpty()) { + && this.systemComponent.values(MEMBER_OF_KIND).isEmpty()) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.systemComponent.hasValue(PART__OF) - && this.systemComponent.value(PART__OF).isEmpty()) { + && this.systemComponent.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.systemComponent.hasValue(PART_OF_POSSIBLE_WORLD)) { throw new HqdmException("Property Not Set: part_of_possible_world"); } if (this.systemComponent.hasValue(TEMPORAL__PART_OF) - && this.systemComponent.value(TEMPORAL__PART_OF).isEmpty()) { + && this.systemComponent.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.systemComponent.hasValue(TEMPORAL_PART_OF) - && this.systemComponent.value(TEMPORAL_PART_OF).isEmpty()) { + && this.systemComponent.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return systemComponent; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TemporalCompositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TemporalCompositionBuilder.java index 8ef3db41..21743f51 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TemporalCompositionBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TemporalCompositionBuilder.java @@ -100,11 +100,11 @@ public final TemporalCompositionBuilder whole_M(final SpatioTemporalExtent spati */ public TemporalComposition build() throws HqdmException { if (this.temporalComposition.hasValue(MEMBER__OF) - && this.temporalComposition.value(MEMBER__OF).isEmpty()) { + && this.temporalComposition.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.temporalComposition.hasValue(MEMBER_OF) - && this.temporalComposition.value(MEMBER_OF).isEmpty()) { + && this.temporalComposition.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.temporalComposition.hasValue(PART)) { diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ThingBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ThingBuilder.java index 5537e253..6d5e249f 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ThingBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ThingBuilder.java @@ -57,7 +57,7 @@ public final ThingBuilder member__Of(final Class clazz) { */ public Thing build() throws HqdmException { if (this.thing.hasValue(MEMBER__OF) - && this.thing.value(MEMBER__OF).isEmpty()) { + && this.thing.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } return thing; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java index 5f48b9b4..baf4ce93 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java @@ -372,11 +372,11 @@ public final TransferOfOwnershipBuilder temporal_Part_Of(final Individual indivi */ public TransferOfOwnership build() throws HqdmException { if (this.transferOfOwnership.hasValue(AGGREGATED_INTO) - && this.transferOfOwnership.value(AGGREGATED_INTO).isEmpty()) { + && this.transferOfOwnership.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.transferOfOwnership.hasValue(BEGINNING) - && this.transferOfOwnership.value(BEGINNING).isEmpty()) { + && this.transferOfOwnership.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.transferOfOwnership.hasValue(CAUSES)) { @@ -389,34 +389,34 @@ public TransferOfOwnership build() throws HqdmException { throw new HqdmException("Property Not Set: causes_ending"); } if (this.transferOfOwnership.hasValue(DETERMINES) - && this.transferOfOwnership.value(DETERMINES).isEmpty()) { + && this.transferOfOwnership.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.transferOfOwnership.hasValue(ENDING) - && this.transferOfOwnership.value(ENDING).isEmpty()) { + && this.transferOfOwnership.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.transferOfOwnership.hasValue(MEMBER__OF) - && this.transferOfOwnership.value(MEMBER__OF).isEmpty()) { + && this.transferOfOwnership.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.transferOfOwnership.hasValue(MEMBER_OF) - && this.transferOfOwnership.value(MEMBER_OF).isEmpty()) { + && this.transferOfOwnership.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.transferOfOwnership.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.transferOfOwnership.hasValue(PART__OF) - && this.transferOfOwnership.value(PART__OF).isEmpty()) { + && this.transferOfOwnership.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.transferOfOwnership.hasValue(PART_OF) - && this.transferOfOwnership.value(PART_OF).isEmpty()) { + && this.transferOfOwnership.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.transferOfOwnership.hasValue(PART_OF_) - && this.transferOfOwnership.value(PART_OF_).isEmpty()) { + && this.transferOfOwnership.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.transferOfOwnership.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -426,11 +426,11 @@ public TransferOfOwnership build() throws HqdmException { throw new HqdmException("Property Not Set: references"); } if (this.transferOfOwnership.hasValue(TEMPORAL__PART_OF) - && this.transferOfOwnership.value(TEMPORAL__PART_OF).isEmpty()) { + && this.transferOfOwnership.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.transferOfOwnership.hasValue(TEMPORAL_PART_OF) - && this.transferOfOwnership.value(TEMPORAL_PART_OF).isEmpty()) { + && this.transferOfOwnership.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return transferOfOwnership; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java index e32c2d42..eb4f86f8 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java @@ -378,11 +378,11 @@ public final TransferOfOwnershipOfMoneyBuilder temporal_Part_Of(final Individual */ public TransferOfOwnershipOfMoney build() throws HqdmException { if (this.transferOfOwnershipOfMoney.hasValue(AGGREGATED_INTO) - && this.transferOfOwnershipOfMoney.value(AGGREGATED_INTO).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.transferOfOwnershipOfMoney.hasValue(BEGINNING) - && this.transferOfOwnershipOfMoney.value(BEGINNING).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (!this.transferOfOwnershipOfMoney.hasValue(CAUSES)) { @@ -395,34 +395,34 @@ public TransferOfOwnershipOfMoney build() throws HqdmException { throw new HqdmException("Property Not Set: causes_ending"); } if (this.transferOfOwnershipOfMoney.hasValue(DETERMINES) - && this.transferOfOwnershipOfMoney.value(DETERMINES).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(DETERMINES).isEmpty()) { throw new HqdmException("Property Not Set: determines"); } if (this.transferOfOwnershipOfMoney.hasValue(ENDING) - && this.transferOfOwnershipOfMoney.value(ENDING).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.transferOfOwnershipOfMoney.hasValue(MEMBER__OF) - && this.transferOfOwnershipOfMoney.value(MEMBER__OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.transferOfOwnershipOfMoney.hasValue(MEMBER_OF) - && this.transferOfOwnershipOfMoney.value(MEMBER_OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.transferOfOwnershipOfMoney.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.transferOfOwnershipOfMoney.hasValue(PART__OF) - && this.transferOfOwnershipOfMoney.value(PART__OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (this.transferOfOwnershipOfMoney.hasValue(PART_OF) - && this.transferOfOwnershipOfMoney.value(PART_OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: part_of"); } if (this.transferOfOwnershipOfMoney.hasValue(PART_OF_) - && this.transferOfOwnershipOfMoney.value(PART_OF_).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(PART_OF_).isEmpty()) { throw new HqdmException("Property Not Set: part_of_"); } if (!this.transferOfOwnershipOfMoney.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -432,11 +432,11 @@ public TransferOfOwnershipOfMoney build() throws HqdmException { throw new HqdmException("Property Not Set: references"); } if (this.transferOfOwnershipOfMoney.hasValue(TEMPORAL__PART_OF) - && this.transferOfOwnershipOfMoney.value(TEMPORAL__PART_OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.transferOfOwnershipOfMoney.hasValue(TEMPORAL_PART_OF) - && this.transferOfOwnershipOfMoney.value(TEMPORAL_PART_OF).isEmpty()) { + && this.transferOfOwnershipOfMoney.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return transferOfOwnershipOfMoney; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java index b6960c81..91678576 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java @@ -229,30 +229,30 @@ public final TransfereeBuilder temporal_Part_Of(final Party party) { */ public Transferee build() throws HqdmException { if (this.transferee.hasValue(AGGREGATED_INTO) - && this.transferee.value(AGGREGATED_INTO).isEmpty()) { + && this.transferee.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.transferee.hasValue(BEGINNING) - && this.transferee.value(BEGINNING).isEmpty()) { + && this.transferee.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.transferee.hasValue(ENDING) - && this.transferee.value(ENDING).isEmpty()) { + && this.transferee.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.transferee.hasValue(MEMBER__OF) - && this.transferee.value(MEMBER__OF).isEmpty()) { + && this.transferee.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.transferee.hasValue(MEMBER_OF) - && this.transferee.value(MEMBER_OF).isEmpty()) { + && this.transferee.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.transferee.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.transferee.hasValue(PART__OF) - && this.transferee.value(PART__OF).isEmpty()) { + && this.transferee.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.transferee.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -262,11 +262,11 @@ public Transferee build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.transferee.hasValue(TEMPORAL__PART_OF) - && this.transferee.value(TEMPORAL__PART_OF).isEmpty()) { + && this.transferee.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.transferee.hasValue(TEMPORAL_PART_OF) - && this.transferee.value(TEMPORAL_PART_OF).isEmpty()) { + && this.transferee.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return transferee; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java index 20fd43bf..450cc232 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java @@ -229,30 +229,30 @@ public final TransferorBuilder temporal_Part_Of(final Owner owner) { */ public Transferor build() throws HqdmException { if (this.transferor.hasValue(AGGREGATED_INTO) - && this.transferor.value(AGGREGATED_INTO).isEmpty()) { + && this.transferor.values(AGGREGATED_INTO).isEmpty()) { throw new HqdmException("Property Not Set: aggregated_into"); } if (this.transferor.hasValue(BEGINNING) - && this.transferor.value(BEGINNING).isEmpty()) { + && this.transferor.values(BEGINNING).isEmpty()) { throw new HqdmException("Property Not Set: beginning"); } if (this.transferor.hasValue(ENDING) - && this.transferor.value(ENDING).isEmpty()) { + && this.transferor.values(ENDING).isEmpty()) { throw new HqdmException("Property Not Set: ending"); } if (this.transferor.hasValue(MEMBER__OF) - && this.transferor.value(MEMBER__OF).isEmpty()) { + && this.transferor.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.transferor.hasValue(MEMBER_OF) - && this.transferor.value(MEMBER_OF).isEmpty()) { + && this.transferor.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } if (!this.transferor.hasValue(MEMBER_OF_KIND)) { throw new HqdmException("Property Not Set: member_of_kind"); } if (this.transferor.hasValue(PART__OF) - && this.transferor.value(PART__OF).isEmpty()) { + && this.transferor.values(PART__OF).isEmpty()) { throw new HqdmException("Property Not Set: part__of"); } if (!this.transferor.hasValue(PART_OF_POSSIBLE_WORLD)) { @@ -262,11 +262,11 @@ public Transferor build() throws HqdmException { throw new HqdmException("Property Not Set: participant_in"); } if (this.transferor.hasValue(TEMPORAL__PART_OF) - && this.transferor.value(TEMPORAL__PART_OF).isEmpty()) { + && this.transferor.values(TEMPORAL__PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal__part_of"); } if (this.transferor.hasValue(TEMPORAL_PART_OF) - && this.transferor.value(TEMPORAL_PART_OF).isEmpty()) { + && this.transferor.values(TEMPORAL_PART_OF).isEmpty()) { throw new HqdmException("Property Not Set: temporal_part_of"); } return transferor; diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/UnitOfMeasureBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/UnitOfMeasureBuilder.java index 17b11aa9..2dddbd1c 100644 --- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/UnitOfMeasureBuilder.java +++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/UnitOfMeasureBuilder.java @@ -73,11 +73,11 @@ public final UnitOfMeasureBuilder member_Of(final ClassOfRelationship classOfRel */ public UnitOfMeasure build() throws HqdmException { if (this.unitOfMeasure.hasValue(MEMBER__OF) - && this.unitOfMeasure.value(MEMBER__OF).isEmpty()) { + && this.unitOfMeasure.values(MEMBER__OF).isEmpty()) { throw new HqdmException("Property Not Set: member__of"); } if (this.unitOfMeasure.hasValue(MEMBER_OF) - && this.unitOfMeasure.value(MEMBER_OF).isEmpty()) { + && this.unitOfMeasure.values(MEMBER_OF).isEmpty()) { throw new HqdmException("Property Not Set: member_of"); } return unitOfMeasure; diff --git a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/HqdmObject.java b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/HqdmObject.java index d6b6516a..f7af6ffd 100755 --- a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/HqdmObject.java +++ b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/HqdmObject.java @@ -87,8 +87,19 @@ public void setPredicates(final Map> predicates) { /** * {@inheritDoc} */ - public Set value(final IRI predicateId) { - return predicates.get(predicateId); + public Set values(final IRI predicateId) { + return (Set) predicates.get(predicateId); + } + + /** + * {@inheritDoc} + */ + public T oneValue(final IRI predicateId) { + final Set predicateValues = (Set) predicates.get(predicateId); + if (predicateValues != null && !predicateValues.isEmpty()) { + return predicateValues.iterator().next(); + } + return null; } /** diff --git a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/Top.java b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/Top.java index ad9a6163..bf5e5d38 100755 --- a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/Top.java +++ b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/pojo/Top.java @@ -55,10 +55,18 @@ public interface Top { /** * Get predicate value(s) by predicate Object. * - * @param predicateIri Predicate IRI. + * @param predicateIri Predicate {@link IRI} * @return Set of predicate values (Object or string-literals). */ - Set value(IRI predicateIri); + Set values(IRI predicateIri); + + /** + * Get predicate value(s) by predicate Object. + * + * @param predicateIri Predicate {@link IRI} + * @return A single value of type T or null (Object or string-literals). + */ + T oneValue(IRI predicateIri); /** * Add predicate and object String reference to entity.