Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-03 06:18:43 +02:00
Code Issues Packages Projects Releases Activity

Allow enrichment of embedded repositories on search hits (#1760)

Browse Source 
* Introduce RepositoryCoordinates

RepositoryCoordinates will be used for the enrichment of the embedded repositories of search result hits. This is required, because if we used the normal repository for the enrichment, we would get a lot of unrelated enrichers would be applied.

* Add builder method to HalEnricherContext

With the new builder method it is possible to add an object to the context with an interface as key.

* Add enricher support for embedded repository by applying enricher for RepositoryCoordinates

* Use embedded repository for avatars
This commit is contained in:
Sebastian Sdorra
2021-08-05 15:12:48 +02:00
committed by GitHub
parent 21a6943980
commit 8ce69d9848
9 changed files with 185 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
scm-webapp/src/test/java/sonia/scm/api/v2/resources/SearchResourceTest.java
View File

@@ -38,6 +38,7 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryCoordinates;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryTestData;
import sonia.scm.search.Hit;
@@ -63,7 +64,6 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -106,7 +106,7 @@ class SearchResourceTest {
JsonMockHttpResponse response = search("Hello");
JsonNode sample = response.getContentAsJson().get("_embedded").get("sample");
assertThat(sample.get("type").asText()).isEqualTo("java.lang.String");
assertThat(sample.get("value").asText()).isEqualTo("java.lang.String");
}
@Test
@@ -122,7 +122,35 @@ class SearchResourceTest {
JsonNode sample = response.getContentAsJson()
.get("_embedded").get("hits").get(0)
.get("_embedded").get("sample");
assertThat(sample.get("type").asText()).isEqualTo("java.lang.String");
assertThat(sample.get("value").asText()).isEqualTo("java.lang.String");
}
@Test
void shouldEnrichRepository() throws UnsupportedEncodingException, URISyntaxException {
when(enricherRegistry.allByType(QueryResult.class))
.thenReturn(Collections.emptySet());
when(enricherRegistry.allByType(Hit.class))
.thenReturn(Collections.singleton(new SampleEnricher()));
when(enricherRegistry.allByType(RepositoryCoordinates.class))
.thenReturn(Collections.singleton(new RepositoryEnricher()));
Repository heartOfGold = RepositoryTestData.createHeartOfGold("hg");
heartOfGold.setId("42");
when(repositoryManager.get("42")).thenReturn(heartOfGold);
Hit hit = new Hit("21", "42", 21f, Collections.emptyMap());
QueryResult result = new QueryResult(1L, String.class, Collections.singletonList(hit));
mockQueryResult("hello", result);
JsonMockHttpResponse response = search("hello");
JsonNode sample = response.getContentAsJson()
.get("_embedded").get("hits").get(0)
.get("_embedded").get("repository")
.get("_embedded").get("sample");
assertThat(sample.get("value").asText()).isEqualTo("42");
}
@Nested
@@ -132,6 +160,7 @@ class SearchResourceTest {
void setUpEnricherRegistry() {
when(enricherRegistry.allByType(QueryResult.class)).thenReturn(Collections.emptySet());
lenient().when(enricherRegistry.allByType(Hit.class)).thenReturn(Collections.emptySet());
lenient().when(enricherRegistry.allByType(RepositoryCoordinates.class)).thenReturn(Collections.emptySet());
}
@Test
@@ -305,7 +334,20 @@ class SearchResourceTest {
@Getter
@Setter
public static class SampleEmbedded extends HalRepresentation {
private Class<?> type;
private String value;
}
private static class RepositoryEnricher implements HalEnricher {
@Override
public void enrich(HalEnricherContext context, HalAppender appender) {
RepositoryCoordinates repositoryCoordinates = context.oneRequireByType(RepositoryCoordinates.class);
SampleEmbedded embedded = new SampleEmbedded();
embedded.setValue(repositoryCoordinates.getId());
appender.appendEmbedded("sample", embedded);
}
}
private static class SampleEnricher implements HalEnricher {
@@ -314,7 +356,7 @@ class SearchResourceTest {
QueryResult result = context.oneRequireByType(QueryResult.class);
SampleEmbedded embedded = new SampleEmbedded();
embedded.setType(result.getType());
embedded.setValue(result.getType().getName());
appender.appendEmbedded("sample", embedded);
}