From 1b72b56fddeba83ed71021e73e72702d3415c58c Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 15 Jan 2020 13:18:53 -0500 Subject: [PATCH] Establishing modules structure --- beacon/beacon-spring/build.gradle | 41 ------------------- beacon/build.gradle | 4 ++ beacon/{beacon-core => core}/build.gradle | 4 ++ .../java/edu/internet2/tap/beacon/Beacon.java | 0 .../internet2/tap/beacon/BeaconPublisher.java | 0 .../tap/beacon/DefaultBeaconPublisher.java | 0 .../beacon/DefaultBeaconPublisherTests.java | 8 ++-- beacon/spring/build.gradle | 29 +++++++++++++ settings.gradle | 2 +- 9 files changed, 43 insertions(+), 45 deletions(-) delete mode 100644 beacon/beacon-spring/build.gradle create mode 100644 beacon/build.gradle rename beacon/{beacon-core => core}/build.gradle (83%) rename beacon/{beacon-core => core}/src/main/java/edu/internet2/tap/beacon/Beacon.java (100%) rename beacon/{beacon-core => core}/src/main/java/edu/internet2/tap/beacon/BeaconPublisher.java (100%) rename beacon/{beacon-core => core}/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java (100%) rename beacon/{beacon-core => core}/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java (51%) create mode 100644 beacon/spring/build.gradle diff --git a/beacon/beacon-spring/build.gradle b/beacon/beacon-spring/build.gradle deleted file mode 100644 index 4b0ba4813..000000000 --- a/beacon/beacon-spring/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -/*plugins { - id 'groovy' - id 'jacoco' - id 'org.springframework.boot' version '2.0.0.RELEASE' apply false - id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'io.franzbecker.gradle-lombok' version '1.13' -}*/ - -apply plugin: 'java' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -repositories { - jcenter() -} - -/*dependencyManagement { - imports { - mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES - } -}*/ - -/*lombok { - version = "1.18.4" - //TODO: get new sha256 - sha256 = "" -}*/ - -/*dependencies { - compileOnly project(':backend') - testCompile project(':backend') - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.spockframework:spock-core:1.1-groovy-2.4" - testCompile "org.spockframework:spock-spring:1.1-groovy-2.4" - //annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" -}*/ - -dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' -} \ No newline at end of file diff --git a/beacon/build.gradle b/beacon/build.gradle new file mode 100644 index 000000000..a0d845ead --- /dev/null +++ b/beacon/build.gradle @@ -0,0 +1,4 @@ +allprojects { + group = 'edu.internet2.tap.beacon' + version = '1.0.0-SNAPSHOT' +} \ No newline at end of file diff --git a/beacon/beacon-core/build.gradle b/beacon/core/build.gradle similarity index 83% rename from beacon/beacon-core/build.gradle rename to beacon/core/build.gradle index 94f9ab994..39cef521f 100644 --- a/beacon/beacon-core/build.gradle +++ b/beacon/core/build.gradle @@ -11,6 +11,10 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.2' } +jar { + archiveName = "beacon-core-${version}.jar" +} + test { useJUnitPlatform() } \ No newline at end of file diff --git a/beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/Beacon.java b/beacon/core/src/main/java/edu/internet2/tap/beacon/Beacon.java similarity index 100% rename from beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/Beacon.java rename to beacon/core/src/main/java/edu/internet2/tap/beacon/Beacon.java diff --git a/beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/BeaconPublisher.java b/beacon/core/src/main/java/edu/internet2/tap/beacon/BeaconPublisher.java similarity index 100% rename from beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/BeaconPublisher.java rename to beacon/core/src/main/java/edu/internet2/tap/beacon/BeaconPublisher.java diff --git a/beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java b/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java similarity index 100% rename from beacon/beacon-core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java rename to beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java diff --git a/beacon/beacon-core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java b/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java similarity index 51% rename from beacon/beacon-core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java rename to beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java index 9cc000625..d4b76f7bb 100644 --- a/beacon/beacon-core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java +++ b/beacon/core/src/test/java/edu/internet2/tap/beacon/DefaultBeaconPublisherTests.java @@ -1,13 +1,15 @@ package edu.internet2.tap.beacon; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class DefaultBeaconPublisherTests { @Test public void checkCorrectInvariantsWithBeaconDataNull() { - Assertions.assertTrue(true); - //new DefaultBeaconPublisher(null); + assertThrows(IllegalArgumentException.class, () -> { + new DefaultBeaconPublisher(null); + }); } } diff --git a/beacon/spring/build.gradle b/beacon/spring/build.gradle new file mode 100644 index 000000000..c527c05f1 --- /dev/null +++ b/beacon/spring/build.gradle @@ -0,0 +1,29 @@ +import org.springframework.boot.gradle.plugin.SpringBootPlugin + +plugins { + id 'groovy' + id 'jacoco' + id 'org.springframework.boot' version '2.0.0.RELEASE' apply false + id 'io.spring.dependency-management' version '1.0.6.RELEASE' + id 'io.franzbecker.gradle-lombok' version '1.13' +} + +repositories { + jcenter() +} + +jar { + archiveName = "beacon-spring-${version}.jar" +} + +dependencyManagement { + imports { + mavenBom SpringBootPlugin.BOM_COORDINATES + } +} + +lombok { + version = "1.18.4" + //TODO: get new sha256 + sha256 = "" +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f71bfae82..1b37654ef 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'backend', 'ui', 'pac4j-module', 'beacon', 'beacon:beacon-core', 'beacon:beacon-spring' +include 'backend', 'ui', 'pac4j-module', 'beacon', 'beacon:core', 'beacon:spring'