From 9b37615e7de1dd3eb69d312ec2fd68aab0a7df9f Mon Sep 17 00:00:00 2001
From: Daniel Rainer <daniel.m.rainer@student.uibk.ac.at>
Date: Sat, 6 Mar 2021 17:34:39 +0100
Subject: [PATCH] Adjust GitProject to new metadata
---
.../repository/search/MetaDataRepository.java | 21 +++---
.../service/dto/SearchResultsDTO.java | 65 +++++++++++++++++--
2 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java b/src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java
index ea5d8c1e8..c4b7cbd4e 100644
--- a/src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java
+++ b/src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java
@@ -47,8 +47,17 @@ public class MetaDataRepository {
*
*/
public static class SearchResultDTOWrapper {
+ private GitProject project;
private SearchResultDTO metadata = new SearchResultDTO();
+ public GitProject getProject() {
+ return project;
+ }
+
+ public void setProject(GitProject project) {
+ this.project = project;
+ }
+
public SearchResultDTO getMetadata() {
return metadata;
}
@@ -57,16 +66,6 @@ public class MetaDataRepository {
this.metadata = metadata;
}
- private GitProject project;
-
- public GitProject getProject() {
- return project;
- }
-
- public void setProject(GitProject project) {
- this.project = project;
- }
-
}
private final RestHighLevelClient elasticsearchClient;
@@ -325,7 +324,7 @@ public class MetaDataRepository {
SearchResultDTOWrapper entry = objectMapper.readValue(searchHit.getSourceAsString(),
SearchResultDTOWrapper.class);
final SearchResultDTO metadata = entry.getMetadata();
- metadata.setProject(entry.getProject());
+ // metadata.setProject(entry.getProject());
return metadata;
}
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java b/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
index f67de0a5a..c156aabbb 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
@@ -88,6 +88,11 @@ public class SearchResultsDTO {
public static class GitProject {
private int project_id;
+ private String project_name;
+ private String namespace;
+ private String main_group;
+ private String sub_group;
+ private String url;
public int getProject_id() {
return project_id;
@@ -97,7 +102,47 @@ public class SearchResultsDTO {
this.project_id = project_id;
}
- public int getProjectId() {
+ public String getProject_name() {
+ return project_name;
+ }
+
+ public void setProject_name(String project_name) {
+ this.project_name = project_name;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+ public String getMain_group() {
+ return main_group;
+ }
+
+ public void setMain_group(String main_group) {
+ this.main_group = main_group;
+ }
+
+ public String getSub_group() {
+ return sub_group;
+ }
+
+ public void setSub_group(String sub_group) {
+ this.sub_group = sub_group;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public int getProjectId() {
return project_id;
}
@@ -107,10 +152,7 @@ public class SearchResultsDTO {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + project_id;
- return result;
+ return Integer.hashCode(project_id);
}
@Override
@@ -124,7 +166,18 @@ public class SearchResultsDTO {
GitProject other = (GitProject) obj;
return this.project_id == other.project_id;
}
- }
+
+ @Override
+ public String toString() {
+ return "Project: { project_id: " + project_id
+ + ", project_name: " + project_name
+ + ", namespace: " + namespace
+ + ", main_group: " + main_group
+ + ", sub_group: " + sub_group
+ + ", url: " + url
+ + " }";
+ }
+ }
public static class SearchResultDTO {
--
GitLab