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.

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

Setting up travis and sonar #2

Merged
merged 4 commits into from
Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 31 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@ buildscript {
}

apply plugin: 'org.sonarqube'
apply plugin: 'jacoco'

subprojects {
// def allTestCoverageFile = "$buildDir/jacoco/allTestCoverage.exec"
allprojects {
apply plugin: 'java-library'
apply plugin: 'io.franzbecker.gradle-lombok'

apply plugin: 'jacoco'

lombok {
version = '1.18.4'
sha256 = ""
}

jacoco {
toolVersion = "0.8.2"
}

// build fails for java 11, let's wait for a newer lombok version
sourceCompatibility = 1.10
targetCompatibility = 1.10
Expand All @@ -33,7 +37,6 @@ subprojects {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.11.1'
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.23.0'
}

repositories {
Expand All @@ -45,14 +48,31 @@ subprojects {
showStandardStreams = true
}

useJUnitPlatform()
systemProperty 'java.util.logging.config.file', 'src/test/resources/logging.properties'
}
}

sonarqube {
properties {
property "sonar.host.url", "https://sonarcloud.io"
property "sonar.projectName", "Dedupe"
property "sonar.projectKey", "bakdata-dedupe"
sonarqube {
properties {
property "sonar.projectName", "Dedupe"
property "sonar.projectKey", "bakdata-dedupe"
property "sonar.jacoco.reportPaths", jacocoMerge.destinationFile
}
}
}

jacocoTestReport.dependsOn(test)
}

task jacocoMerge(type: JacocoMerge) {
dependsOn subprojects.jacocoTestReport

executionData subprojects.test
}

tasks.sonarqube.dependsOn(jacocoMerge)
//jacocoTestReport {
// dependsOn jacocoMerge
// executionData = files(jacocoMerge.destinationFile)
// sourceDirectories = files(subprojects.sourceSets.main.java.sourceDirectories)
// classDirectories = files(subprojects.sourceSets.main.output)
//}
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
@AllArgsConstructor
@Builder(toBuilder = true)
public class Person {
String id;
String firstName;
String lastName;
LocalDate birthDate;
Gender gender;
private String id;
private String firstName;
private String lastName;
private LocalDate birthDate;
private Gender gender;
// lineage
String source;
String originalId;
LocalDateTime lastModified;
private String source;
private String originalId;
private LocalDateTime lastModified;
// fusion information
@Builder.Default
Set<String> fusedIds = new HashSet<>();
private Set<String> fusedIds = new HashSet<>();
}

Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public class PersonFusion implements Fusion<Person> {

private static Set<String> fusionIdWithPersonId(Person p) {
if (p.getFusedIds().isEmpty()) {
return Set.of(p.id);
return Set.of(p.getId());
}
return p.fusedIds;
return p.getFusedIds();
}
}
4 changes: 4 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[![Build status](https://travis-ci.org/bakdata/dedupe.svg?branch=master)](https://travis-ci.org/bakdata/dedupe/)
[![Sonarcloud status](https://sonarcloud.io/api/project_badges/measure?project=bakdata-dedupe&metric=alert_status)](https://sonarcloud.io/dashboard?id=bakdata-dedupe)
[![Code coverage](https://sonarcloud.io/api/project_badges/measure?project=bakdata-dedupe&metric=coverage)](https://sonarcloud.io/dashboard?id=bakdata-dedupe)

Java DSL for (online) deduplication
===================================

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rootProject.name = 'dedup'
rootProject.name = 'dedupe'

include 'core', 'common', 'examples'