Rework hystrix-data-stream module to just include serialization logic…

… (now named hystrix-serialization)
thorneny · Jul 7, 2016 · 9e5a509 · 9e5a509
1 parent f918595
commit 9e5a509
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 4 deletions.
diff --git a/hystrix-contrib/hystrix-metrics-event-stream/build.gradle b/hystrix-contrib/hystrix-metrics-event-stream/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     compile project(':hystrix-core')
-	compile project(':hystrix-data-stream')
+	compile project(':hystrix-serialization')
     provided 'javax.servlet:servlet-api:2.5'
     testCompile 'junit:junit-dep:4.10'
     testCompile 'org.mockito:mockito-all:1.9.5'

diff --git a/hystrix-contrib/hystrix-reactivesocket-event-stream/build.gradle b/hystrix-contrib/hystrix-reactivesocket-event-stream/build.gradle
@@ -9,7 +9,7 @@ targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
     compile project(':hystrix-core')
-	compile project(':hystrix-data-stream')
+	compile project(':hystrix-serialization')
     compile 'io.reactivesocket:reactivesocket:latest.release'
 	compile 'io.reactivesocket:reactivesocket-netty:latest.release'
     compile 'io.reactivex:rxjava-reactive-streams:latest.release'

diff --git a/hystrix-contrib/hystrix-rx-netty-metrics-stream/build.gradle b/hystrix-contrib/hystrix-rx-netty-metrics-stream/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     compile project(':hystrix-core')
-	compile project(':hystrix-data-stream')
+	compile project(':hystrix-serialization')
     compile 'io.reactivex:rxnetty:0.4.12'
     testCompile 'junit:junit-dep:4.10'
     testCompile 'org.powermock:powermock-easymock-release-full:1.5.5'

diff --git a/...config/HystrixCollapserConfiguration.java → ...config/HystrixCollapserConfiguration.java b/...config/HystrixCollapserConfiguration.java → ...config/HystrixCollapserConfiguration.java
diff --git a/...x/config/HystrixCommandConfiguration.java → ...x/config/HystrixCommandConfiguration.java b/...x/config/HystrixCommandConfiguration.java → ...x/config/HystrixCommandConfiguration.java
diff --git a/.../hystrix/config/HystrixConfiguration.java → .../hystrix/config/HystrixConfiguration.java b/.../hystrix/config/HystrixConfiguration.java → .../hystrix/config/HystrixConfiguration.java
diff --git a/...ix/config/HystrixConfigurationStream.java → ...ix/config/HystrixConfigurationStream.java b/...ix/config/HystrixConfigurationStream.java → ...ix/config/HystrixConfigurationStream.java
diff --git a/...onfig/HystrixThreadPoolConfiguration.java → ...onfig/HystrixThreadPoolConfiguration.java b/...onfig/HystrixThreadPoolConfiguration.java → ...onfig/HystrixThreadPoolConfiguration.java
diff --git a/...tric/consumer/HystrixDashboardStream.java → ...tric/consumer/HystrixDashboardStream.java b/...tric/consumer/HystrixDashboardStream.java → ...tric/consumer/HystrixDashboardStream.java
diff --git a/...ric/sample/HystrixCommandUtilization.java → ...ric/sample/HystrixCommandUtilization.java b/...ric/sample/HystrixCommandUtilization.java → ...ric/sample/HystrixCommandUtilization.java
diff --git a/.../sample/HystrixThreadPoolUtilization.java → .../sample/HystrixThreadPoolUtilization.java b/.../sample/HystrixThreadPoolUtilization.java → .../sample/HystrixThreadPoolUtilization.java
diff --git a/...rix/metric/sample/HystrixUtilization.java → ...rix/metric/sample/HystrixUtilization.java b/...rix/metric/sample/HystrixUtilization.java → ...rix/metric/sample/HystrixUtilization.java
diff --git a/...tric/sample/HystrixUtilizationStream.java → ...tric/sample/HystrixUtilizationStream.java b/...tric/sample/HystrixUtilizationStream.java → ...tric/sample/HystrixUtilizationStream.java
diff --git a/...onfig/HystrixConfigurationStreamTest.java → ...onfig/HystrixConfigurationStreamTest.java b/...onfig/HystrixConfigurationStreamTest.java → ...onfig/HystrixConfigurationStreamTest.java
diff --git a/.../consumer/HystrixDashboardStreamTest.java → .../consumer/HystrixDashboardStreamTest.java b/.../consumer/HystrixDashboardStreamTest.java → .../consumer/HystrixDashboardStreamTest.java
diff --git a/.../sample/HystrixUtilizationStreamTest.java → .../sample/HystrixUtilizationStreamTest.java b/.../sample/HystrixUtilizationStreamTest.java → .../sample/HystrixUtilizationStreamTest.java
diff --git a/hystrix-data-stream/build.gradle → hystrix-serialization/build.gradle b/hystrix-data-stream/build.gradle → hystrix-serialization/build.gradle
diff --git a/...ix/serial/SerialHystrixConfiguration.java → ...ix/serial/SerialHystrixConfiguration.java b/...ix/serial/SerialHystrixConfiguration.java → ...ix/serial/SerialHystrixConfiguration.java
diff --git a/...ix/serial/SerialHystrixDashboardData.java → ...ix/serial/SerialHystrixDashboardData.java b/...ix/serial/SerialHystrixDashboardData.java → ...ix/serial/SerialHystrixDashboardData.java
diff --git a/...x/hystrix/serial/SerialHystrixMetric.java → ...x/hystrix/serial/SerialHystrixMetric.java b/...x/hystrix/serial/SerialHystrixMetric.java → ...x/hystrix/serial/SerialHystrixMetric.java
diff --git a/...ix/serial/SerialHystrixRequestEvents.java → ...ix/serial/SerialHystrixRequestEvents.java b/...ix/serial/SerialHystrixRequestEvents.java → ...ix/serial/SerialHystrixRequestEvents.java
diff --git a/...trix/serial/SerialHystrixUtilization.java → ...trix/serial/SerialHystrixUtilization.java b/...trix/serial/SerialHystrixUtilization.java → ...trix/serial/SerialHystrixUtilization.java
diff --git a/...erial/SerialHystrixRequestEventsTest.java → ...erial/SerialHystrixRequestEventsTest.java b/...erial/SerialHystrixRequestEventsTest.java → ...erial/SerialHystrixRequestEventsTest.java
diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@ include 'hystrix-core', \
 'hystrix-contrib/hystrix-javanica', \
 'hystrix-contrib/hystrix-junit', \
 'hystrix-dashboard', \
-'hystrix-data-stream' 
+'hystrix-serialization' 
 
 project(':hystrix-examples-reactivesocket/client').name = 'hystrix-examples-reactivesocket-client'
 project(':hystrix-examples-reactivesocket/server').name = 'hystrix-examples-reactivesocket-server'