diff --git a/build.gradle b/build.gradle index 827f5ed823..9b52b2873a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,27 +16,28 @@ buildscript { repositories { - maven { url "http://repo.spring.io/plugins-release" } + maven { url "http://repo.spring.io/plugins-release" } } dependencies { - classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7', - 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE', - 'com.github.jengelman.gradle.plugins:shadow:1.2.0', - 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11' + classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7', + 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE', + 'com.github.jengelman.gradle.plugins:shadow:1.2.0', + 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11' } } plugins { id 'org.asciidoctor.convert' version '1.5.2' - id "me.champeau.gradle.jmh" version "0.3.1" } +apply from: "gradle/doc.gradle" +apply from: "gradle/setup.gradle" + description = 'Non-Blocking Reactive Foundation for the JVM' group = 'io.projectreactor' ext { - gradleVersion = '3.1' - gradleScriptDir = "${rootProject.projectDir}/gradle" + gradleVersion = '3.5' // Logging slf4jVersion = '1.7.12' @@ -44,8 +45,8 @@ ext { // Testing assertJVersion = '3.6.1' - testAddonVersion = '3.1.0.BUILD-SNAPSHOT' mockitoVersion = '2.7.22' + javadocLinks = ["http://docs.oracle.com/javase/8/docs/api/", "http://docs.oracle.com/javaee/6/api/", "http://www.reactive-streams.org/reactive-streams-1.0.0-javadoc/"] as String[] @@ -58,136 +59,172 @@ ext { } -apply plugin: 'java' -apply plugin: 'jacoco' -apply from: "$gradleScriptDir/setup.gradle" -apply plugin: 'propdeps' -apply plugin: 'osgi' -apply from: "${gradleScriptDir}/ide.gradle" -jacoco { - toolVersion = '0.7.7.201606060606' -} +configure(subprojects) { p -> + apply plugin: 'java' + apply plugin: 'jacoco' + apply plugin: 'propdeps' + apply plugin: 'osgi' + + repositories { + mavenLocal() + if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) { + maven { url 'http://repo.spring.io/libs-snapshot' } + } + + mavenCentral() + jcenter() + maven { url 'http://repo.spring.io/libs-milestone' } + maven { url "https://oss.sonatype.org/content/repositories/releases/" } -jacocoTestReport { - reports { - xml.enabled = true - html.enabled = true } -} -if (project.hasProperty('platformVersion')) { - apply plugin: 'spring-io' + jacoco { + toolVersion = '0.7.7.201606060606' + } - dependencyManagement { - springIoTestRuntime { - imports { - mavenBom "io.spring.platform:platform-bom:$platformVersion" - } - } + jacocoTestReport { + reports { + xml.enabled = true + html.enabled = true + } } -} -[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-varargs", // intentionally disabled - "-Xlint:cast", - "-Xlint:classfile", - "-Xlint:dep-ann", - "-Xlint:divzero", - "-Xlint:empty", - "-Xlint:finally", - "-Xlint:overrides", - "-Xlint:path", - "-Xlint:processing", - "-Xlint:static", - "-Xlint:try", - "-Xlint:deprecation", - "-Xlint:unchecked", - "-Xlint:-serial", // intentionally disabled - "-Xlint:-options", // intentionally disabled - "-Xlint:-fallthrough", // intentionally disabled - "-Xlint:-rawtypes" // TODO enable and fix warnings -] - -compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 -} + [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + [compileJava, compileTestJava]*.options*.compilerArgs = + ["-Xlint:-varargs", // intentionally disabled + "-Xlint:cast", + "-Xlint:classfile", + "-Xlint:dep-ann", + "-Xlint:divzero", + "-Xlint:empty", + "-Xlint:finally", + "-Xlint:overrides", + "-Xlint:path", + "-Xlint:processing", + "-Xlint:static", + "-Xlint:try", + "-Xlint:deprecation", + "-Xlint:unchecked", + "-Xlint:-serial", // intentionally disabled + "-Xlint:-options", // intentionally disabled + "-Xlint:-fallthrough", // intentionally disabled + "-Xlint:-rawtypes" // TODO enable and fix warnings + ] + + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } -compileTestJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 -} + compileTestJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } -if (JavaVersion.current().isJava8Compatible()) { - compileTestJava.options.compilerArgs += "-parameters" - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') + javadoc { + dependsOn jar + group = "Reactor Core Javadoc" + description = "Generates aggregated Javadoc API documentation." + title = "Reactor Core $version" + + options.addStringOption('charSet', 'UTF-8') + + options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED + options.author = true + options.header = "$p.name" + options.overview = "$rootDir/src/api/overview.html" + options.stylesheetFile = file("$rootDir/src/api/stylesheet.css") + options.links(rootProject.ext.javadocLinks) + options.tags = [ "apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", + "implNote:a:Implementation Note:" ] + + maxMemory = "1024m" + destinationDir = new File(p.buildDir, "docs/javadoc") + source p.sourceSets.main.allJava + doFirst { + classpath = files(p.sourceSets.main.compileClasspath) + } } -} -[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + if (JavaVersion.current().isJava8Compatible()) { + compileTestJava.options.compilerArgs += "-parameters" + p.tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } + test { + testLogging { + events "passed", "failed" + showExceptions true + exceptionFormat "full" + maxGranularity 3 + } + } -project.tasks.withType(Test).all { - systemProperty("java.awt.headless", "true") - systemProperty("reactor.trace.cancel", "true") - systemProperty("reactor.trace.nocapacity", "true") - systemProperty("testGroups", project.properties.get("testGroups")) - scanForTestClasses = false - include '**/*Tests.*' - include '**/*Test.*' - include '**/*Spec.*' - if(!version.contains("SNAPSHOT")){ - include '**/*Loop.*' + p.tasks.withType(Test).all { + systemProperty("java.awt.headless", "true") + systemProperty("reactor.trace.cancel", "true") + systemProperty("reactor.trace.nocapacity", "true") + systemProperty("testGroups", p.properties.get("testGroups")) + scanForTestClasses = false + include '**/*Tests.*' + include '**/*Test.*' + include '**/*Spec.*' + if (!version.contains("SNAPSHOT")) { + include '**/*Loop.*' + } + exclude '**/*Abstract*.*' + exclude '**/*OperatorTest*.*' } - exclude '**/*Abstract*.*' - exclude '**/*OperatorTest*.*' } -configure(rootProject) { - repositories { - mavenLocal() - if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) { - maven { url 'http://repo.spring.io/libs-snapshot' } +if (project.hasProperty('platformVersion')) { + apply plugin: 'spring-io' + + dependencyManagement { + springIoTestRuntime { + imports { + mavenBom "io.spring.platform:platform-bom:$platformVersion" + } } + } +} - mavenCentral() - jcenter() - maven { url 'http://repo.spring.io/libs-milestone' } - maven { url "https://oss.sonatype.org/content/repositories/releases/" } - } +project('reactor-core') { + apply from: rootProject.file('gradle/jmh.gradle') configurations { - compileOnly.extendsFrom jsr166backport - testCompile.extendsFrom jsr166backport + compileOnly.extendsFrom jsr166backport + testCompile.extendsFrom jsr166backport } -// dependencies that are common across all java projects dependencies { - // Reactive Streams - compile "org.reactivestreams:reactive-streams:1.0.0" - testCompile "org.reactivestreams:reactive-streams-tck:1.0.0" + // Reactive Streams + compile "org.reactivestreams:reactive-streams:1.0.0" + testCompile "org.reactivestreams:reactive-streams-tck:1.0.0" - // JSR-305 annotations - optional "com.google.code.findbugs:jsr305:3.0.0" + // JSR-305 annotations + optional "com.google.code.findbugs:jsr305:3.0.0" - //Optional Logging Operator - optional "org.slf4j:slf4j-api:$slf4jVersion" + //Optional Logging Operator + optional "org.slf4j:slf4j-api:$slf4jVersion" + + //Optional JDK 9 Converter + jsr166backport "io.projectreactor:jsr166:1.0.0.RELEASE" - //Optional JDK 9 Converter - jsr166backport "io.projectreactor:jsr166:1.0.0.RELEASE" - testCompile 'junit:junit:4.12' testRuntime "ch.qos.logback:logback-classic:$logbackVersion" - // Testing - testCompile("io.projectreactor.addons:reactor-test:$testAddonVersion"){ + // Testing + testCompile(project(":reactor-test")) { exclude module: 'reactor-core' } - testCompile "org.hamcrest:hamcrest-library:1.3", - "org.testng:testng:6.8.5", + testCompile "org.hamcrest:hamcrest-library:1.3", + "org.testng:testng:6.8.5", "org.assertj:assertj-core:$assertJVersion", "org.mockito:mockito-core:$mockitoVersion" } @@ -205,14 +242,6 @@ configure(rootProject) { sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"] - test { - testLogging { - events "passed", "failed" - showExceptions true - exceptionFormat "full" - maxGranularity 3 - } - } if (!JavaVersion.current().isJava9Compatible()) { test { @@ -220,15 +249,16 @@ configure(rootProject) { } } - jar { - manifest { + manifest { attributes 'Implementation-Title': 'reactor-core', - 'Implementation-Version': version - instruction 'Import-Package', bundleImportPackages.join(',') - } + 'Implementation-Version': version + instruction 'Import-Package', bundleImportPackages.join(',') + } } + + jacocoTestReport.dependsOn testNG + check.dependsOn jacocoTestReport } -jacocoTestReport.dependsOn testNG -check.dependsOn jacocoTestReport +assemble.dependsOn docsZip diff --git a/gradle/doc.gradle b/gradle/doc.gradle index 0eca6eb8f7..d71703405c 100644 --- a/gradle/doc.gradle +++ b/gradle/doc.gradle @@ -14,42 +14,8 @@ * limitations under the License. */ configure(rootProject) { - apply plugin: "java" apply plugin: 'org.asciidoctor.convert' - javadoc { - dependsOn jar - group = "Reactor Core Javadoc" - - description = "Generates aggregated Javadoc API documentation." - title = "Reactor Core $version" - - if (JavaVersion.current().isJava8Compatible()) { - compileTestJava.options.compilerArgs += "-parameters" - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } - - options.addStringOption('charSet', 'UTF-8') - - options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED - options.author = true - options.header = "Reactor Core" - options.overview = "src/api/overview.html" - options.stylesheetFile = file("src/api/stylesheet.css") - options.links(rootProject.ext.javadocLinks) - options.tags = [ "apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", - "implNote:a:Implementation Note:" ] - - maxMemory = "1024m" - destinationDir = new File(buildDir, "docs/javadoc") - source rootProject.sourceSets.main.allJava - doFirst { - classpath = files(rootProject.sourceSets.main.compileClasspath) - } - } - asciidoctor { sources { include "index.asciidoc" diff --git a/gradle/ide.gradle b/gradle/ide.gradle deleted file mode 100644 index 5506129d91..0000000000 --- a/gradle/ide.gradle +++ /dev/null @@ -1,103 +0,0 @@ -import org.gradle.plugins.ide.eclipse.model.ProjectDependency -import org.gradle.plugins.ide.eclipse.model.SourceFolder - -apply plugin: 'idea' -apply plugin: 'eclipse' -apply plugin: 'propdeps-eclipse' -apply plugin: 'propdeps-idea' - -// Until eclipse fully supports Java 8 use 1.7 source level -eclipse.jdt { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 -} - -// Replace classpath entries with project dependencies (GRADLE-1116) -eclipse.classpath.file.whenMerged { classpath -> - def regexp = /.*?\/([^\/]+)\/build\/[^\/]+\/(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb) - def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp } - projectOutputDependencies.each { entry -> - def matcher = (entry.path =~ regexp) - if (matcher) { - def projectName = matcher[0][1] - def path = "/${projectName}" - if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) { - def dependency = new ProjectDependency(path, project(":${projectName}").path) - dependency.exported = true - classpath.entries.add(dependency) - } - classpath.entries.remove(entry) - } - } - classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) } -} - -// Use separate main/test outputs (prevents WTP from packaging test classes) -eclipse.classpath.defaultOutputDir = file(project.name + "/bin/eclipse") -eclipse.classpath.file.beforeMerged { classpath -> - classpath.entries.findAll { it instanceof SourceFolder }.each { - if (it.output?.startsWith("bin/")) { - it.output = null - } - } -} -eclipse.classpath.file.whenMerged { classpath -> - classpath.entries.findAll { it instanceof SourceFolder }.each { - it.output = "bin/" + it.path.split("/")[1] - } -} - -// Allow projects to be used as WPT modules -eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature" - -// Include project specific settings -task eclipseSettings(type: Copy) { - from rootProject.files( - "src/eclipse/org.eclipse.jdt.ui.prefs", - "src/eclipse/org.eclipse.wst.common.project.facet.core.xml") - into project.file('.settings/') - outputs.upToDateWhen { false } -} - -task eclipseWstComponent(type: Copy) { - from rootProject.files( - "src/eclipse/org.eclipse.wst.common.component") - into project.file('.settings/') - expand(deployname: project.name) - outputs.upToDateWhen { false } -} - -task eclipseJdtPrepare(type: Copy) { - from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs") - into project.file(".settings/") - outputs.upToDateWhen { false } -} - -task cleanEclipseJdtUi(type: Delete) { - delete project.file(".settings/org.eclipse.jdt.ui.prefs") - delete project.file("org.eclipse.jdt.core.prefs") - delete project.file(".settings/org.eclipse.wst.common.component") - delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml") -} - -tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare) -tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi) -tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent) - -// Filter 'build' folder - -eclipse.project.file.withXml { - def node = it.asNode() - - def filteredResources = node.get("filteredResources") - if (filteredResources) { - node.remove(filteredResources) - } - def filterNode = node.appendNode("filteredResources").appendNode("filter") - filterNode.appendNode("id", "1359048889071") - filterNode.appendNode("name", "") - filterNode.appendNode("type", "30") - def matcherNode = filterNode.appendNode("matcher") - matcherNode.appendNode("id", "org.eclipse.ui.ide.multiFilter") - matcherNode.appendNode("arguments", "1.0-projectRelativePath-matches-false-false-build") -} \ No newline at end of file diff --git a/gradle/jmh.gradle b/gradle/jmh.gradle new file mode 100644 index 0000000000..e1a5ddac62 --- /dev/null +++ b/gradle/jmh.gradle @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * JMH from @jzillmann - https://gist.github.com/jzillmann/754bf625d43b91fcff295935cbfd1bff + */ +sourceSets { + jmh { + compileClasspath += sourceSets.test.runtimeClasspath + runtimeClasspath += sourceSets.test.runtimeClasspath + } +} + +dependencies { + jmhCompile project + jmhCompile 'org.openjdk.jmh:jmh-core:1.18' + jmhCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.18' +} + +task ('jmhHelp', description:'Print help for the jmh task') { + doLast { + println "" + println "Usage of jmh tasks:" + println "" + + println "Only execute specific benchmark(s):" + println "\t./gradlew jmh -Pinclude=\".*MyBenchmark.*\"" + + println "" + println "Specify extra profilers:" + println "\t./gradlew jmh -Pprofilers=\"gc,stack\"" + + println "" + println "Prominent profilers (for full list call jmhProfilers task):" + println "\tcomp - JitCompilations, tune your iterations" + println "\tstack - which methods used most time" + println "\tgc - print garbage collection stats" + println "\ths_thr - thread usage" + + println "" + println "Change report format from JSON to one of [CSV, JSON, NONE, SCSV, TEXT]:" + println "\t./gradlew jmh -Pformat=csv" + + println "" + println "Specify JVM arguments:" + println "\t./gradlew jmh -PjvmArgs=\"-Dtest.cluster=local\"" + + println "" + println "Resources:" + println "\thttp://tutorials.jenkov.com/java-performance/jmh.html (Introduction)" + println "\thttp://hg.openjdk.java.net/code-tools/jmh/file/tip/jmh-samples/src/main/java/org/openjdk/jmh/samples/ (Samples)" + } +} + +task jmhProfilers(type: JavaExec, description:'Lists the available profilers for the jmh task', group: 'Development') { + classpath = sourceSets.jmh.runtimeClasspath + main = 'org.openjdk.jmh.Main' + args '-lprof' +} + +task jmh(type: JavaExec, description: 'Executing JMH benchmarks') { + classpath = sourceSets.jmh.runtimeClasspath + main = 'org.openjdk.jmh.Main' + + def include = project.properties.get('include', ''); + def exclude = project.properties.get('exclude'); + def format = project.properties.get('format', 'json'); + def profilers = project.properties.get('profilers'); + def jvmArgs = project.properties.get('jvmArgs') + + def resultFile = file("build/reports/jmh/result.${format}") + + args include + if(exclude) { + args '-e', exclude + } + args '-foe', 'true' //fail-on-error + args '-v', 'NORMAL' //verbosity [SILENT, NORMAL, EXTRA] + if(profilers) { + profilers.split(',').each { + args '-prof', it + } + } + args '-jvmArgsPrepend', '-Xmx3072m' + args '-jvmArgsPrepend', '-Xms3072m' + if(jvmArgs) { + for(jvmArg in jvmArgs.split(' ')) { + args '-jvmArgsPrepend', jvmArg + } + } + args '-rf', format + args '-rff', resultFile + + doFirst { + println "\nExecuting JMH with: $args \n" + resultFile.parentFile.mkdirs() + } +} diff --git a/gradle/setup.gradle b/gradle/setup.gradle index df1042ce89..3d301c1002 100644 --- a/gradle/setup.gradle +++ b/gradle/setup.gradle @@ -19,22 +19,20 @@ task wrapper(type: Wrapper, description: "Create a Gradle self-download wrapper" gradleVersion = "$gradleVersion" } - -configure(rootProject) { - apply from: "$gradleScriptDir/doc.gradle" +configure(subprojects) { p -> apply plugin: 'propdeps-maven' apply plugin: 'maven' install { repositories.mavenInstaller { - customizePom(pom, rootProject) + customizePom(pom, project) } } jar { manifest.attributes["Created-By"] = "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" - manifest.attributes["Implementation-Title"] = rootProject.name - manifest.attributes["Implementation-Version"] = rootProject.version + manifest.attributes["Implementation-Title"] = project.name + manifest.attributes["Implementation-Version"] = project.version } task sourcesJar(type: Jar) { @@ -50,7 +48,6 @@ configure(rootProject) { artifacts { archives sourcesJar archives javadocJar - archives docsZip } } @@ -70,7 +67,7 @@ def customizePom(pom, gradleProject) { generatedPom.project { name = gradleProject.description description = gradleProject.description - url = 'https://github.com/reactor/reactor' + url = 'https://github.com/reactor/reactor-core' organization { name = 'reactor' url = 'http://github.com/reactor' @@ -111,7 +108,7 @@ def customizePom(pom, gradleProject) { } issueManagement { system = "GitHub Issues" - url = "https://github.com/reactor/reactor/issues" + url = "https://github.com/reactor/reactor-core/issues" } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c6137b878..feeccec1ee 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1584b24e5d..9cdfee5aab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,21 @@ -#Thu Dec 08 12:36:27 GMT 2016 +# +# Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#Wed May 31 14:53:44 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/gradlew b/gradlew index 9d82f78915..4453ccea33 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 5f192121eb..f9553162f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -49,7 +49,6 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/src/jmh/java/reactor/CheckpointBenchmark.java b/reactor-core/src/jmh/java/reactor/CheckpointBenchmark.java similarity index 97% rename from src/jmh/java/reactor/CheckpointBenchmark.java rename to reactor-core/src/jmh/java/reactor/CheckpointBenchmark.java index 4a4da10ce1..4d9944a45f 100644 --- a/src/jmh/java/reactor/CheckpointBenchmark.java +++ b/reactor-core/src/jmh/java/reactor/CheckpointBenchmark.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/adapter/JdkFlowAdapter.java b/reactor-core/src/main/java/reactor/adapter/JdkFlowAdapter.java similarity index 100% rename from src/main/java/reactor/adapter/JdkFlowAdapter.java rename to reactor-core/src/main/java/reactor/adapter/JdkFlowAdapter.java diff --git a/src/main/java/reactor/adapter/package-info.java b/reactor-core/src/main/java/reactor/adapter/package-info.java similarity index 93% rename from src/main/java/reactor/adapter/package-info.java rename to reactor-core/src/main/java/reactor/adapter/package-info.java index 4bd0490b59..cb73a0c0d5 100644 --- a/src/main/java/reactor/adapter/package-info.java +++ b/reactor-core/src/main/java/reactor/adapter/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/Disposable.java b/reactor-core/src/main/java/reactor/core/Disposable.java similarity index 100% rename from src/main/java/reactor/core/Disposable.java rename to reactor-core/src/main/java/reactor/core/Disposable.java diff --git a/src/main/java/reactor/core/Exceptions.java b/reactor-core/src/main/java/reactor/core/Exceptions.java similarity index 100% rename from src/main/java/reactor/core/Exceptions.java rename to reactor-core/src/main/java/reactor/core/Exceptions.java diff --git a/src/main/java/reactor/core/Fuseable.java b/reactor-core/src/main/java/reactor/core/Fuseable.java similarity index 100% rename from src/main/java/reactor/core/Fuseable.java rename to reactor-core/src/main/java/reactor/core/Fuseable.java diff --git a/src/main/java/reactor/core/Scannable.java b/reactor-core/src/main/java/reactor/core/Scannable.java similarity index 100% rename from src/main/java/reactor/core/Scannable.java rename to reactor-core/src/main/java/reactor/core/Scannable.java diff --git a/src/main/java/reactor/core/package-info.java b/reactor-core/src/main/java/reactor/core/package-info.java similarity index 100% rename from src/main/java/reactor/core/package-info.java rename to reactor-core/src/main/java/reactor/core/package-info.java diff --git a/src/main/java/reactor/core/publisher/BaseSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/BaseSubscriber.java similarity index 100% rename from src/main/java/reactor/core/publisher/BaseSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/BaseSubscriber.java diff --git a/src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java similarity index 94% rename from src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java index 57988c66b3..dca21785e9 100644 --- a/src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java +++ b/reactor-core/src/main/java/reactor/core/publisher/BlockingFirstSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/BlockingIterable.java b/reactor-core/src/main/java/reactor/core/publisher/BlockingIterable.java similarity index 100% rename from src/main/java/reactor/core/publisher/BlockingIterable.java rename to reactor-core/src/main/java/reactor/core/publisher/BlockingIterable.java diff --git a/src/main/java/reactor/core/publisher/BlockingLastSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/BlockingLastSubscriber.java similarity index 94% rename from src/main/java/reactor/core/publisher/BlockingLastSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/BlockingLastSubscriber.java index 056365c41b..3e89df87de 100644 --- a/src/main/java/reactor/core/publisher/BlockingLastSubscriber.java +++ b/reactor-core/src/main/java/reactor/core/publisher/BlockingLastSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java similarity index 95% rename from src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java index f1702faf8d..0d8040bbbb 100644 --- a/src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java +++ b/reactor-core/src/main/java/reactor/core/publisher/BlockingMonoSubscriber.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/publisher/BlockingSingleSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/BlockingSingleSubscriber.java similarity index 100% rename from src/main/java/reactor/core/publisher/BlockingSingleSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/BlockingSingleSubscriber.java diff --git a/src/main/java/reactor/core/publisher/BufferOverflowStrategy.java b/reactor-core/src/main/java/reactor/core/publisher/BufferOverflowStrategy.java similarity index 90% rename from src/main/java/reactor/core/publisher/BufferOverflowStrategy.java rename to reactor-core/src/main/java/reactor/core/publisher/BufferOverflowStrategy.java index e3df256754..18d4cf40c2 100644 --- a/src/main/java/reactor/core/publisher/BufferOverflowStrategy.java +++ b/reactor-core/src/main/java/reactor/core/publisher/BufferOverflowStrategy.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/publisher/ConnectableFlux.java b/reactor-core/src/main/java/reactor/core/publisher/ConnectableFlux.java similarity index 100% rename from src/main/java/reactor/core/publisher/ConnectableFlux.java rename to reactor-core/src/main/java/reactor/core/publisher/ConnectableFlux.java diff --git a/src/main/java/reactor/core/publisher/ConnectableFluxOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/ConnectableFluxOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/ConnectableFluxOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/ConnectableFluxOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/DelegateProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/DelegateProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/DelegateProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/DelegateProcessor.java diff --git a/src/main/java/reactor/core/publisher/DirectProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/DirectProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/DirectProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/DirectProcessor.java diff --git a/src/main/java/reactor/core/publisher/Disposables.java b/reactor-core/src/main/java/reactor/core/publisher/Disposables.java similarity index 100% rename from src/main/java/reactor/core/publisher/Disposables.java rename to reactor-core/src/main/java/reactor/core/publisher/Disposables.java diff --git a/src/main/java/reactor/core/publisher/DrainUtils.java b/reactor-core/src/main/java/reactor/core/publisher/DrainUtils.java similarity index 100% rename from src/main/java/reactor/core/publisher/DrainUtils.java rename to reactor-core/src/main/java/reactor/core/publisher/DrainUtils.java diff --git a/src/main/java/reactor/core/publisher/EmitterProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/EmitterProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/EmitterProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/EmitterProcessor.java diff --git a/src/main/java/reactor/core/publisher/EventLoopProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/EventLoopProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/EventLoopProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/EventLoopProcessor.java diff --git a/src/main/java/reactor/core/publisher/Flux.java b/reactor-core/src/main/java/reactor/core/publisher/Flux.java similarity index 100% rename from src/main/java/reactor/core/publisher/Flux.java rename to reactor-core/src/main/java/reactor/core/publisher/Flux.java diff --git a/src/main/java/reactor/core/publisher/FluxArray.java b/reactor-core/src/main/java/reactor/core/publisher/FluxArray.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxArray.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxArray.java diff --git a/src/main/java/reactor/core/publisher/FluxAutoConnect.java b/reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnect.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxAutoConnect.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnect.java diff --git a/src/main/java/reactor/core/publisher/FluxAutoConnectFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnectFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxAutoConnectFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnectFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxAwaitOnSubscribe.java b/reactor-core/src/main/java/reactor/core/publisher/FluxAwaitOnSubscribe.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxAwaitOnSubscribe.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxAwaitOnSubscribe.java diff --git a/src/main/java/reactor/core/publisher/FluxBuffer.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxBuffer.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxBuffer.java diff --git a/src/main/java/reactor/core/publisher/FluxBufferBoundary.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBufferBoundary.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxBufferBoundary.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxBufferBoundary.java diff --git a/src/main/java/reactor/core/publisher/FluxBufferPredicate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBufferPredicate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxBufferPredicate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxBufferPredicate.java diff --git a/src/main/java/reactor/core/publisher/FluxBufferTimeOrSize.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBufferTimeOrSize.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxBufferTimeOrSize.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxBufferTimeOrSize.java diff --git a/src/main/java/reactor/core/publisher/FluxBufferWhen.java b/reactor-core/src/main/java/reactor/core/publisher/FluxBufferWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxBufferWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxBufferWhen.java diff --git a/src/main/java/reactor/core/publisher/FluxCallable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxCallable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxCallable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxCallable.java diff --git a/src/main/java/reactor/core/publisher/FluxCallableOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/FluxCallableOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxCallableOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxCallableOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/FluxCancelOn.java b/reactor-core/src/main/java/reactor/core/publisher/FluxCancelOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxCancelOn.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxCancelOn.java diff --git a/src/main/java/reactor/core/publisher/FluxCombineLatest.java b/reactor-core/src/main/java/reactor/core/publisher/FluxCombineLatest.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxCombineLatest.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxCombineLatest.java diff --git a/src/main/java/reactor/core/publisher/FluxConcatArray.java b/reactor-core/src/main/java/reactor/core/publisher/FluxConcatArray.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxConcatArray.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxConcatArray.java diff --git a/src/main/java/reactor/core/publisher/FluxConcatIterable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxConcatIterable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxConcatIterable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxConcatIterable.java diff --git a/src/main/java/reactor/core/publisher/FluxConcatMap.java b/reactor-core/src/main/java/reactor/core/publisher/FluxConcatMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxConcatMap.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxConcatMap.java diff --git a/src/main/java/reactor/core/publisher/FluxCreate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxCreate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxCreate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxCreate.java diff --git a/src/main/java/reactor/core/publisher/FluxDefaultIfEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDefaultIfEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDefaultIfEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDefaultIfEmpty.java diff --git a/src/main/java/reactor/core/publisher/FluxDefer.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDefer.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDefer.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDefer.java diff --git a/src/main/java/reactor/core/publisher/FluxDelaySubscription.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDelaySubscription.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDelaySubscription.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDelaySubscription.java diff --git a/src/main/java/reactor/core/publisher/FluxDematerialize.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDematerialize.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDematerialize.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDematerialize.java diff --git a/src/main/java/reactor/core/publisher/FluxDetach.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDetach.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDetach.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDetach.java diff --git a/src/main/java/reactor/core/publisher/FluxDistinct.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDistinct.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDistinct.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDistinct.java diff --git a/src/main/java/reactor/core/publisher/FluxDistinctFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDistinctFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDistinctFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDistinctFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxDistinctUntilChanged.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDistinctUntilChanged.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDistinctUntilChanged.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDistinctUntilChanged.java diff --git a/src/main/java/reactor/core/publisher/FluxDoFinally.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDoFinally.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDoFinally.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDoFinally.java diff --git a/src/main/java/reactor/core/publisher/FluxDoFinallyFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxDoFinallyFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxDoFinallyFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxDoFinallyFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxElapsed.java b/reactor-core/src/main/java/reactor/core/publisher/FluxElapsed.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxElapsed.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxElapsed.java diff --git a/src/main/java/reactor/core/publisher/FluxEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/FluxEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxEmpty.java diff --git a/src/main/java/reactor/core/publisher/FluxError.java b/reactor-core/src/main/java/reactor/core/publisher/FluxError.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxError.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxError.java diff --git a/src/main/java/reactor/core/publisher/FluxFilter.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFilter.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxFilter.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFilter.java diff --git a/src/main/java/reactor/core/publisher/FluxFilterFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFilterFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxFilterFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFilterFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxFilterWhen.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFilterWhen.java similarity index 99% rename from src/main/java/reactor/core/publisher/FluxFilterWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFilterWhen.java index 3d2249645f..dde29f5bd9 100644 --- a/src/main/java/reactor/core/publisher/FluxFilterWhen.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxFilterWhen.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/publisher/FluxFirstEmitting.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFirstEmitting.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxFirstEmitting.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFirstEmitting.java diff --git a/src/main/java/reactor/core/publisher/FluxFlatMap.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFlatMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxFlatMap.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFlatMap.java diff --git a/src/main/java/reactor/core/publisher/FluxFlattenIterable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxFlattenIterable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxFlattenIterable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxFlattenIterable.java diff --git a/src/main/java/reactor/core/publisher/FluxGenerate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxGenerate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxGenerate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxGenerate.java diff --git a/src/main/java/reactor/core/publisher/FluxGroupBy.java b/reactor-core/src/main/java/reactor/core/publisher/FluxGroupBy.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxGroupBy.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxGroupBy.java diff --git a/src/main/java/reactor/core/publisher/FluxGroupJoin.java b/reactor-core/src/main/java/reactor/core/publisher/FluxGroupJoin.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxGroupJoin.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxGroupJoin.java diff --git a/src/main/java/reactor/core/publisher/FluxHandle.java b/reactor-core/src/main/java/reactor/core/publisher/FluxHandle.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxHandle.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxHandle.java diff --git a/src/main/java/reactor/core/publisher/FluxHandleFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxHandleFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxHandleFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxHandleFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxHide.java b/reactor-core/src/main/java/reactor/core/publisher/FluxHide.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxHide.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxHide.java diff --git a/src/main/java/reactor/core/publisher/FluxInterval.java b/reactor-core/src/main/java/reactor/core/publisher/FluxInterval.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxInterval.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxInterval.java diff --git a/src/main/java/reactor/core/publisher/FluxIterable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxIterable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxIterable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxIterable.java diff --git a/src/main/java/reactor/core/publisher/FluxJoin.java b/reactor-core/src/main/java/reactor/core/publisher/FluxJoin.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxJoin.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxJoin.java diff --git a/src/main/java/reactor/core/publisher/FluxJust.java b/reactor-core/src/main/java/reactor/core/publisher/FluxJust.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxJust.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxJust.java diff --git a/src/main/java/reactor/core/publisher/FluxLog.java b/reactor-core/src/main/java/reactor/core/publisher/FluxLog.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxLog.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxLog.java diff --git a/src/main/java/reactor/core/publisher/FluxLogFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxLogFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxLogFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxLogFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxMap.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMap.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMap.java diff --git a/src/main/java/reactor/core/publisher/FluxMapFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMapFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxMapSignal.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMapSignal.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMapSignal.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMapSignal.java diff --git a/src/main/java/reactor/core/publisher/FluxMaterialize.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMaterialize.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMaterialize.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMaterialize.java diff --git a/src/main/java/reactor/core/publisher/FluxMerge.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMerge.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMerge.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMerge.java diff --git a/src/main/java/reactor/core/publisher/FluxMergeSequential.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMergeSequential.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxMergeSequential.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxMergeSequential.java diff --git a/src/main/java/reactor/core/publisher/FluxNever.java b/reactor-core/src/main/java/reactor/core/publisher/FluxNever.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxNever.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxNever.java diff --git a/src/main/java/reactor/core/publisher/FluxOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/FluxOnBackpressureBuffer.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureBuffer.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnBackpressureBuffer.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureBuffer.java diff --git a/src/main/java/reactor/core/publisher/FluxOnBackpressureBufferStrategy.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureBufferStrategy.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnBackpressureBufferStrategy.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureBufferStrategy.java diff --git a/src/main/java/reactor/core/publisher/FluxOnBackpressureDrop.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureDrop.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnBackpressureDrop.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureDrop.java diff --git a/src/main/java/reactor/core/publisher/FluxOnBackpressureLatest.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureLatest.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnBackpressureLatest.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnBackpressureLatest.java diff --git a/src/main/java/reactor/core/publisher/FluxOnErrorResume.java b/reactor-core/src/main/java/reactor/core/publisher/FluxOnErrorResume.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxOnErrorResume.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxOnErrorResume.java diff --git a/src/main/java/reactor/core/publisher/FluxPeek.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPeek.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPeek.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPeek.java diff --git a/src/main/java/reactor/core/publisher/FluxPeekFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPeekFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPeekFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPeekFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxPeekStateful.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPeekStateful.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPeekStateful.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPeekStateful.java diff --git a/src/main/java/reactor/core/publisher/FluxProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/FluxProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxProcessor.java diff --git a/src/main/java/reactor/core/publisher/FluxPublish.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPublish.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java diff --git a/src/main/java/reactor/core/publisher/FluxPublishMulticast.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPublishMulticast.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPublishMulticast.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPublishMulticast.java diff --git a/src/main/java/reactor/core/publisher/FluxPublishOn.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPublishOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxPublishOn.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxPublishOn.java diff --git a/src/main/java/reactor/core/publisher/FluxRange.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRange.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRange.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRange.java diff --git a/src/main/java/reactor/core/publisher/FluxRefCount.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRefCount.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRefCount.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRefCount.java diff --git a/src/main/java/reactor/core/publisher/FluxRefCountGrace.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRefCountGrace.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRefCountGrace.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRefCountGrace.java diff --git a/src/main/java/reactor/core/publisher/FluxRepeat.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRepeat.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRepeat.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRepeat.java diff --git a/src/main/java/reactor/core/publisher/FluxRepeatPredicate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRepeatPredicate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRepeatPredicate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRepeatPredicate.java diff --git a/src/main/java/reactor/core/publisher/FluxRepeatWhen.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRepeatWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRepeatWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRepeatWhen.java diff --git a/src/main/java/reactor/core/publisher/FluxReplay.java b/reactor-core/src/main/java/reactor/core/publisher/FluxReplay.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxReplay.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxReplay.java diff --git a/src/main/java/reactor/core/publisher/FluxRetry.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRetry.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRetry.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRetry.java diff --git a/src/main/java/reactor/core/publisher/FluxRetryPredicate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRetryPredicate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRetryPredicate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRetryPredicate.java diff --git a/src/main/java/reactor/core/publisher/FluxRetryWhen.java b/reactor-core/src/main/java/reactor/core/publisher/FluxRetryWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxRetryWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxRetryWhen.java diff --git a/src/main/java/reactor/core/publisher/FluxSample.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSample.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSample.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSample.java diff --git a/src/main/java/reactor/core/publisher/FluxSampleFirst.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSampleFirst.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSampleFirst.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSampleFirst.java diff --git a/src/main/java/reactor/core/publisher/FluxSampleTimeout.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSampleTimeout.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSampleTimeout.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSampleTimeout.java diff --git a/src/main/java/reactor/core/publisher/FluxScan.java b/reactor-core/src/main/java/reactor/core/publisher/FluxScan.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxScan.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxScan.java diff --git a/src/main/java/reactor/core/publisher/FluxScanSeed.java b/reactor-core/src/main/java/reactor/core/publisher/FluxScanSeed.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxScanSeed.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxScanSeed.java diff --git a/src/main/java/reactor/core/publisher/FluxSink.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSink.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSink.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSink.java diff --git a/src/main/java/reactor/core/publisher/FluxSkip.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSkip.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSkip.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSkip.java diff --git a/src/main/java/reactor/core/publisher/FluxSkipLast.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSkipLast.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSkipLast.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSkipLast.java diff --git a/src/main/java/reactor/core/publisher/FluxSkipUntil.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSkipUntil.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSkipUntil.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSkipUntil.java diff --git a/src/main/java/reactor/core/publisher/FluxSkipUntilOther.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSkipUntilOther.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSkipUntilOther.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSkipUntilOther.java diff --git a/src/main/java/reactor/core/publisher/FluxSkipWhile.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSkipWhile.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSkipWhile.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSkipWhile.java diff --git a/src/main/java/reactor/core/publisher/FluxSource.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSource.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSource.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSource.java diff --git a/src/main/java/reactor/core/publisher/FluxStream.java b/reactor-core/src/main/java/reactor/core/publisher/FluxStream.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxStream.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxStream.java diff --git a/src/main/java/reactor/core/publisher/FluxSubscribeOn.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSubscribeOn.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOn.java diff --git a/src/main/java/reactor/core/publisher/FluxSubscribeOnCallable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOnCallable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSubscribeOnCallable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOnCallable.java diff --git a/src/main/java/reactor/core/publisher/FluxSubscribeOnValue.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOnValue.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSubscribeOnValue.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSubscribeOnValue.java diff --git a/src/main/java/reactor/core/publisher/FluxSwitchIfEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSwitchIfEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSwitchIfEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSwitchIfEmpty.java diff --git a/src/main/java/reactor/core/publisher/FluxSwitchMap.java b/reactor-core/src/main/java/reactor/core/publisher/FluxSwitchMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxSwitchMap.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxSwitchMap.java diff --git a/src/main/java/reactor/core/publisher/FluxTake.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTake.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTake.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTake.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeFuseable.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeLast.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeLast.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeLast.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeLast.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeLastOne.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeLastOne.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeLastOne.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeLastOne.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeUntil.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeUntil.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeUntil.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeUntil.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeUntilOther.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeUntilOther.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeUntilOther.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeUntilOther.java diff --git a/src/main/java/reactor/core/publisher/FluxTakeWhile.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTakeWhile.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTakeWhile.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTakeWhile.java diff --git a/src/main/java/reactor/core/publisher/FluxTimeout.java b/reactor-core/src/main/java/reactor/core/publisher/FluxTimeout.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxTimeout.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxTimeout.java diff --git a/src/main/java/reactor/core/publisher/FluxUsing.java b/reactor-core/src/main/java/reactor/core/publisher/FluxUsing.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxUsing.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxUsing.java diff --git a/src/main/java/reactor/core/publisher/FluxWindow.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWindow.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWindow.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWindow.java diff --git a/src/main/java/reactor/core/publisher/FluxWindowBoundary.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWindowBoundary.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWindowBoundary.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWindowBoundary.java diff --git a/src/main/java/reactor/core/publisher/FluxWindowPredicate.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWindowPredicate.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWindowPredicate.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWindowPredicate.java diff --git a/src/main/java/reactor/core/publisher/FluxWindowTimeOrSize.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWindowTimeOrSize.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWindowTimeOrSize.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWindowTimeOrSize.java diff --git a/src/main/java/reactor/core/publisher/FluxWindowWhen.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWindowWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWindowWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWindowWhen.java diff --git a/src/main/java/reactor/core/publisher/FluxWithLatestFrom.java b/reactor-core/src/main/java/reactor/core/publisher/FluxWithLatestFrom.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxWithLatestFrom.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxWithLatestFrom.java diff --git a/src/main/java/reactor/core/publisher/FluxZip.java b/reactor-core/src/main/java/reactor/core/publisher/FluxZip.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxZip.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxZip.java diff --git a/src/main/java/reactor/core/publisher/FluxZipIterable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxZipIterable.java similarity index 100% rename from src/main/java/reactor/core/publisher/FluxZipIterable.java rename to reactor-core/src/main/java/reactor/core/publisher/FluxZipIterable.java diff --git a/src/main/java/reactor/core/publisher/GroupedFlux.java b/reactor-core/src/main/java/reactor/core/publisher/GroupedFlux.java similarity index 93% rename from src/main/java/reactor/core/publisher/GroupedFlux.java rename to reactor-core/src/main/java/reactor/core/publisher/GroupedFlux.java index d6292a1f09..0a83203a40 100644 --- a/src/main/java/reactor/core/publisher/GroupedFlux.java +++ b/reactor-core/src/main/java/reactor/core/publisher/GroupedFlux.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/Hooks.java b/reactor-core/src/main/java/reactor/core/publisher/Hooks.java similarity index 100% rename from src/main/java/reactor/core/publisher/Hooks.java rename to reactor-core/src/main/java/reactor/core/publisher/Hooks.java diff --git a/src/main/java/reactor/core/publisher/ImmutableSignal.java b/reactor-core/src/main/java/reactor/core/publisher/ImmutableSignal.java similarity index 93% rename from src/main/java/reactor/core/publisher/ImmutableSignal.java rename to reactor-core/src/main/java/reactor/core/publisher/ImmutableSignal.java index 89dabd6a8b..777910da30 100644 --- a/src/main/java/reactor/core/publisher/ImmutableSignal.java +++ b/reactor-core/src/main/java/reactor/core/publisher/ImmutableSignal.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/publisher/InnerConsumer.java b/reactor-core/src/main/java/reactor/core/publisher/InnerConsumer.java similarity index 100% rename from src/main/java/reactor/core/publisher/InnerConsumer.java rename to reactor-core/src/main/java/reactor/core/publisher/InnerConsumer.java diff --git a/src/main/java/reactor/core/publisher/InnerOperator.java b/reactor-core/src/main/java/reactor/core/publisher/InnerOperator.java similarity index 100% rename from src/main/java/reactor/core/publisher/InnerOperator.java rename to reactor-core/src/main/java/reactor/core/publisher/InnerOperator.java diff --git a/src/main/java/reactor/core/publisher/InnerProducer.java b/reactor-core/src/main/java/reactor/core/publisher/InnerProducer.java similarity index 100% rename from src/main/java/reactor/core/publisher/InnerProducer.java rename to reactor-core/src/main/java/reactor/core/publisher/InnerProducer.java diff --git a/src/main/java/reactor/core/publisher/LambdaMonoSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/LambdaMonoSubscriber.java similarity index 100% rename from src/main/java/reactor/core/publisher/LambdaMonoSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/LambdaMonoSubscriber.java diff --git a/src/main/java/reactor/core/publisher/LambdaSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/LambdaSubscriber.java similarity index 100% rename from src/main/java/reactor/core/publisher/LambdaSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/LambdaSubscriber.java diff --git a/src/main/java/reactor/core/publisher/Mono.java b/reactor-core/src/main/java/reactor/core/publisher/Mono.java similarity index 100% rename from src/main/java/reactor/core/publisher/Mono.java rename to reactor-core/src/main/java/reactor/core/publisher/Mono.java diff --git a/src/main/java/reactor/core/publisher/MonoAll.java b/reactor-core/src/main/java/reactor/core/publisher/MonoAll.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoAll.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoAll.java diff --git a/src/main/java/reactor/core/publisher/MonoAny.java b/reactor-core/src/main/java/reactor/core/publisher/MonoAny.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoAny.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoAny.java diff --git a/src/main/java/reactor/core/publisher/MonoAwaitOnSubscribe.java b/reactor-core/src/main/java/reactor/core/publisher/MonoAwaitOnSubscribe.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoAwaitOnSubscribe.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoAwaitOnSubscribe.java diff --git a/src/main/java/reactor/core/publisher/MonoCallable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCallable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCallable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCallable.java diff --git a/src/main/java/reactor/core/publisher/MonoCallableOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCallableOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCallableOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCallableOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/MonoCancelOn.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCancelOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCancelOn.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCancelOn.java diff --git a/src/main/java/reactor/core/publisher/MonoCollect.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCollect.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCollect.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCollect.java diff --git a/src/main/java/reactor/core/publisher/MonoCollectList.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCollectList.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCollectList.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCollectList.java diff --git a/src/main/java/reactor/core/publisher/MonoCompletionStage.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCompletionStage.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCompletionStage.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCompletionStage.java diff --git a/src/main/java/reactor/core/publisher/MonoCount.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCount.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCount.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCount.java diff --git a/src/main/java/reactor/core/publisher/MonoCreate.java b/reactor-core/src/main/java/reactor/core/publisher/MonoCreate.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoCreate.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoCreate.java diff --git a/src/main/java/reactor/core/publisher/MonoDefaultIfEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDefaultIfEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDefaultIfEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDefaultIfEmpty.java diff --git a/src/main/java/reactor/core/publisher/MonoDefer.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDefer.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDefer.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDefer.java diff --git a/src/main/java/reactor/core/publisher/MonoDelay.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDelay.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDelay.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDelay.java diff --git a/src/main/java/reactor/core/publisher/MonoDelayElement.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDelayElement.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDelayElement.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDelayElement.java diff --git a/src/main/java/reactor/core/publisher/MonoDelaySubscription.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDelaySubscription.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDelaySubscription.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDelaySubscription.java diff --git a/src/main/java/reactor/core/publisher/MonoDelayUntil.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDelayUntil.java similarity index 95% rename from src/main/java/reactor/core/publisher/MonoDelayUntil.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDelayUntil.java index c8d26ee270..01124ce368 100644 --- a/src/main/java/reactor/core/publisher/MonoDelayUntil.java +++ b/reactor-core/src/main/java/reactor/core/publisher/MonoDelayUntil.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -45,6 +45,7 @@ final class MonoDelayUntil extends Mono { Function>[] otherGenerators; + @SuppressWarnings("unchecked") MonoDelayUntil(boolean delayError, Mono monoSource, Function> triggerGenerator) { @@ -67,6 +68,7 @@ private MonoDelayUntil(boolean delayError, * @param triggerGenerator the new trigger to add to the copy of the operator * @return a new {@link MonoDelayUntil} instance with same source but additional trigger generator */ + @SuppressWarnings("unchecked") MonoDelayUntil copyWithNewTriggerGenerator(boolean delayError, Function> triggerGenerator) { Objects.requireNonNull(triggerGenerator, "triggerGenerator"); @@ -74,7 +76,7 @@ MonoDelayUntil copyWithNewTriggerGenerator(boolean delayError, Function>[] newTriggers = new Function[oldTriggers.length + 1]; System.arraycopy(oldTriggers, 0, newTriggers, 0, oldTriggers.length); newTriggers[oldTriggers.length] = triggerGenerator; - return new MonoDelayUntil(this.delayError ? true : delayError, this.source, newTriggers); + return new MonoDelayUntil<>(this.delayError ? true : delayError, this.source, newTriggers); } @Override @@ -159,14 +161,16 @@ public Stream inners() { return Stream.of(triggerSubscribers); } - private void subscribeNextTrigger(T value, int triggerIndex) { + + @SuppressWarnings("unchecked") + void subscribeNextTrigger(T value, int triggerIndex) { if (triggerSubscribers == NO_TRIGGER) { triggerSubscribers = new DelayUntilTrigger[otherGenerators.length]; } Function> generator = otherGenerators[triggerIndex]; Publisher p = generator.apply(value); - DelayUntilTrigger triggerSubscriber = new DelayUntilTrigger(this); + DelayUntilTrigger triggerSubscriber = new DelayUntilTrigger<>(this); this.triggerSubscribers[triggerIndex] = triggerSubscriber; p.subscribe(triggerSubscriber); diff --git a/src/main/java/reactor/core/publisher/MonoDematerialize.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDematerialize.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDematerialize.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDematerialize.java diff --git a/src/main/java/reactor/core/publisher/MonoDetach.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDetach.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDetach.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDetach.java diff --git a/src/main/java/reactor/core/publisher/MonoDoFinally.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDoFinally.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDoFinally.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDoFinally.java diff --git a/src/main/java/reactor/core/publisher/MonoDoFinallyFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoDoFinallyFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoDoFinallyFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoDoFinallyFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoElapsed.java b/reactor-core/src/main/java/reactor/core/publisher/MonoElapsed.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoElapsed.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoElapsed.java diff --git a/src/main/java/reactor/core/publisher/MonoElementAt.java b/reactor-core/src/main/java/reactor/core/publisher/MonoElementAt.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoElementAt.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoElementAt.java diff --git a/src/main/java/reactor/core/publisher/MonoEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/MonoEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoEmpty.java diff --git a/src/main/java/reactor/core/publisher/MonoError.java b/reactor-core/src/main/java/reactor/core/publisher/MonoError.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoError.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoError.java diff --git a/src/main/java/reactor/core/publisher/MonoFilter.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFilter.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFilter.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFilter.java diff --git a/src/main/java/reactor/core/publisher/MonoFilterFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFilterFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFilterFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFilterFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoFilterWhen.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFilterWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFilterWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFilterWhen.java diff --git a/src/main/java/reactor/core/publisher/MonoFirst.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFirst.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFirst.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFirst.java diff --git a/src/main/java/reactor/core/publisher/MonoFlatMap.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFlatMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFlatMap.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFlatMap.java diff --git a/src/main/java/reactor/core/publisher/MonoFlatMapMany.java b/reactor-core/src/main/java/reactor/core/publisher/MonoFlatMapMany.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoFlatMapMany.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoFlatMapMany.java diff --git a/src/main/java/reactor/core/publisher/MonoHandle.java b/reactor-core/src/main/java/reactor/core/publisher/MonoHandle.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoHandle.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoHandle.java diff --git a/src/main/java/reactor/core/publisher/MonoHandleFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoHandleFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoHandleFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoHandleFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoHasElements.java b/reactor-core/src/main/java/reactor/core/publisher/MonoHasElements.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoHasElements.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoHasElements.java diff --git a/src/main/java/reactor/core/publisher/MonoHide.java b/reactor-core/src/main/java/reactor/core/publisher/MonoHide.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoHide.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoHide.java diff --git a/src/main/java/reactor/core/publisher/MonoIgnoreEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/MonoIgnoreEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoIgnoreEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoIgnoreEmpty.java diff --git a/src/main/java/reactor/core/publisher/MonoJust.java b/reactor-core/src/main/java/reactor/core/publisher/MonoJust.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoJust.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoJust.java diff --git a/src/main/java/reactor/core/publisher/MonoLog.java b/reactor-core/src/main/java/reactor/core/publisher/MonoLog.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoLog.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoLog.java diff --git a/src/main/java/reactor/core/publisher/MonoLogFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoLogFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoLogFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoLogFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoMap.java b/reactor-core/src/main/java/reactor/core/publisher/MonoMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoMap.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoMap.java diff --git a/src/main/java/reactor/core/publisher/MonoMapFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoMapFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoMapFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoMapFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoMaterialize.java b/reactor-core/src/main/java/reactor/core/publisher/MonoMaterialize.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoMaterialize.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoMaterialize.java diff --git a/src/main/java/reactor/core/publisher/MonoNever.java b/reactor-core/src/main/java/reactor/core/publisher/MonoNever.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoNever.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoNever.java diff --git a/src/main/java/reactor/core/publisher/MonoNext.java b/reactor-core/src/main/java/reactor/core/publisher/MonoNext.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoNext.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoNext.java diff --git a/src/main/java/reactor/core/publisher/MonoOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/MonoOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/MonoOnErrorResume.java b/reactor-core/src/main/java/reactor/core/publisher/MonoOnErrorResume.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoOnErrorResume.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoOnErrorResume.java diff --git a/src/main/java/reactor/core/publisher/MonoPeek.java b/reactor-core/src/main/java/reactor/core/publisher/MonoPeek.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoPeek.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoPeek.java diff --git a/src/main/java/reactor/core/publisher/MonoPeekFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoPeekFuseable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoPeekFuseable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoPeekFuseable.java diff --git a/src/main/java/reactor/core/publisher/MonoPeekTerminal.java b/reactor-core/src/main/java/reactor/core/publisher/MonoPeekTerminal.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoPeekTerminal.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoPeekTerminal.java diff --git a/src/main/java/reactor/core/publisher/MonoProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/MonoProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoProcessor.java diff --git a/src/main/java/reactor/core/publisher/MonoPublishOn.java b/reactor-core/src/main/java/reactor/core/publisher/MonoPublishOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoPublishOn.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoPublishOn.java diff --git a/src/main/java/reactor/core/publisher/MonoReduce.java b/reactor-core/src/main/java/reactor/core/publisher/MonoReduce.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoReduce.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoReduce.java diff --git a/src/main/java/reactor/core/publisher/MonoReduceSeed.java b/reactor-core/src/main/java/reactor/core/publisher/MonoReduceSeed.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoReduceSeed.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoReduceSeed.java diff --git a/src/main/java/reactor/core/publisher/MonoRetry.java b/reactor-core/src/main/java/reactor/core/publisher/MonoRetry.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoRetry.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoRetry.java diff --git a/src/main/java/reactor/core/publisher/MonoRetryPredicate.java b/reactor-core/src/main/java/reactor/core/publisher/MonoRetryPredicate.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoRetryPredicate.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoRetryPredicate.java diff --git a/src/main/java/reactor/core/publisher/MonoRetryWhen.java b/reactor-core/src/main/java/reactor/core/publisher/MonoRetryWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoRetryWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoRetryWhen.java diff --git a/src/main/java/reactor/core/publisher/MonoRunnable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoRunnable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoRunnable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoRunnable.java diff --git a/src/main/java/reactor/core/publisher/MonoSequenceEqual.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSequenceEqual.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSequenceEqual.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSequenceEqual.java diff --git a/src/main/java/reactor/core/publisher/MonoSingle.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSingle.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSingle.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSingle.java diff --git a/src/main/java/reactor/core/publisher/MonoSink.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSink.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSink.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSink.java diff --git a/src/main/java/reactor/core/publisher/MonoSource.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSource.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSource.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSource.java diff --git a/src/main/java/reactor/core/publisher/MonoStreamCollector.java b/reactor-core/src/main/java/reactor/core/publisher/MonoStreamCollector.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoStreamCollector.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoStreamCollector.java diff --git a/src/main/java/reactor/core/publisher/MonoSubscribeOn.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSubscribeOn.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOn.java diff --git a/src/main/java/reactor/core/publisher/MonoSubscribeOnCallable.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOnCallable.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSubscribeOnCallable.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOnCallable.java diff --git a/src/main/java/reactor/core/publisher/MonoSubscribeOnValue.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOnValue.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSubscribeOnValue.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSubscribeOnValue.java diff --git a/src/main/java/reactor/core/publisher/MonoSupplier.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSupplier.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSupplier.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSupplier.java diff --git a/src/main/java/reactor/core/publisher/MonoSwitchIfEmpty.java b/reactor-core/src/main/java/reactor/core/publisher/MonoSwitchIfEmpty.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoSwitchIfEmpty.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoSwitchIfEmpty.java diff --git a/src/main/java/reactor/core/publisher/MonoTakeLastOne.java b/reactor-core/src/main/java/reactor/core/publisher/MonoTakeLastOne.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoTakeLastOne.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoTakeLastOne.java diff --git a/src/main/java/reactor/core/publisher/MonoThenIgnore.java b/reactor-core/src/main/java/reactor/core/publisher/MonoThenIgnore.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoThenIgnore.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoThenIgnore.java diff --git a/src/main/java/reactor/core/publisher/MonoTimeout.java b/reactor-core/src/main/java/reactor/core/publisher/MonoTimeout.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoTimeout.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoTimeout.java diff --git a/src/main/java/reactor/core/publisher/MonoToCompletableFuture.java b/reactor-core/src/main/java/reactor/core/publisher/MonoToCompletableFuture.java similarity index 96% rename from src/main/java/reactor/core/publisher/MonoToCompletableFuture.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoToCompletableFuture.java index d765b7f041..c04c3bb067 100644 --- a/src/main/java/reactor/core/publisher/MonoToCompletableFuture.java +++ b/reactor-core/src/main/java/reactor/core/publisher/MonoToCompletableFuture.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/MonoUntilOther.java b/reactor-core/src/main/java/reactor/core/publisher/MonoUntilOther.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoUntilOther.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoUntilOther.java diff --git a/src/main/java/reactor/core/publisher/MonoUsing.java b/reactor-core/src/main/java/reactor/core/publisher/MonoUsing.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoUsing.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoUsing.java diff --git a/src/main/java/reactor/core/publisher/MonoWhen.java b/reactor-core/src/main/java/reactor/core/publisher/MonoWhen.java similarity index 100% rename from src/main/java/reactor/core/publisher/MonoWhen.java rename to reactor-core/src/main/java/reactor/core/publisher/MonoWhen.java diff --git a/src/main/java/reactor/core/publisher/MutableNextSignal.java b/reactor-core/src/main/java/reactor/core/publisher/MutableNextSignal.java similarity index 95% rename from src/main/java/reactor/core/publisher/MutableNextSignal.java rename to reactor-core/src/main/java/reactor/core/publisher/MutableNextSignal.java index 6718c65278..aad62d12f7 100644 --- a/src/main/java/reactor/core/publisher/MutableNextSignal.java +++ b/reactor-core/src/main/java/reactor/core/publisher/MutableNextSignal.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/publisher/Operators.java b/reactor-core/src/main/java/reactor/core/publisher/Operators.java similarity index 100% rename from src/main/java/reactor/core/publisher/Operators.java rename to reactor-core/src/main/java/reactor/core/publisher/Operators.java diff --git a/src/main/java/reactor/core/publisher/ParallelArraySource.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelArraySource.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelArraySource.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelArraySource.java diff --git a/src/main/java/reactor/core/publisher/ParallelCollect.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelCollect.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelCollect.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelCollect.java diff --git a/src/main/java/reactor/core/publisher/ParallelConcatMap.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelConcatMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelConcatMap.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelConcatMap.java diff --git a/src/main/java/reactor/core/publisher/ParallelFilter.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelFilter.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelFilter.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelFilter.java diff --git a/src/main/java/reactor/core/publisher/ParallelFlatMap.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelFlatMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelFlatMap.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelFlatMap.java diff --git a/src/main/java/reactor/core/publisher/ParallelFlux.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelFlux.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelFlux.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelFlux.java diff --git a/src/main/java/reactor/core/publisher/ParallelFluxHide.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelFluxHide.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelFluxHide.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelFluxHide.java diff --git a/src/main/java/reactor/core/publisher/ParallelFluxOnAssembly.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelFluxOnAssembly.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelFluxOnAssembly.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelFluxOnAssembly.java diff --git a/src/main/java/reactor/core/publisher/ParallelGroup.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelGroup.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelGroup.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelGroup.java diff --git a/src/main/java/reactor/core/publisher/ParallelLog.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelLog.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelLog.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelLog.java diff --git a/src/main/java/reactor/core/publisher/ParallelMap.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelMap.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelMap.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelMap.java diff --git a/src/main/java/reactor/core/publisher/ParallelMergeReduce.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelMergeReduce.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelMergeReduce.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelMergeReduce.java diff --git a/src/main/java/reactor/core/publisher/ParallelMergeSequential.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelMergeSequential.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelMergeSequential.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelMergeSequential.java diff --git a/src/main/java/reactor/core/publisher/ParallelMergeSort.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelMergeSort.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelMergeSort.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelMergeSort.java diff --git a/src/main/java/reactor/core/publisher/ParallelPeek.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelPeek.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelPeek.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelPeek.java diff --git a/src/main/java/reactor/core/publisher/ParallelReduceSeed.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelReduceSeed.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelReduceSeed.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelReduceSeed.java diff --git a/src/main/java/reactor/core/publisher/ParallelRunOn.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelRunOn.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelRunOn.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelRunOn.java diff --git a/src/main/java/reactor/core/publisher/ParallelSource.java b/reactor-core/src/main/java/reactor/core/publisher/ParallelSource.java similarity index 100% rename from src/main/java/reactor/core/publisher/ParallelSource.java rename to reactor-core/src/main/java/reactor/core/publisher/ParallelSource.java diff --git a/src/main/java/reactor/core/publisher/ReplayProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/ReplayProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/ReplayProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/ReplayProcessor.java diff --git a/src/main/java/reactor/core/publisher/RingBuffer.java b/reactor-core/src/main/java/reactor/core/publisher/RingBuffer.java similarity index 100% rename from src/main/java/reactor/core/publisher/RingBuffer.java rename to reactor-core/src/main/java/reactor/core/publisher/RingBuffer.java diff --git a/src/main/java/reactor/core/publisher/SerializedSubscriber.java b/reactor-core/src/main/java/reactor/core/publisher/SerializedSubscriber.java similarity index 100% rename from src/main/java/reactor/core/publisher/SerializedSubscriber.java rename to reactor-core/src/main/java/reactor/core/publisher/SerializedSubscriber.java diff --git a/src/main/java/reactor/core/publisher/Signal.java b/reactor-core/src/main/java/reactor/core/publisher/Signal.java similarity index 99% rename from src/main/java/reactor/core/publisher/Signal.java rename to reactor-core/src/main/java/reactor/core/publisher/Signal.java index b7411fc9ff..00dc4390fc 100644 --- a/src/main/java/reactor/core/publisher/Signal.java +++ b/reactor-core/src/main/java/reactor/core/publisher/Signal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/SignalLogger.java b/reactor-core/src/main/java/reactor/core/publisher/SignalLogger.java similarity index 100% rename from src/main/java/reactor/core/publisher/SignalLogger.java rename to reactor-core/src/main/java/reactor/core/publisher/SignalLogger.java diff --git a/src/main/java/reactor/core/publisher/SignalPeek.java b/reactor-core/src/main/java/reactor/core/publisher/SignalPeek.java similarity index 100% rename from src/main/java/reactor/core/publisher/SignalPeek.java rename to reactor-core/src/main/java/reactor/core/publisher/SignalPeek.java diff --git a/src/main/java/reactor/core/publisher/SignalPeekStateful.java b/reactor-core/src/main/java/reactor/core/publisher/SignalPeekStateful.java similarity index 100% rename from src/main/java/reactor/core/publisher/SignalPeekStateful.java rename to reactor-core/src/main/java/reactor/core/publisher/SignalPeekStateful.java diff --git a/src/main/java/reactor/core/publisher/SignalType.java b/reactor-core/src/main/java/reactor/core/publisher/SignalType.java similarity index 100% rename from src/main/java/reactor/core/publisher/SignalType.java rename to reactor-core/src/main/java/reactor/core/publisher/SignalType.java diff --git a/src/main/java/reactor/core/publisher/SynchronousSink.java b/reactor-core/src/main/java/reactor/core/publisher/SynchronousSink.java similarity index 95% rename from src/main/java/reactor/core/publisher/SynchronousSink.java rename to reactor-core/src/main/java/reactor/core/publisher/SynchronousSink.java index 4fb91b2e3d..4b8135735f 100644 --- a/src/main/java/reactor/core/publisher/SynchronousSink.java +++ b/reactor-core/src/main/java/reactor/core/publisher/SynchronousSink.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/publisher/TopicProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/TopicProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/TopicProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/TopicProcessor.java diff --git a/src/main/java/reactor/core/publisher/UnicastProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/UnicastProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/UnicastProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/UnicastProcessor.java diff --git a/src/main/java/reactor/core/publisher/WorkQueueProcessor.java b/reactor-core/src/main/java/reactor/core/publisher/WorkQueueProcessor.java similarity index 100% rename from src/main/java/reactor/core/publisher/WorkQueueProcessor.java rename to reactor-core/src/main/java/reactor/core/publisher/WorkQueueProcessor.java diff --git a/src/main/java/reactor/core/publisher/package-info.java b/reactor-core/src/main/java/reactor/core/publisher/package-info.java similarity index 96% rename from src/main/java/reactor/core/publisher/package-info.java rename to reactor-core/src/main/java/reactor/core/publisher/package-info.java index df4ae246e9..c84d2ec26f 100644 --- a/src/main/java/reactor/core/publisher/package-info.java +++ b/reactor-core/src/main/java/reactor/core/publisher/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/core/scheduler/DisposableContainer.java b/reactor-core/src/main/java/reactor/core/scheduler/DisposableContainer.java similarity index 97% rename from src/main/java/reactor/core/scheduler/DisposableContainer.java rename to reactor-core/src/main/java/reactor/core/scheduler/DisposableContainer.java index ad0e13af13..728fff95e9 100644 --- a/src/main/java/reactor/core/scheduler/DisposableContainer.java +++ b/reactor-core/src/main/java/reactor/core/scheduler/DisposableContainer.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/scheduler/ElasticScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/ElasticScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/ElasticScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/ElasticScheduler.java diff --git a/src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java b/reactor-core/src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java similarity index 94% rename from src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java rename to reactor-core/src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java index 1ec1f27547..82d9ae736a 100644 --- a/src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java +++ b/reactor-core/src/main/java/reactor/core/scheduler/EmptyDisposableContainer.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/scheduler/ExecutorScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/ExecutorScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/ExecutorScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/ExecutorScheduler.java diff --git a/src/main/java/reactor/core/scheduler/ExecutorServiceScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/ExecutorServiceScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/ExecutorServiceScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/ExecutorServiceScheduler.java diff --git a/src/main/java/reactor/core/scheduler/ImmediateScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/ImmediateScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/ImmediateScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/ImmediateScheduler.java diff --git a/src/main/java/reactor/core/scheduler/ParallelScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/ParallelScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/ParallelScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/ParallelScheduler.java diff --git a/src/main/java/reactor/core/scheduler/RejectedDisposable.java b/reactor-core/src/main/java/reactor/core/scheduler/RejectedDisposable.java similarity index 88% rename from src/main/java/reactor/core/scheduler/RejectedDisposable.java rename to reactor-core/src/main/java/reactor/core/scheduler/RejectedDisposable.java index 764b84078f..b208678082 100644 --- a/src/main/java/reactor/core/scheduler/RejectedDisposable.java +++ b/reactor-core/src/main/java/reactor/core/scheduler/RejectedDisposable.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/scheduler/ScheduledRunnable.java b/reactor-core/src/main/java/reactor/core/scheduler/ScheduledRunnable.java similarity index 98% rename from src/main/java/reactor/core/scheduler/ScheduledRunnable.java rename to reactor-core/src/main/java/reactor/core/scheduler/ScheduledRunnable.java index 33d038c90a..a75c8b80be 100644 --- a/src/main/java/reactor/core/scheduler/ScheduledRunnable.java +++ b/reactor-core/src/main/java/reactor/core/scheduler/ScheduledRunnable.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/reactor/core/scheduler/Scheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/Scheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/Scheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/Scheduler.java diff --git a/src/main/java/reactor/core/scheduler/Schedulers.java b/reactor-core/src/main/java/reactor/core/scheduler/Schedulers.java similarity index 100% rename from src/main/java/reactor/core/scheduler/Schedulers.java rename to reactor-core/src/main/java/reactor/core/scheduler/Schedulers.java diff --git a/src/main/java/reactor/core/scheduler/SingleScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/SingleScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/SingleScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/SingleScheduler.java diff --git a/src/main/java/reactor/core/scheduler/SingleWorkerScheduler.java b/reactor-core/src/main/java/reactor/core/scheduler/SingleWorkerScheduler.java similarity index 100% rename from src/main/java/reactor/core/scheduler/SingleWorkerScheduler.java rename to reactor-core/src/main/java/reactor/core/scheduler/SingleWorkerScheduler.java diff --git a/src/main/java/reactor/core/scheduler/package-info.java b/reactor-core/src/main/java/reactor/core/scheduler/package-info.java similarity index 100% rename from src/main/java/reactor/core/scheduler/package-info.java rename to reactor-core/src/main/java/reactor/core/scheduler/package-info.java diff --git a/src/main/java/reactor/util/Logger.java b/reactor-core/src/main/java/reactor/util/Logger.java similarity index 99% rename from src/main/java/reactor/util/Logger.java rename to reactor-core/src/main/java/reactor/util/Logger.java index 8418d8fc9c..2beeb0384f 100644 --- a/src/main/java/reactor/util/Logger.java +++ b/reactor-core/src/main/java/reactor/util/Logger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/Loggers.java b/reactor-core/src/main/java/reactor/util/Loggers.java similarity index 99% rename from src/main/java/reactor/util/Loggers.java rename to reactor-core/src/main/java/reactor/util/Loggers.java index 8aa4c3cc7a..fb27da7323 100644 --- a/src/main/java/reactor/util/Loggers.java +++ b/reactor-core/src/main/java/reactor/util/Loggers.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/concurrent/OpenHashSet.java b/reactor-core/src/main/java/reactor/util/concurrent/OpenHashSet.java similarity index 98% rename from src/main/java/reactor/util/concurrent/OpenHashSet.java rename to reactor-core/src/main/java/reactor/util/concurrent/OpenHashSet.java index 85015f289d..5cddb69706 100644 --- a/src/main/java/reactor/util/concurrent/OpenHashSet.java +++ b/reactor-core/src/main/java/reactor/util/concurrent/OpenHashSet.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/concurrent/QueueSupplier.java b/reactor-core/src/main/java/reactor/util/concurrent/QueueSupplier.java similarity index 99% rename from src/main/java/reactor/util/concurrent/QueueSupplier.java rename to reactor-core/src/main/java/reactor/util/concurrent/QueueSupplier.java index 6922f37313..60df4965e5 100644 --- a/src/main/java/reactor/util/concurrent/QueueSupplier.java +++ b/reactor-core/src/main/java/reactor/util/concurrent/QueueSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/concurrent/SpscArrayQueue.java b/reactor-core/src/main/java/reactor/util/concurrent/SpscArrayQueue.java similarity index 98% rename from src/main/java/reactor/util/concurrent/SpscArrayQueue.java rename to reactor-core/src/main/java/reactor/util/concurrent/SpscArrayQueue.java index a55efb6795..daccc784a6 100644 --- a/src/main/java/reactor/util/concurrent/SpscArrayQueue.java +++ b/reactor-core/src/main/java/reactor/util/concurrent/SpscArrayQueue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java b/reactor-core/src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java similarity index 98% rename from src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java rename to reactor-core/src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java index 987248b6e8..0bc8a7c885 100644 --- a/src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java +++ b/reactor-core/src/main/java/reactor/util/concurrent/SpscLinkedArrayQueue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/concurrent/WaitStrategy.java b/reactor-core/src/main/java/reactor/util/concurrent/WaitStrategy.java similarity index 100% rename from src/main/java/reactor/util/concurrent/WaitStrategy.java rename to reactor-core/src/main/java/reactor/util/concurrent/WaitStrategy.java diff --git a/src/main/java/reactor/util/concurrent/package-info.java b/reactor-core/src/main/java/reactor/util/concurrent/package-info.java similarity index 93% rename from src/main/java/reactor/util/concurrent/package-info.java rename to reactor-core/src/main/java/reactor/util/concurrent/package-info.java index ef7b19f41e..bc82423b8a 100644 --- a/src/main/java/reactor/util/concurrent/package-info.java +++ b/reactor-core/src/main/java/reactor/util/concurrent/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple2.java b/reactor-core/src/main/java/reactor/util/function/Tuple2.java similarity index 98% rename from src/main/java/reactor/util/function/Tuple2.java rename to reactor-core/src/main/java/reactor/util/function/Tuple2.java index a1115d7d53..59e5559fa1 100644 --- a/src/main/java/reactor/util/function/Tuple2.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple3.java b/reactor-core/src/main/java/reactor/util/function/Tuple3.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple3.java rename to reactor-core/src/main/java/reactor/util/function/Tuple3.java index 0c08dd1406..66d073a3f6 100644 --- a/src/main/java/reactor/util/function/Tuple3.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple4.java b/reactor-core/src/main/java/reactor/util/function/Tuple4.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple4.java rename to reactor-core/src/main/java/reactor/util/function/Tuple4.java index bc34fdba2a..cda2d1c229 100644 --- a/src/main/java/reactor/util/function/Tuple4.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple5.java b/reactor-core/src/main/java/reactor/util/function/Tuple5.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple5.java rename to reactor-core/src/main/java/reactor/util/function/Tuple5.java index dbc1ad1f00..647ab03a78 100644 --- a/src/main/java/reactor/util/function/Tuple5.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple6.java b/reactor-core/src/main/java/reactor/util/function/Tuple6.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple6.java rename to reactor-core/src/main/java/reactor/util/function/Tuple6.java index 865baa0efe..54586c3a98 100644 --- a/src/main/java/reactor/util/function/Tuple6.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple6.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple7.java b/reactor-core/src/main/java/reactor/util/function/Tuple7.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple7.java rename to reactor-core/src/main/java/reactor/util/function/Tuple7.java index 37ae27dc61..ff46c79bcb 100644 --- a/src/main/java/reactor/util/function/Tuple7.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple7.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuple8.java b/reactor-core/src/main/java/reactor/util/function/Tuple8.java similarity index 97% rename from src/main/java/reactor/util/function/Tuple8.java rename to reactor-core/src/main/java/reactor/util/function/Tuple8.java index 6c6920a4ad..a52e98bf3d 100644 --- a/src/main/java/reactor/util/function/Tuple8.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuple8.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/Tuples.java b/reactor-core/src/main/java/reactor/util/function/Tuples.java similarity index 99% rename from src/main/java/reactor/util/function/Tuples.java rename to reactor-core/src/main/java/reactor/util/function/Tuples.java index 17636d7486..b260edc111 100644 --- a/src/main/java/reactor/util/function/Tuples.java +++ b/reactor-core/src/main/java/reactor/util/function/Tuples.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/function/package-info.java b/reactor-core/src/main/java/reactor/util/function/package-info.java similarity index 91% rename from src/main/java/reactor/util/function/package-info.java rename to reactor-core/src/main/java/reactor/util/function/package-info.java index bbf42100e1..6f83ba6443 100644 --- a/src/main/java/reactor/util/function/package-info.java +++ b/reactor-core/src/main/java/reactor/util/function/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/reactor/util/package-info.java b/reactor-core/src/main/java/reactor/util/package-info.java similarity index 91% rename from src/main/java/reactor/util/package-info.java rename to reactor-core/src/main/java/reactor/util/package-info.java index e30dbb0aba..41029895e8 100644 --- a/src/main/java/reactor/util/package-info.java +++ b/reactor-core/src/main/java/reactor/util/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/HooksTest.java b/reactor-core/src/test/java/reactor/HooksTest.java similarity index 100% rename from src/test/java/reactor/HooksTest.java rename to reactor-core/src/test/java/reactor/HooksTest.java diff --git a/src/test/java/reactor/core/CoreTest.java b/reactor-core/src/test/java/reactor/core/CoreTest.java similarity index 100% rename from src/test/java/reactor/core/CoreTest.java rename to reactor-core/src/test/java/reactor/core/CoreTest.java diff --git a/src/test/java/reactor/core/ScannableTest.java b/reactor-core/src/test/java/reactor/core/ScannableTest.java similarity index 100% rename from src/test/java/reactor/core/ScannableTest.java rename to reactor-core/src/test/java/reactor/core/ScannableTest.java diff --git a/src/test/java/reactor/core/publisher/BaseSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/BaseSubscriberTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/BaseSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/BaseSubscriberTest.java diff --git a/src/test/java/reactor/core/publisher/BlockingIterableTest.java b/reactor-core/src/test/java/reactor/core/publisher/BlockingIterableTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/BlockingIterableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/BlockingIterableTest.java index 3285b48685..9d1731b662 100644 --- a/src/test/java/reactor/core/publisher/BlockingIterableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/BlockingIterableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java index 4fc4d273ca..ed63513abe 100644 --- a/src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/BlockingSingleSubscriberTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/BlockingTests.java b/reactor-core/src/test/java/reactor/core/publisher/BlockingTests.java similarity index 98% rename from src/test/java/reactor/core/publisher/BlockingTests.java rename to reactor-core/src/test/java/reactor/core/publisher/BlockingTests.java index e4a49b8eb3..d554428506 100644 --- a/src/test/java/reactor/core/publisher/BlockingTests.java +++ b/reactor-core/src/test/java/reactor/core/publisher/BlockingTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java b/reactor-core/src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java index e3a097c331..60988eee1f 100644 --- a/src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/ConnectableFluxOnAssemblyTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/DelegateProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/DelegateProcessorTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/DelegateProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/DelegateProcessorTest.java index 9739556cd9..6c4f81c624 100644 --- a/src/test/java/reactor/core/publisher/DelegateProcessorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/DelegateProcessorTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/DirectProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/DirectProcessorTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/DirectProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/DirectProcessorTest.java index 79431582fa..43bf2aabd5 100644 --- a/src/test/java/reactor/core/publisher/DirectProcessorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/DirectProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/DisposablesTest.java b/reactor-core/src/test/java/reactor/core/publisher/DisposablesTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/DisposablesTest.java rename to reactor-core/src/test/java/reactor/core/publisher/DisposablesTest.java diff --git a/src/test/java/reactor/core/publisher/EmitterProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/EmitterProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/EmitterProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/EmitterProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/EventLoopProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/EventLoopProcessorTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/EventLoopProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/EventLoopProcessorTest.java index e4c99322a5..759f751027 100644 --- a/src/test/java/reactor/core/publisher/EventLoopProcessorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/EventLoopProcessorTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxArrayTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxArrayTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxArrayTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxArrayTest.java index 6a4d4ff003..ddc7b06b11 100644 --- a/src/test/java/reactor/core/publisher/FluxArrayTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxArrayTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java index 66a54e4676..98ab86ad0e 100644 --- a/src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxAutoConnectFuseableTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxAutoConnectTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxAutoConnectTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxAutoConnectTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxAutoConnectTest.java diff --git a/src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java index d2cf064c48..343e9bf2be 100644 --- a/src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxAwaitOnSubscribeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxBufferBoundaryTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferBoundaryTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxBufferBoundaryTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxBufferBoundaryTest.java diff --git a/src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java index f8cf56681b..3a991f8650 100644 --- a/src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferPredicateTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxBufferTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxBufferTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxBufferTest.java index 9467f4cd08..8406859a65 100644 --- a/src/test/java/reactor/core/publisher/FluxBufferTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java index 96fe458e1d..66193cc200 100644 --- a/src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferTimeOrSizeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxBufferWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxBufferWhenTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxBufferWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxBufferWhenTest.java diff --git a/src/test/java/reactor/core/publisher/FluxCacheTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCacheTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxCacheTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCacheTest.java diff --git a/src/test/java/reactor/core/publisher/FluxCallableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCallableTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/FluxCallableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCallableTest.java index 04f87438c6..5c647c0629 100644 --- a/src/test/java/reactor/core/publisher/FluxCallableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxCallableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxCancelOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCancelOnTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxCancelOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCancelOnTest.java index 319d4c8295..c02bb47d5e 100644 --- a/src/test/java/reactor/core/publisher/FluxCancelOnTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxCancelOnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxCastTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCastTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxCastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCastTest.java diff --git a/src/test/java/reactor/core/publisher/FluxCombineLatestTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCombineLatestTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxCombineLatestTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCombineLatestTest.java diff --git a/src/test/java/reactor/core/publisher/FluxConcatArrayTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatArrayTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxConcatArrayTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxConcatArrayTest.java diff --git a/src/test/java/reactor/core/publisher/FluxConcatIterableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatIterableTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxConcatIterableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxConcatIterableTest.java index b56580ecfb..1ce7d78f0c 100644 --- a/src/test/java/reactor/core/publisher/FluxConcatIterableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatIterableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxConcatMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatMapTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxConcatMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxConcatMapTest.java index 54792b06a5..5264a8a92d 100644 --- a/src/test/java/reactor/core/publisher/FluxConcatMapTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxConcatWithTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatWithTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxConcatWithTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxConcatWithTest.java index 56372e7f69..2cf30a204a 100644 --- a/src/test/java/reactor/core/publisher/FluxConcatWithTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxConcatWithTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxCreateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxCreateTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxCreateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxCreateTest.java diff --git a/src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java index c80886eec1..e864e2f8d0 100644 --- a/src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDefaultIfEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDeferComposeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDeferComposeTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxDeferComposeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDeferComposeTest.java index 4168f6918b..b0588ca7c7 100644 --- a/src/test/java/reactor/core/publisher/FluxDeferComposeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDeferComposeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDeferTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDeferTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxDeferTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDeferTest.java diff --git a/src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java index 45bebc71b6..1637adc9cf 100644 --- a/src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDelaySubscriptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDematerializeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDematerializeTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxDematerializeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDematerializeTest.java index 615b106f84..db503fb3ac 100644 --- a/src/test/java/reactor/core/publisher/FluxDematerializeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDematerializeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDetachTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDetachTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxDetachTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDetachTest.java index 2ff70bec80..4dabefab74 100644 --- a/src/test/java/reactor/core/publisher/FluxDetachTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDetachTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDistinctTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDistinctTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxDistinctTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDistinctTest.java index 4669700499..ec8cf469cc 100644 --- a/src/test/java/reactor/core/publisher/FluxDistinctTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDistinctTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java index 201541bd83..7dcd4423af 100644 --- a/src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDistinctUntilChangedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxDoFinallyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxDoFinallyTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxDoFinallyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxDoFinallyTest.java index a3586d5511..473df8eac0 100644 --- a/src/test/java/reactor/core/publisher/FluxDoFinallyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxDoFinallyTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxElapsedTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxElapsedTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/FluxElapsedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxElapsedTest.java index 3015417f98..8ed1a279b1 100644 --- a/src/test/java/reactor/core/publisher/FluxElapsedTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxElapsedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxEmptyTest.java similarity index 92% rename from src/test/java/reactor/core/publisher/FluxEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxEmptyTest.java index 064b2e0958..9faf020f99 100644 --- a/src/test/java/reactor/core/publisher/FluxEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxErrorTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxErrorTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxErrorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxErrorTest.java index 87d840639c..0f6e88f9dd 100644 --- a/src/test/java/reactor/core/publisher/FluxErrorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java index 11126303ee..933a33b94d 100644 --- a/src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterFuseableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxFilterTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxFilterTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFilterTest.java index fcb60a1319..b44d5805b9 100644 --- a/src/test/java/reactor/core/publisher/FluxFilterTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxFilterWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterWhenTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxFilterWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFilterWhenTest.java index 280d33e9a5..a20a5466a6 100644 --- a/src/test/java/reactor/core/publisher/FluxFilterWhenTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFilterWhenTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java index 2d850281d7..4864770db3 100644 --- a/src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java index 059ef3b30a..1983ac6d9e 100644 --- a/src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFirstEmittingWithTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxFlatMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFlatMapTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxFlatMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFlatMapTest.java diff --git a/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java index b2a8afe3aa..7bcc4218b8 100644 --- a/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxGenerateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxGenerateTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxGenerateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxGenerateTest.java index 108eb7335e..4eb7bcad3a 100644 --- a/src/test/java/reactor/core/publisher/FluxGenerateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxGenerateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxGroupByTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxGroupByTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxGroupByTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxGroupByTest.java index b0a466da05..900258ae80 100644 --- a/src/test/java/reactor/core/publisher/FluxGroupByTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxGroupByTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxGroupJoinTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxGroupJoinTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxGroupJoinTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxGroupJoinTest.java index 6d49052e63..8d7a8d0c37 100644 --- a/src/test/java/reactor/core/publisher/FluxGroupJoinTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxGroupJoinTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxHandleTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxHandleTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxHandleTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxHandleTest.java index b05279b838..4489523c61 100644 --- a/src/test/java/reactor/core/publisher/FluxHandleTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxHandleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxHideTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxHideTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxHideTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxHideTest.java diff --git a/src/test/java/reactor/core/publisher/FluxIntervalTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxIntervalTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxIntervalTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxIntervalTest.java diff --git a/src/test/java/reactor/core/publisher/FluxIterableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxIterableTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxIterableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxIterableTest.java index c833a0f92d..793ea18fb4 100644 --- a/src/test/java/reactor/core/publisher/FluxIterableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxIterableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxJoinTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxJoinTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxJoinTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxJoinTest.java index 93257a86d4..5c3f0ce4b1 100644 --- a/src/test/java/reactor/core/publisher/FluxJoinTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxJoinTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxJustTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxJustTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxJustTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxJustTest.java index 33f6a00f23..83e702ed90 100644 --- a/src/test/java/reactor/core/publisher/FluxJustTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxJustTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxMapSignalTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMapSignalTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxMapSignalTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMapSignalTest.java index b2b800e5d0..38f500a243 100644 --- a/src/test/java/reactor/core/publisher/FluxMapSignalTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMapSignalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMapTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMapTest.java index f75bd30f94..f850bb673e 100644 --- a/src/test/java/reactor/core/publisher/FluxMapTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxMaterializeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMaterializeTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxMaterializeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMaterializeTest.java index 4169f86683..3041d415ff 100644 --- a/src/test/java/reactor/core/publisher/FluxMaterializeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMaterializeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java index e11a0371c8..48739c9018 100644 --- a/src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeSequentialTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxMergeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxMergeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMergeTest.java index a3c6292b02..6215f2961f 100644 --- a/src/test/java/reactor/core/publisher/FluxMergeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxMergeWithTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeWithTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxMergeWithTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxMergeWithTest.java index e50fe6ed37..d370d930ec 100644 --- a/src/test/java/reactor/core/publisher/FluxMergeWithTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeWithTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/reactor-core/src/test/java/reactor/core/publisher/FluxNeverTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxNeverTest.java new file mode 100644 index 0000000000..343dd3d88c --- /dev/null +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxNeverTest.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package reactor.core.publisher; + +import org.junit.Assert; +import org.junit.Test; +import reactor.test.subscriber.AssertSubscriber; + +public class FluxNeverTest { + + @Test + public void singleInstance() { + Assert.assertSame(Flux.never(), Flux.never()); + } + + @Test + public void normal() { + AssertSubscriber ts = AssertSubscriber.create(); + + FluxNever.instance().subscribe(ts); + + ts + .assertSubscribed() + .assertNoValues() + .assertNoError() + .assertNotComplete(); + } +} diff --git a/src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java index 9de0db7f9e..be28857874 100644 --- a/src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxOnAssemblyTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java index 1c5d2b67cf..1c815b8edb 100644 --- a/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferStrategyTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java index 9084028342..61475a94ee 100644 --- a/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureBufferTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxOnBackpressureDropTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureDropTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxOnBackpressureDropTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureDropTest.java diff --git a/src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java index dceb17c4b0..9519abd79c 100644 --- a/src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxOnBackpressureLatestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxOnErrorResumeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxOnErrorResumeTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxOnErrorResumeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxOnErrorResumeTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPeekFuseableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPeekFuseableTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPeekFuseableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPeekFuseableTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPeekStatefulTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPeekStatefulTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPeekStatefulTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPeekStatefulTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPeekTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPeekTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPeekTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPeekTest.java diff --git a/src/test/java/reactor/core/publisher/FluxProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPublishMulticastTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPublishMulticastTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPublishMulticastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPublishMulticastTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPublishOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPublishOnTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPublishOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPublishOnTest.java diff --git a/src/test/java/reactor/core/publisher/FluxPublishTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxPublishTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxPublishTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxPublishTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRangeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRangeTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxRangeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRangeTest.java index 0fada3f6d1..4f3f02a8ef 100644 --- a/src/test/java/reactor/core/publisher/FluxRangeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxRangeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxRefCountGraceTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRefCountGraceTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxRefCountGraceTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRefCountGraceTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRefCountTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRefCountTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxRefCountTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRefCountTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRepeatPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRepeatPredicateTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxRepeatPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRepeatPredicateTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRepeatTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRepeatTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxRepeatTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRepeatTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRepeatWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRepeatWhenTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxRepeatWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRepeatWhenTest.java diff --git a/src/test/java/reactor/core/publisher/FluxReplayTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxReplayTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxReplayTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxReplayTest.java diff --git a/src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java index 97b7553178..56ade8fae3 100644 --- a/src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryPredicateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxRetryTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxRetryTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRetryTest.java index 5a860b3dc8..1de4be2826 100644 --- a/src/test/java/reactor/core/publisher/FluxRetryTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxRetryWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryWhenTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxRetryWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxRetryWhenTest.java index 8d3ba55dd5..1ef8fc90be 100644 --- a/src/test/java/reactor/core/publisher/FluxRetryWhenTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxRetryWhenTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSampleFirstTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleFirstTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxSampleFirstTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSampleFirstTest.java index 894cef95e8..362beb7f77 100644 --- a/src/test/java/reactor/core/publisher/FluxSampleFirstTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleFirstTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSampleTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSampleTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSampleTest.java index 5714313218..deacf7ad6a 100644 --- a/src/test/java/reactor/core/publisher/FluxSampleTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java index f4e9fe4ab2..585e8c1a71 100644 --- a/src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSampleTimeoutTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxScanSeedTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxScanSeedTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxScanSeedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxScanSeedTest.java index 59f1c82416..f0d70b11e6 100644 --- a/src/test/java/reactor/core/publisher/FluxScanSeedTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxScanSeedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxScanTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxScanTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxScanTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxScanTest.java index ec87e71794..6e3bca3c7f 100644 --- a/src/test/java/reactor/core/publisher/FluxScanTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxScanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSkipLastTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipLastTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSkipLastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSkipLastTest.java index 2bd10a141c..55fc34a10f 100644 --- a/src/test/java/reactor/core/publisher/FluxSkipLastTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipLastTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSkipTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSkipTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSkipTest.java index eae92ab863..2539665182 100644 --- a/src/test/java/reactor/core/publisher/FluxSkipTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java index f95432443b..cc25f49cbe 100644 --- a/src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilOtherTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSkipUntilTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxSkipUntilTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilTest.java index 841d33856b..1c8300a946 100644 --- a/src/test/java/reactor/core/publisher/FluxSkipUntilTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipUntilTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSkipWhileTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipWhileTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSkipWhileTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSkipWhileTest.java index 491d7919b4..acbdabdf27 100644 --- a/src/test/java/reactor/core/publisher/FluxSkipWhileTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSkipWhileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSourceTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSourceTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxSourceTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSourceTest.java diff --git a/src/test/java/reactor/core/publisher/FluxStartWithTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxStartWithTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxStartWithTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxStartWithTest.java index c1ca7a71e0..63dbd184f9 100644 --- a/src/test/java/reactor/core/publisher/FluxStartWithTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxStartWithTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxStreamTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxStreamTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxStreamTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxStreamTest.java index 32ae5de71b..30ca642e0b 100644 --- a/src/test/java/reactor/core/publisher/FluxStreamTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxStreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java index 355845b95a..37159515c9 100644 --- a/src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnCallableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java index f14ef8cc5e..b0d111f0b1 100644 --- a/src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSubscribeOnValueTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnValueTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxSubscribeOnValueTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSubscribeOnValueTest.java diff --git a/src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java index 60bdf3dd59..a66bfda6ea 100644 --- a/src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSwitchIfEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSwitchMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSwitchMapTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxSwitchMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSwitchMapTest.java index 5d2ed7f196..5f787dcf94 100644 --- a/src/test/java/reactor/core/publisher/FluxSwitchMapTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxSwitchMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxSwitchOnNextTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxSwitchOnNextTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxSwitchOnNextTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxSwitchOnNextTest.java diff --git a/src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java index 463c7230b5..5094c15df7 100644 --- a/src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastOneTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxTakeLastTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxTakeLastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastTest.java index be2e4acce3..9c1ee5c59b 100644 --- a/src/test/java/reactor/core/publisher/FluxTakeLastTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeLastTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxTakeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxTakeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeTest.java diff --git a/src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java index 5f2841332a..ab5d213f83 100644 --- a/src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilOtherTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java index 65f37d09c1..ba5d96f3a6 100644 --- a/src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeUntilPredicateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxTakeWhileTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeWhileTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxTakeWhileTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTakeWhileTest.java index 80355307b9..e9547be714 100644 --- a/src/test/java/reactor/core/publisher/FluxTakeWhileTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxTakeWhileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxThenManyTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxThenManyTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/FluxThenManyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxThenManyTest.java index 43ffd93485..05e409642f 100644 --- a/src/test/java/reactor/core/publisher/FluxThenManyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxThenManyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxTimeoutTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTimeoutTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxTimeoutTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTimeoutTest.java diff --git a/src/test/java/reactor/core/publisher/FluxTimestampTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxTimestampTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxTimestampTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxTimestampTest.java diff --git a/src/test/java/reactor/core/publisher/FluxUsingTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxUsingTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxUsingTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxUsingTest.java diff --git a/src/test/java/reactor/core/publisher/FluxWindowBoundaryTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowBoundaryTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxWindowBoundaryTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWindowBoundaryTest.java diff --git a/src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java index 8d5b0bcc0f..a047a49d10 100644 --- a/src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowPredicateTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/FluxWindowTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxWindowTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWindowTest.java diff --git a/src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java index 73ee59125e..f6a41f394d 100644 --- a/src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowTimeOrSizeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxWindowWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWindowWhenTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxWindowWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWindowWhenTest.java diff --git a/src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java index 1a2da24a68..292a5d2681 100644 --- a/src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxWithLatestFromTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxZipIterableTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxZipIterableTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/FluxZipIterableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxZipIterableTest.java index 493bbf6604..dc90f8ea8e 100644 --- a/src/test/java/reactor/core/publisher/FluxZipIterableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/FluxZipIterableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/FluxZipTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxZipTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/FluxZipTest.java rename to reactor-core/src/test/java/reactor/core/publisher/FluxZipTest.java diff --git a/src/test/java/reactor/core/publisher/InnerProducerTest.java b/reactor-core/src/test/java/reactor/core/publisher/InnerProducerTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/InnerProducerTest.java rename to reactor-core/src/test/java/reactor/core/publisher/InnerProducerTest.java index dd3ed9f6cc..a0901c2581 100644 --- a/src/test/java/reactor/core/publisher/InnerProducerTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/InnerProducerTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/LambdaMonoSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/LambdaMonoSubscriberTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/LambdaMonoSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/LambdaMonoSubscriberTest.java diff --git a/src/test/java/reactor/core/publisher/LambdaSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/LambdaSubscriberTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/LambdaSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/LambdaSubscriberTest.java index 093238ba2c..e571a5c36b 100644 --- a/src/test/java/reactor/core/publisher/LambdaSubscriberTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/LambdaSubscriberTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoAllTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoAllTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoAllTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoAllTest.java index 03d7271f0d..300ffd2bff 100644 --- a/src/test/java/reactor/core/publisher/MonoAllTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoAllTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoAnyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoAnyTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoAnyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoAnyTest.java index 468cd907f7..bb1aae5695 100644 --- a/src/test/java/reactor/core/publisher/MonoAnyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoAnyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java index e7ffec576b..5b8e993518 100644 --- a/src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoAwaitOnSubscribeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCallableTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCallableTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoCallableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCallableTest.java index d1faec7921..5a2fae7d32 100644 --- a/src/test/java/reactor/core/publisher/MonoCallableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoCallableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCancelOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCancelOnTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoCancelOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCancelOnTest.java index 14e3d4972f..691ecf7a3e 100644 --- a/src/test/java/reactor/core/publisher/MonoCancelOnTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoCancelOnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCastTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCastTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoCastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCastTest.java diff --git a/src/test/java/reactor/core/publisher/MonoCollectListTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCollectListTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoCollectListTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCollectListTest.java index dd2ca6bfd5..d1e9338bbf 100644 --- a/src/test/java/reactor/core/publisher/MonoCollectListTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoCollectListTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCollectMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCollectMapTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoCollectMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCollectMapTest.java diff --git a/src/test/java/reactor/core/publisher/MonoCollectTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCollectTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoCollectTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCollectTest.java diff --git a/src/test/java/reactor/core/publisher/MonoCompletionStageTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCompletionStageTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoCompletionStageTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCompletionStageTest.java index 51feb6611b..a114acd27c 100644 --- a/src/test/java/reactor/core/publisher/MonoCompletionStageTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoCompletionStageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCountTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCountTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoCountTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCountTest.java index 3ece7e9feb..aa0f9518b2 100644 --- a/src/test/java/reactor/core/publisher/MonoCountTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoCountTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoCreateTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoCreateTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoCreateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoCreateTest.java diff --git a/src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java index eee6df4305..eff7f17293 100644 --- a/src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDefaultIfEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDeferComposeTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDeferComposeTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoDeferComposeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDeferComposeTest.java index 60ab476203..e27174f0f3 100644 --- a/src/test/java/reactor/core/publisher/MonoDeferComposeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDeferComposeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDeferTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDeferTest.java similarity index 94% rename from src/test/java/reactor/core/publisher/MonoDeferTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDeferTest.java index 7a154644dd..1bd370bc0d 100644 --- a/src/test/java/reactor/core/publisher/MonoDeferTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDeferTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDelayElementTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDelayElementTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoDelayElementTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDelayElementTest.java diff --git a/src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java index aa9f09b441..c2168f5813 100644 --- a/src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDelaySubscriptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDelayTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDelayTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoDelayTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDelayTest.java index 87b22b4260..49897cf584 100644 --- a/src/test/java/reactor/core/publisher/MonoDelayTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDelayTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDelayUntilTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDelayUntilTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoDelayUntilTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDelayUntilTest.java index 581bc899d3..ad6e00bade 100644 --- a/src/test/java/reactor/core/publisher/MonoDelayUntilTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDelayUntilTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoDematerializeTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDematerializeTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoDematerializeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDematerializeTest.java index 478cbd5f45..2486cc2a63 100644 --- a/src/test/java/reactor/core/publisher/MonoDematerializeTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDematerializeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDetachTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDetachTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoDetachTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDetachTest.java index 8041e2819f..2d735fab7e 100644 --- a/src/test/java/reactor/core/publisher/MonoDetachTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDetachTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoDoFinallyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoDoFinallyTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoDoFinallyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoDoFinallyTest.java index dba42affc6..355807859a 100644 --- a/src/test/java/reactor/core/publisher/MonoDoFinallyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoDoFinallyTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoElapsedTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoElapsedTest.java similarity index 94% rename from src/test/java/reactor/core/publisher/MonoElapsedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoElapsedTest.java index ed9e4ee6c2..af48707506 100644 --- a/src/test/java/reactor/core/publisher/MonoElapsedTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoElapsedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoElementAtTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoElementAtTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoElementAtTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoElementAtTest.java diff --git a/src/test/java/reactor/core/publisher/MonoEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoEmptyTest.java similarity index 92% rename from src/test/java/reactor/core/publisher/MonoEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoEmptyTest.java index 20a4ec3482..156dab3bfa 100644 --- a/src/test/java/reactor/core/publisher/MonoEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoErrorTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoErrorTest.java similarity index 93% rename from src/test/java/reactor/core/publisher/MonoErrorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoErrorTest.java index 9be8e25a7b..befee1c0d8 100644 --- a/src/test/java/reactor/core/publisher/MonoErrorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoFilterTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoFilterTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoFilterTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoFilterTest.java index dab759a76c..8ba86e9dfa 100644 --- a/src/test/java/reactor/core/publisher/MonoFilterTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoFilterWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoFilterWhenTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoFilterWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoFilterWhenTest.java index 0156c849ed..241c36f767 100644 --- a/src/test/java/reactor/core/publisher/MonoFilterWhenTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoFilterWhenTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoFirstTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoFirstTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoFirstTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoFirstTest.java index 092c8609cc..6210ce6c76 100644 --- a/src/test/java/reactor/core/publisher/MonoFirstTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoFirstTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java index 65a2887c17..6c899240fe 100644 --- a/src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapManyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoFlatMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapTest.java similarity index 81% rename from src/test/java/reactor/core/publisher/MonoFlatMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapTest.java index e6c5b6b948..334d3f20ce 100644 --- a/src/test/java/reactor/core/publisher/MonoFlatMapTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoFlatMapTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package reactor.core.publisher; import org.junit.Test; diff --git a/src/test/java/reactor/core/publisher/MonoHandleTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoHandleTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoHandleTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoHandleTest.java index 648d6abd06..8b942b544b 100644 --- a/src/test/java/reactor/core/publisher/MonoHandleTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoHandleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoHasElementsTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoHasElementsTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoHasElementsTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoHasElementsTest.java diff --git a/src/test/java/reactor/core/publisher/MonoHideTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoHideTest.java similarity index 94% rename from src/test/java/reactor/core/publisher/MonoHideTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoHideTest.java index 81dd8e325c..2c92f3e7b3 100644 --- a/src/test/java/reactor/core/publisher/MonoHideTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoHideTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoIgnoreEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoIgnoreEmptyTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoIgnoreEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoIgnoreEmptyTest.java diff --git a/src/test/java/reactor/core/publisher/MonoJustTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoJustTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoJustTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoJustTest.java index 853329dbef..11e74c04e6 100644 --- a/src/test/java/reactor/core/publisher/MonoJustTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoJustTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoMapTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoMapTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoMapTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoMapTest.java index 99c027d47d..15c4fd829f 100644 --- a/src/test/java/reactor/core/publisher/MonoMapTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoMaterializeTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoMaterializeTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoMaterializeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoMaterializeTest.java diff --git a/src/test/java/reactor/core/publisher/MonoNeverTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoNeverTest.java similarity index 93% rename from src/test/java/reactor/core/publisher/MonoNeverTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoNeverTest.java index 19199360c1..9d0b742122 100644 --- a/src/test/java/reactor/core/publisher/MonoNeverTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoNeverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoNextTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoNextTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoNextTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoNextTest.java index 613d80766a..adbc64fae2 100644 --- a/src/test/java/reactor/core/publisher/MonoNextTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoNextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoOnErrorResumeTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoOnErrorResumeTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoOnErrorResumeTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoOnErrorResumeTest.java diff --git a/src/test/java/reactor/core/publisher/MonoPeekAfterTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekAfterTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoPeekAfterTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoPeekAfterTest.java index dbe27872e9..600403b74c 100644 --- a/src/test/java/reactor/core/publisher/MonoPeekAfterTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekAfterTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java index f15b04339f..c9ed6d966d 100644 --- a/src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekTerminalTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoPeekTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoPeekTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoPeekTest.java index e23a603f4b..6bf2abba3c 100644 --- a/src/test/java/reactor/core/publisher/MonoPeekTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoPeekTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/MonoPublishMulticastTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoPublishMulticastTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoPublishMulticastTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoPublishMulticastTest.java diff --git a/src/test/java/reactor/core/publisher/MonoPublishOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoPublishOnTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoPublishOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoPublishOnTest.java index ddbf79a6ad..5ab51831d4 100644 --- a/src/test/java/reactor/core/publisher/MonoPublishOnTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoPublishOnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoReduceSeedTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoReduceSeedTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoReduceSeedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoReduceSeedTest.java diff --git a/src/test/java/reactor/core/publisher/MonoReduceTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoReduceTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoReduceTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoReduceTest.java index 4103e965ce..ffe1b84aaa 100644 --- a/src/test/java/reactor/core/publisher/MonoReduceTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoReduceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoRepeatTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRepeatTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoRepeatTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRepeatTest.java diff --git a/src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java index e1e38aeb58..ca03b70a78 100644 --- a/src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoRepeatWhenEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java index b9735b8988..ab9036a556 100644 --- a/src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryPredicateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoRetryTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoRetryTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRetryTest.java index a304505e4e..f6db02b6b1 100644 --- a/src/test/java/reactor/core/publisher/MonoRetryTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoRetryWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryWhenTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoRetryWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRetryWhenTest.java index d8fcb95a1b..7409717cc5 100644 --- a/src/test/java/reactor/core/publisher/MonoRetryWhenTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoRetryWhenTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoRunnableTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoRunnableTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoRunnableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoRunnableTest.java diff --git a/src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java index 5010402333..4ed77ae2c4 100644 --- a/src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSequenceEqualTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoSingleTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSingleTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoSingleTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSingleTest.java diff --git a/src/test/java/reactor/core/publisher/MonoSourceTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSourceTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoSourceTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSourceTest.java diff --git a/src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java index 1485b270d4..b1441d5464 100644 --- a/src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoStreamCollectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java similarity index 96% rename from src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java index cf7d906682..c8b832e03e 100644 --- a/src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnCallableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java index a4b8b8b08c..881b903c58 100644 --- a/src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java index 847d3b8b32..b81d0d4ab8 100644 --- a/src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscribeOnValueTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscriberTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSubscriberTest.java index 86400ff7d4..331bf0006d 100644 --- a/src/test/java/reactor/core/publisher/MonoSubscriberTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSubscriberTest.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoSupplierTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSupplierTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoSupplierTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSupplierTest.java diff --git a/src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java index 3f4288a3ad..693b0780b8 100644 --- a/src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoSwitchIfEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoTakeLastOneTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoTakeLastOneTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoTakeLastOneTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoTakeLastOneTest.java diff --git a/src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java index 2361f5bb67..4c00538f7c 100644 --- a/src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoThenIgnoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoThenMany.java b/reactor-core/src/test/java/reactor/core/publisher/MonoThenMany.java similarity index 96% rename from src/test/java/reactor/core/publisher/MonoThenMany.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoThenMany.java index af019df283..0dc52fd58d 100644 --- a/src/test/java/reactor/core/publisher/MonoThenMany.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoThenMany.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoTimeoutTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoTimeoutTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoTimeoutTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoTimeoutTest.java index 9e295dd3ca..86fbaf49d9 100644 --- a/src/test/java/reactor/core/publisher/MonoTimeoutTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoTimeoutTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoTimestampTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoTimestampTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoTimestampTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoTimestampTest.java diff --git a/src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java similarity index 95% rename from src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java index 299aec5a42..7ac3f93522 100644 --- a/src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoToCompletableFutureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoUntilOtherTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoUntilOtherTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoUntilOtherTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoUntilOtherTest.java index 8d00cb5c5a..b8ebf8a087 100644 --- a/src/test/java/reactor/core/publisher/MonoUntilOtherTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoUntilOtherTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/MonoUsingTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoUsingTest.java similarity index 98% rename from src/test/java/reactor/core/publisher/MonoUsingTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoUsingTest.java index e43423078d..4345157654 100644 --- a/src/test/java/reactor/core/publisher/MonoUsingTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoUsingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoWhenTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoWhenTest.java similarity index 99% rename from src/test/java/reactor/core/publisher/MonoWhenTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoWhenTest.java index 2ae97bc53d..8ab975398e 100644 --- a/src/test/java/reactor/core/publisher/MonoWhenTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/MonoWhenTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/MonoZipTest.java b/reactor-core/src/test/java/reactor/core/publisher/MonoZipTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/MonoZipTest.java rename to reactor-core/src/test/java/reactor/core/publisher/MonoZipTest.java diff --git a/src/test/java/reactor/core/publisher/OperatorsTest.java b/reactor-core/src/test/java/reactor/core/publisher/OperatorsTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/OperatorsTest.java rename to reactor-core/src/test/java/reactor/core/publisher/OperatorsTest.java diff --git a/src/test/java/reactor/core/publisher/ParallelCollectTest.java b/reactor-core/src/test/java/reactor/core/publisher/ParallelCollectTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/ParallelCollectTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ParallelCollectTest.java diff --git a/src/test/java/reactor/core/publisher/ParallelFluxTest.java b/reactor-core/src/test/java/reactor/core/publisher/ParallelFluxTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/ParallelFluxTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ParallelFluxTest.java diff --git a/src/test/java/reactor/core/publisher/ParallelMergeReduceTest.java b/reactor-core/src/test/java/reactor/core/publisher/ParallelMergeReduceTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/ParallelMergeReduceTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ParallelMergeReduceTest.java diff --git a/src/test/java/reactor/core/publisher/ParallelReduceSeedTest.java b/reactor-core/src/test/java/reactor/core/publisher/ParallelReduceSeedTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/ParallelReduceSeedTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ParallelReduceSeedTest.java diff --git a/src/test/java/reactor/core/publisher/ReplayProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/ReplayProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/ReplayProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/ReplayProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/SequentialDisposableTest.java b/reactor-core/src/test/java/reactor/core/publisher/SequentialDisposableTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/SequentialDisposableTest.java rename to reactor-core/src/test/java/reactor/core/publisher/SequentialDisposableTest.java diff --git a/src/test/java/reactor/core/publisher/SerializedSubscriberTest.java b/reactor-core/src/test/java/reactor/core/publisher/SerializedSubscriberTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/SerializedSubscriberTest.java rename to reactor-core/src/test/java/reactor/core/publisher/SerializedSubscriberTest.java index 34d23d0b21..ce028991de 100644 --- a/src/test/java/reactor/core/publisher/SerializedSubscriberTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/SerializedSubscriberTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/core/publisher/SignalLoggerTests.java b/reactor-core/src/test/java/reactor/core/publisher/SignalLoggerTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/SignalLoggerTests.java rename to reactor-core/src/test/java/reactor/core/publisher/SignalLoggerTests.java diff --git a/src/test/java/reactor/core/publisher/SignalTest.java b/reactor-core/src/test/java/reactor/core/publisher/SignalTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/SignalTest.java rename to reactor-core/src/test/java/reactor/core/publisher/SignalTest.java diff --git a/src/test/java/reactor/core/publisher/TopicProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/TopicProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/TopicProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/TopicProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/UnicastProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/UnicastProcessorTest.java similarity index 97% rename from src/test/java/reactor/core/publisher/UnicastProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/UnicastProcessorTest.java index 2fa8fe3264..d9fec5aa96 100644 --- a/src/test/java/reactor/core/publisher/UnicastProcessorTest.java +++ b/reactor-core/src/test/java/reactor/core/publisher/UnicastProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/WorkQueueProcessorTest.java b/reactor-core/src/test/java/reactor/core/publisher/WorkQueueProcessorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/WorkQueueProcessorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/WorkQueueProcessorTest.java diff --git a/src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java b/reactor-core/src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java similarity index 94% rename from src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java rename to reactor-core/src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java index c892acbadd..4eb7a471cd 100644 --- a/src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java +++ b/reactor-core/src/test/java/reactor/core/publisher/loop/FluxGroupByLoop.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/loop/FluxPublishOnLoop.java b/reactor-core/src/test/java/reactor/core/publisher/loop/FluxPublishOnLoop.java similarity index 100% rename from src/test/java/reactor/core/publisher/loop/FluxPublishOnLoop.java rename to reactor-core/src/test/java/reactor/core/publisher/loop/FluxPublishOnLoop.java diff --git a/src/test/java/reactor/core/publisher/scenarios/AbstractReactorTest.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/AbstractReactorTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/AbstractReactorTest.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/AbstractReactorTest.java diff --git a/src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java similarity index 98% rename from src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java index c1f20725ac..dcfb70961e 100644 --- a/src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java +++ b/reactor-core/src/test/java/reactor/core/publisher/scenarios/BurstyWorkQueueProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/scenarios/CombinationTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/CombinationTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/CombinationTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/CombinationTests.java diff --git a/src/test/java/reactor/core/publisher/scenarios/ConsistentProcessorTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/ConsistentProcessorTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/ConsistentProcessorTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/ConsistentProcessorTests.java diff --git a/src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java similarity index 98% rename from src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java index 2d3df84fa2..2b6ef3c9e6 100644 --- a/src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java +++ b/reactor-core/src/test/java/reactor/core/publisher/scenarios/FizzBuzzTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/scenarios/FluxSpecTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxSpecTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/FluxSpecTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxSpecTests.java diff --git a/src/test/java/reactor/core/publisher/scenarios/FluxTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/FluxTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxTests.java diff --git a/src/test/java/reactor/core/publisher/scenarios/FluxWindowConsistencyTest.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxWindowConsistencyTest.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/FluxWindowConsistencyTest.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/FluxWindowConsistencyTest.java diff --git a/src/test/java/reactor/core/publisher/scenarios/MonoTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/MonoTests.java similarity index 100% rename from src/test/java/reactor/core/publisher/scenarios/MonoTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/MonoTests.java diff --git a/src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java similarity index 97% rename from src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java index 973eb9b6f5..c928519c04 100644 --- a/src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java +++ b/reactor-core/src/test/java/reactor/core/publisher/scenarios/PopularTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java b/reactor-core/src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java similarity index 97% rename from src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java rename to reactor-core/src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java index cfff772fd3..a1d412b538 100644 --- a/src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java +++ b/reactor-core/src/test/java/reactor/core/publisher/scenarios/ScatterGatherTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/AbstractFluxVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/AbstractFluxVerification.java similarity index 100% rename from src/test/java/reactor/core/publisher/tck/AbstractFluxVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/AbstractFluxVerification.java diff --git a/src/test/java/reactor/core/publisher/tck/AbstractProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/AbstractProcessorVerification.java similarity index 100% rename from src/test/java/reactor/core/publisher/tck/AbstractProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/AbstractProcessorVerification.java diff --git a/src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java similarity index 95% rename from src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java index 025589309b..5326db533a 100644 --- a/src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/EmitterProcessorVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java similarity index 98% rename from src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java index ba35966221..c933d80d3a 100644 --- a/src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxBlackboxProcessorVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java similarity index 96% rename from src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java index b238fb20d1..781fa5f902 100644 --- a/src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxGenerateVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java similarity index 98% rename from src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java index 3061301300..f1cbf92345 100644 --- a/src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/FluxWithProcessorVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java similarity index 97% rename from src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java index 1a475d1a15..5f43acf891 100644 --- a/src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/TopicProcessorVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java b/reactor-core/src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java similarity index 96% rename from src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java rename to reactor-core/src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java index 78719d5b4b..59925ed5c4 100644 --- a/src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java +++ b/reactor-core/src/test/java/reactor/core/publisher/tck/WorkQueueProcessorVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/core/scheduler/AbstractSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/AbstractSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/AbstractSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/AbstractSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ElasticSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ElasticSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ElasticSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ElasticSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ExecutorSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ExecutorSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ExecutorSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ExecutorSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ExecutorSchedulerTrampolineTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ExecutorSchedulerTrampolineTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ExecutorSchedulerTrampolineTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ExecutorSchedulerTrampolineTest.java diff --git a/src/test/java/reactor/core/scheduler/ExecutorServiceInterruptSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ExecutorServiceInterruptSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ExecutorServiceInterruptSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ExecutorServiceInterruptSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ExecutorServiceSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ExecutorServiceSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ExecutorServiceSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ExecutorServiceSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ImmediateSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ImmediateSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ImmediateSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ImmediateSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/ParallelSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/ParallelSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/ParallelSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/ParallelSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/SchedulersTest.java b/reactor-core/src/test/java/reactor/core/scheduler/SchedulersTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/SchedulersTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/SchedulersTest.java diff --git a/src/test/java/reactor/core/scheduler/SingleSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/SingleSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/SingleSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/SingleSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/SingleWorkerAroundTimerSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/SingleWorkerAroundTimerSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/SingleWorkerAroundTimerSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/SingleWorkerAroundTimerSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/SingleWorkerSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/SingleWorkerSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/SingleWorkerSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/SingleWorkerSchedulerTest.java diff --git a/src/test/java/reactor/core/scheduler/TimedSchedulerTest.java b/reactor-core/src/test/java/reactor/core/scheduler/TimedSchedulerTest.java similarity index 100% rename from src/test/java/reactor/core/scheduler/TimedSchedulerTest.java rename to reactor-core/src/test/java/reactor/core/scheduler/TimedSchedulerTest.java diff --git a/src/test/java/reactor/guide/FakeRepository.java b/reactor-core/src/test/java/reactor/guide/FakeRepository.java similarity index 94% rename from src/test/java/reactor/guide/FakeRepository.java rename to reactor-core/src/test/java/reactor/guide/FakeRepository.java index 76cb0bd9d5..b01a601d9a 100644 --- a/src/test/java/reactor/guide/FakeRepository.java +++ b/reactor-core/src/test/java/reactor/guide/FakeRepository.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/guide/FakeUtils1.java b/reactor-core/src/test/java/reactor/guide/FakeUtils1.java similarity index 94% rename from src/test/java/reactor/guide/FakeUtils1.java rename to reactor-core/src/test/java/reactor/guide/FakeUtils1.java index d7b03c3bf9..e724cf75e0 100644 --- a/src/test/java/reactor/guide/FakeUtils1.java +++ b/reactor-core/src/test/java/reactor/guide/FakeUtils1.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/guide/FakeUtils2.java b/reactor-core/src/test/java/reactor/guide/FakeUtils2.java similarity index 94% rename from src/test/java/reactor/guide/FakeUtils2.java rename to reactor-core/src/test/java/reactor/guide/FakeUtils2.java index 5c9048d50e..0837eb7775 100644 --- a/src/test/java/reactor/guide/FakeUtils2.java +++ b/reactor-core/src/test/java/reactor/guide/FakeUtils2.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/guide/GuideDebuggingExtraTests.java b/reactor-core/src/test/java/reactor/guide/GuideDebuggingExtraTests.java similarity index 97% rename from src/test/java/reactor/guide/GuideDebuggingExtraTests.java rename to reactor-core/src/test/java/reactor/guide/GuideDebuggingExtraTests.java index ff07d3ad02..717f776641 100644 --- a/src/test/java/reactor/guide/GuideDebuggingExtraTests.java +++ b/reactor-core/src/test/java/reactor/guide/GuideDebuggingExtraTests.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/guide/GuideTests.java b/reactor-core/src/test/java/reactor/guide/GuideTests.java similarity index 100% rename from src/test/java/reactor/guide/GuideTests.java rename to reactor-core/src/test/java/reactor/guide/GuideTests.java diff --git a/src/test/java/reactor/test/RaceTestUtils.java b/reactor-core/src/test/java/reactor/test/RaceTestUtils.java similarity index 98% rename from src/test/java/reactor/test/RaceTestUtils.java rename to reactor-core/src/test/java/reactor/test/RaceTestUtils.java index b1129d2ee7..4c708e9335 100644 --- a/src/test/java/reactor/test/RaceTestUtils.java +++ b/reactor-core/src/test/java/reactor/test/RaceTestUtils.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/test/publisher/BaseOperatorTest.java b/reactor-core/src/test/java/reactor/test/publisher/BaseOperatorTest.java similarity index 100% rename from src/test/java/reactor/test/publisher/BaseOperatorTest.java rename to reactor-core/src/test/java/reactor/test/publisher/BaseOperatorTest.java diff --git a/src/test/java/reactor/test/publisher/FluxEmptySyncFuseable.java b/reactor-core/src/test/java/reactor/test/publisher/FluxEmptySyncFuseable.java similarity index 100% rename from src/test/java/reactor/test/publisher/FluxEmptySyncFuseable.java rename to reactor-core/src/test/java/reactor/test/publisher/FluxEmptySyncFuseable.java diff --git a/src/test/java/reactor/test/publisher/FluxFuseableExceptionOnPoll.java b/reactor-core/src/test/java/reactor/test/publisher/FluxFuseableExceptionOnPoll.java similarity index 100% rename from src/test/java/reactor/test/publisher/FluxFuseableExceptionOnPoll.java rename to reactor-core/src/test/java/reactor/test/publisher/FluxFuseableExceptionOnPoll.java diff --git a/src/test/java/reactor/test/publisher/FluxOperatorTest.java b/reactor-core/src/test/java/reactor/test/publisher/FluxOperatorTest.java similarity index 100% rename from src/test/java/reactor/test/publisher/FluxOperatorTest.java rename to reactor-core/src/test/java/reactor/test/publisher/FluxOperatorTest.java diff --git a/src/test/java/reactor/test/publisher/MonoOperatorTest.java b/reactor-core/src/test/java/reactor/test/publisher/MonoOperatorTest.java similarity index 100% rename from src/test/java/reactor/test/publisher/MonoOperatorTest.java rename to reactor-core/src/test/java/reactor/test/publisher/MonoOperatorTest.java diff --git a/src/test/java/reactor/test/publisher/OperatorScenario.java b/reactor-core/src/test/java/reactor/test/publisher/OperatorScenario.java similarity index 100% rename from src/test/java/reactor/test/publisher/OperatorScenario.java rename to reactor-core/src/test/java/reactor/test/publisher/OperatorScenario.java diff --git a/src/test/java/reactor/test/publisher/ParallelOperatorTest.java b/reactor-core/src/test/java/reactor/test/publisher/ParallelOperatorTest.java similarity index 100% rename from src/test/java/reactor/test/publisher/ParallelOperatorTest.java rename to reactor-core/src/test/java/reactor/test/publisher/ParallelOperatorTest.java diff --git a/src/test/java/reactor/test/publisher/ReduceOperatorTest.java b/reactor-core/src/test/java/reactor/test/publisher/ReduceOperatorTest.java similarity index 100% rename from src/test/java/reactor/test/publisher/ReduceOperatorTest.java rename to reactor-core/src/test/java/reactor/test/publisher/ReduceOperatorTest.java diff --git a/src/test/java/reactor/test/subscriber/AssertSubscriber.java b/reactor-core/src/test/java/reactor/test/subscriber/AssertSubscriber.java similarity index 100% rename from src/test/java/reactor/test/subscriber/AssertSubscriber.java rename to reactor-core/src/test/java/reactor/test/subscriber/AssertSubscriber.java diff --git a/src/test/java/reactor/util/ExceptionTests.java b/reactor-core/src/test/java/reactor/util/ExceptionTests.java similarity index 97% rename from src/test/java/reactor/util/ExceptionTests.java rename to reactor-core/src/test/java/reactor/util/ExceptionTests.java index 176b35261b..0468d85fea 100644 --- a/src/test/java/reactor/util/ExceptionTests.java +++ b/reactor-core/src/test/java/reactor/util/ExceptionTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/reactor/util/function/Tuple2Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple2Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple2Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple2Test.java index 6ac53479fe..5a9b02b818 100644 --- a/src/test/java/reactor/util/function/Tuple2Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple2Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple3Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple3Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple3Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple3Test.java index ed98f8fc3b..eda3cfdbdb 100644 --- a/src/test/java/reactor/util/function/Tuple3Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple3Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple4Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple4Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple4Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple4Test.java index 89b08b0188..ac00d9bf40 100644 --- a/src/test/java/reactor/util/function/Tuple4Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple4Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple5Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple5Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple5Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple5Test.java index 72de2f1238..5836243741 100644 --- a/src/test/java/reactor/util/function/Tuple5Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple5Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple6Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple6Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple6Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple6Test.java index 2005c3cbec..650f466539 100644 --- a/src/test/java/reactor/util/function/Tuple6Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple6Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple7Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple7Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple7Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple7Test.java index 774bba5395..1886d1267f 100644 --- a/src/test/java/reactor/util/function/Tuple7Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple7Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/Tuple8Test.java b/reactor-core/src/test/java/reactor/util/function/Tuple8Test.java similarity index 98% rename from src/test/java/reactor/util/function/Tuple8Test.java rename to reactor-core/src/test/java/reactor/util/function/Tuple8Test.java index 6265ed5284..123c2c0656 100644 --- a/src/test/java/reactor/util/function/Tuple8Test.java +++ b/reactor-core/src/test/java/reactor/util/function/Tuple8Test.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/test/java/reactor/util/function/TupleTests.java b/reactor-core/src/test/java/reactor/util/function/TupleTests.java similarity index 99% rename from src/test/java/reactor/util/function/TupleTests.java rename to reactor-core/src/test/java/reactor/util/function/TupleTests.java index 6bdad1e45d..648bb904b5 100644 --- a/src/test/java/reactor/util/function/TupleTests.java +++ b/reactor-core/src/test/java/reactor/util/function/TupleTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Pivotal Software Inc, All Rights Reserved. + * Copyright (c) 2011-2017 Pivotal Software Inc, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/resources/logback.xml b/reactor-core/src/test/resources/logback.xml similarity index 94% rename from src/test/resources/logback.xml rename to reactor-core/src/test/resources/logback.xml index 0ca09451b3..720d923c36 100644 --- a/src/test/resources/logback.xml +++ b/reactor-core/src/test/resources/logback.xml @@ -1,5 +1,5 @@