Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor bug that prevented the addition of new Language mining targets #331

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Fix minor bug that prevented the addition of new Language mining targets #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e782384
Add `@Builder` to `Language$Statistics`
dabico Mar 25, 2024
4cbcaa4
Cascade operations to `Language$Statistics` and `Language$Progress`
dabico Mar 25, 2024
a4a8508
Fix: incorrect `Language` initialization steps before mining
dabico Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/main/java/ch/usi/si/seart/model/Language.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.hibernate.Hibernate;
import org.hibernate.annotations.Immutable;

import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Expand Down Expand Up @@ -58,14 +59,31 @@ public class Language {
Set<GitRepoMetric> metrics = new HashSet<>();

@PrimaryKeyJoinColumn
@OneToOne(mappedBy = "language")
@OneToOne(
mappedBy = "language",
cascade = {
CascadeType.PERSIST,
CascadeType.MERGE,
CascadeType.REFRESH,
CascadeType.DETACH
}
)
Statistics statistics;

@PrimaryKeyJoinColumn
@OneToOne(mappedBy = "language")
@OneToOne(
mappedBy = "language",
cascade = {
CascadeType.PERSIST,
CascadeType.MERGE,
CascadeType.REFRESH,
CascadeType.DETACH
}
)
Progress progress;

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Entity
Expand All @@ -82,11 +100,13 @@ public static class Statistics {
@JoinColumn(name = "language_id")
Language language;

@Builder.Default
@Column(name = "mined")
Long mined;
Long mined = 0L;

@Builder.Default
@Column(name = "analyzed")
Long analyzed;
Long analyzed = 0L;

@Override
public boolean equals(Object o) {
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/ch/usi/si/seart/service/LanguageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,18 @@ public void afterPropertiesSet() {
),
() -> {
log.debug("Initializing progress for {} to default start date...", name);
languageProgressRepository.save(
Language.Progress.builder()
.id(language.getId())
.language(language)
.checkpoint(defaultCheckpoint)
.build()
);
Language.Progress progress = Language.Progress.builder()
.id(language.getId())
.language(language)
.checkpoint(defaultCheckpoint)
.build();
Language.Statistics statistics = Language.Statistics.builder()
.id(language.getId())
.language(language)
.build();
language.setProgress(progress);
language.setStatistics(statistics);
languageRepository.save(language);
});
}
}
Expand Down