-
Notifications
You must be signed in to change notification settings - Fork 327
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve references and descendants for subclasses (#377)
Fixes: #356. Co-authored-by: Mike Eltsufin <meltsufin@google.com>
- Loading branch information
Showing
6 changed files
with
290 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
...pring/data/datastore/it/subclasses/descendants/SubclassesDescendantsIntegrationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Copyright 2017-2018 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spring.data.datastore.it.subclasses.descendants; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import com.google.cloud.datastore.Key; | ||
| import com.google.cloud.spring.data.datastore.core.DatastoreTemplate; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.Descendants; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.DiscriminatorField; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.DiscriminatorValue; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.Entity; | ||
| import com.google.cloud.spring.data.datastore.it.AbstractDatastoreIntegrationTests; | ||
| import com.google.cloud.spring.data.datastore.it.DatastoreIntegrationTestConfiguration; | ||
| import com.google.cloud.spring.data.datastore.repository.DatastoreRepository; | ||
| import org.junit.After; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.data.annotation.Id; | ||
| import org.springframework.stereotype.Repository; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.Assume.assumeThat; | ||
|
|
||
| @Repository | ||
| interface SubclassesDescendantsEntityARepository extends DatastoreRepository<EntityA, Key> { | ||
| } | ||
|
|
||
| @RunWith(SpringRunner.class) | ||
| @ContextConfiguration(classes = { DatastoreIntegrationTestConfiguration.class }) | ||
| public class SubclassesDescendantsIntegrationTests extends AbstractDatastoreIntegrationTests { | ||
|
|
||
| @Autowired | ||
| SubclassesDescendantsEntityARepository entityARepository; | ||
|
|
||
| @Autowired | ||
| private DatastoreTemplate datastoreTemplate; | ||
|
|
||
| @BeforeClass | ||
| public static void checkToRun() { | ||
| assumeThat( | ||
| "Datastore integration tests are disabled. Please use '-Dit.datastore=true' " | ||
| + "to enable them. ", | ||
| System.getProperty("it.datastore"), is("true")); | ||
| } | ||
|
|
||
| @After | ||
| public void deleteAll() { | ||
| datastoreTemplate.deleteAll(EntityA.class); | ||
| datastoreTemplate.deleteAll(EntityB.class); | ||
| datastoreTemplate.deleteAll(EntityC.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEntityCContainsReferenceToEntityB() { | ||
| EntityB entityB_1 = new EntityB(); | ||
| EntityC entityC_1 = new EntityC(); | ||
| entityB_1.addEntityC(entityC_1); | ||
| entityARepository.saveAll(Arrays.asList(entityB_1, entityC_1)); | ||
| EntityB fetchedB = (EntityB) entityARepository.findById(entityB_1.getId()).get(); | ||
| List<EntityC> entitiesCOfB = fetchedB.getEntitiesC(); | ||
| assertThat(entitiesCOfB).hasSize(1); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorField(field = "type") | ||
| abstract class EntityA { | ||
| @Id | ||
| private Key id; | ||
|
|
||
| public Key getId() { | ||
| return id; | ||
| } | ||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorValue("B") | ||
| class EntityB extends EntityA { | ||
| @Descendants | ||
| private List<EntityC> entitiesC = new ArrayList<>(); | ||
|
|
||
| public void addEntityC(EntityC entityCDescendants) { | ||
| this.entitiesC.add(entityCDescendants); | ||
| } | ||
|
|
||
| public List<EntityC> getEntitiesC() { | ||
| return entitiesC; | ||
| } | ||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorValue("C") | ||
| class EntityC extends EntityA { | ||
| } |
114 changes: 114 additions & 0 deletions
114
.../spring/data/datastore/it/subclasses/references/SubclassesReferencesIntegrationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright 2017-2018 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spring.data.datastore.it.subclasses.references; | ||
|
|
||
| import java.util.Arrays; | ||
|
|
||
| import com.google.cloud.datastore.Key; | ||
| import com.google.cloud.spring.data.datastore.core.DatastoreTemplate; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.DiscriminatorField; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.DiscriminatorValue; | ||
| import com.google.cloud.spring.data.datastore.core.mapping.Entity; | ||
| import com.google.cloud.spring.data.datastore.it.AbstractDatastoreIntegrationTests; | ||
| import com.google.cloud.spring.data.datastore.it.DatastoreIntegrationTestConfiguration; | ||
| import com.google.cloud.spring.data.datastore.repository.DatastoreRepository; | ||
| import org.junit.After; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.data.annotation.Id; | ||
| import org.springframework.data.annotation.Reference; | ||
| import org.springframework.stereotype.Repository; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.Assume.assumeThat; | ||
|
|
||
| @Repository | ||
| interface SubclassesReferencesEntityARepository extends DatastoreRepository<EntityA, Key> { | ||
| } | ||
|
|
||
| @RunWith(SpringRunner.class) | ||
| @ContextConfiguration(classes = { DatastoreIntegrationTestConfiguration.class }) | ||
| public class SubclassesReferencesIntegrationTests extends AbstractDatastoreIntegrationTests { | ||
|
|
||
| @Autowired | ||
| SubclassesReferencesEntityARepository entityARepository; | ||
|
|
||
| @Autowired | ||
| private DatastoreTemplate datastoreTemplate; | ||
|
|
||
| @BeforeClass | ||
| public static void checkToRun() { | ||
| assumeThat( | ||
| "Datastore integration tests are disabled. Please use '-Dit.datastore=true' " | ||
| + "to enable them. ", | ||
| System.getProperty("it.datastore"), is("true")); | ||
| } | ||
|
|
||
| @After | ||
| public void deleteAll() { | ||
| datastoreTemplate.deleteAll(EntityA.class); | ||
| datastoreTemplate.deleteAll(EntityB.class); | ||
| datastoreTemplate.deleteAll(EntityC.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEntityCContainsReferenceToEntityB() { | ||
| EntityB entityB_1 = new EntityB(); | ||
| EntityC entityC_1 = new EntityC(entityB_1); | ||
| entityARepository.saveAll(Arrays.asList(entityB_1, entityC_1)); | ||
| EntityC fetchedC = (EntityC) entityARepository.findById(entityC_1.getId()).get(); | ||
| assertThat(fetchedC.getEntityB()).isNotNull(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorField(field = "type") | ||
| abstract class EntityA { | ||
| @Id | ||
| private Key id; | ||
|
|
||
| public Key getId() { | ||
| return id; | ||
| } | ||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorValue("B") | ||
| class EntityB extends EntityA { | ||
| } | ||
|
|
||
| @Entity(name = "A") | ||
| @DiscriminatorValue("C") | ||
| class EntityC extends EntityA { | ||
| @Reference | ||
| private EntityB entityB; | ||
|
|
||
| EntityC(EntityB entityB) { | ||
| this.entityB = entityB; | ||
| } | ||
|
|
||
| public EntityB getEntityB() { | ||
| return entityB; | ||
| } | ||
| } |