codestyle: clean up excessive blank lines, add trailing blank line EOF

Author: Nemo Oudeis

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationAction.kt

@@ -2,15 +2,13 @@ package org.rekotlinrouter
 
 import org.rekotlin.Action
 
-
 class SetRouteAction(var route: Route,
                      var animated: Boolean = true,
                      action: StandardAction? = null): StandardActionConvertible {
 
     companion object {
         const val type = "RE_KOTLIN_ROUTER_SET_ROUTE"
     }
-    
 
     init {
         // TODO: Convert the below to ArrayList
@@ -30,9 +28,6 @@ class SetRouteAction(var route: Route,
                 payload = payloadMap,
                 isTypedAction = true) 
     }
-
-
-
 }
 
 class SetRouteSpecificData ( val route: Route, val data: Any): Action

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationReducer.kt

@@ -2,8 +2,6 @@ package org.rekotlinrouter
 
 import org.rekotlin.Action
 
-
-
 /**
 The Navigation Reducer handles the state slice concerned with storing the current navigation
 information. Note, that this reducer is **not** a *top-level* reducer, you need to use it within
@@ -63,4 +61,4 @@ class NavigationReducer {
         }
 
     }
-}
+}

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationState.kt

@@ -1,21 +1,17 @@
 package org.rekotlinrouter
 
-
-
 class FullRoute(route: Route) {
     val routeString: String
 
     init {
         this.routeString = route.joinToString(separator = "/")
     }
-
 }
 
 data class NavigationState(var route: Route = arrayListOf() ,
                        var routeSpecificState: HashMap<String,Any> = HashMap() ,
                        var changeRouteAnimated: Boolean = true) {
 
-
     fun <T> getRouteSpecificState(givenRoutes: Route): T? {
         val fullroute = FullRoute(givenRoutes)
         val routeString = fullroute.routeString
@@ -24,8 +20,6 @@ data class NavigationState(var route: Route = arrayListOf() ,
     }
 }
 
-
-
 interface HasNavigationState {
     var navigationState: NavigationState
-}
+}

rekotlin-router/src/main/java/org/rekotlinrouter/Router.kt

@@ -20,13 +20,11 @@ class Router<routerStateType: StateType> (var store: Store<routerStateType>,
                                           rootRoutable: Routable,
                                           stateTransform: (Subscription<routerStateType>) -> Subscription<NavigationState>): StoreSubscriber<NavigationState> {
 
-
     var lastNavigationState = NavigationState()
     // TODO: Collections.synchronizedList vs CopyOnWriteArrayList
     // var routables: List<Routable> = Collections.synchronizedList(arrayListOf<Routable>())
     var routables: ArrayList<Routable> = arrayListOf()
 
-
     init {
         this.routables.add(rootRoutable)
         this.store.subscribe(this,stateTransform)
@@ -44,9 +42,6 @@ class Router<routerStateType: StateType> (var store: Store<routerStateType>,
         }
     }
 
-
-
-
     private fun routingSerailActionHandler(routingAction: RoutingAction, state: NavigationState) {
 
         synchronized(lock = routables){
@@ -59,8 +54,6 @@ class Router<routerStateType: StateType> (var store: Store<routerStateType>,
                                             animated = state.changeRouteAnimated) {}
                             this.routables.removeAt(routingAction.responsibleRoutableIndex+1)
                         }
-
-
                     }
 
                     is push -> {
@@ -81,12 +74,9 @@ class Router<routerStateType: StateType> (var store: Store<routerStateType>,
                                                     to = routingAction.newSegment,
                                                     animated = state.changeRouteAnimated){}
                         }
-
                     }
-
                 }
         }
-
     }
 
     // Route Transformation Logic
@@ -187,10 +177,7 @@ class Router<routerStateType: StateType> (var store: Store<routerStateType>,
 
         return routingActions
     }
-
-
     }
-
 }
 
 

rekotlin-router/src/test/java/org/rekotlinrouter/AndroidMockUtil.kt

@@ -59,6 +59,4 @@ object AndroidMockUtil {
     }
 
     private val mainThread = Executors.newSingleThreadScheduledExecutor()
-
 }
-

rekotlin-router/src/test/java/org/rekotlinrouter/ReKotlinRouterIntegerationTests.kt

@@ -18,7 +18,6 @@ import org.rekotlin.StateType
 import org.rekotlin.Store
 import java.util.concurrent.TimeUnit
 
-
 class FakeAppState: StateType {
     var navigationState = NavigationState()
 }
@@ -31,7 +30,6 @@ fun appReducer(action: Action, state: FakeAppState?): FakeAppState {
 
 class MockRoutable: Routable {
 
-
     var callsToPushRouteSegment: Array<Pair< RouteElementIdentifier,Boolean>> = emptyArray()
     var callsToPopRouteSegment: Array<Pair< RouteElementIdentifier,Boolean>> = emptyArray()
     var callsToChangeRouteSegment: Array<Triple< RouteElementIdentifier,RouteElementIdentifier,Boolean>> = emptyArray()
@@ -51,12 +49,8 @@ class MockRoutable: Routable {
         completionHandler()
         return MockRoutable()
     }
-
-
 }
 
-
-
 //@PrepareForTest(Looper::class)
 //@RunWith(PowerMockRunner::class)
 class ReKotlinRouterIntegerationTests {
@@ -67,17 +61,13 @@ class ReKotlinRouterIntegerationTests {
 
     var store: Store<FakeAppState> = Store(reducer=::appReducer,state=FakeAppState())
 
-
     @Before
     @PrepareForTest(Looper::class,Handler::class,Router::class)
     fun initTest() {
         store = Store(reducer=::appReducer,state=FakeAppState())
         AndroidMockUtil.mockMainThreadHandler()
     }
 
-
-
-
     @Test
     // @DisplayName("does not request the main activity when no route is provided")
     fun test_no_request_main_activity_when_no_route_provided(){
@@ -170,10 +160,8 @@ class ReKotlinRouterIntegerationTests {
                 }
             }
         }
-
     }
 
-
     @Test
     //@Display("calls push on the root for a route with two elements")
     fun test_push_on_root_with_2_elements(){
@@ -232,8 +220,6 @@ class ReKotlinRouterIntegerationTests {
             }
         }
 
-
-
         // Then
 
         await().atMost(5, TimeUnit.SECONDS).untilAsserted {
@@ -260,11 +246,9 @@ class ReKotlinRouterIntegerationTests {
             }
         }
         }
-
     }
     }
 
-
     @PrepareForTest(Looper::class,Handler::class)
     @RunWith(PowerMockRunner::class)
     class RoutingSpecificDataTest{
@@ -299,12 +283,8 @@ class ReKotlinRouterIntegerationTests {
                 }
             }
             }
-
-
-
         }
 
-
         @PrepareForTest(Looper::class,Handler::class,Router::class)
         @RunWith(PowerMockRunner::class)
         class RoutingAnimationTest{
@@ -347,10 +327,8 @@ class ReKotlinRouterIntegerationTests {
                         assertThat(mockRoutable.callsToPushRouteSegment.last().second).isTrue()
                     }
                 }}
-
             }
 
-
             @Test // @DisplayName("when dispatching an unanimated route change")
             fun test_dipatching_animated_route_change_with_animate_as_false(){
                 //Given
@@ -368,7 +346,6 @@ class ReKotlinRouterIntegerationTests {
                         assertThat(mockRoutable.callsToPushRouteSegment.last().second).isFalse()
                     }
                 }}
-
             }
 
             @Test // @DisplayName("when dispatching an default route change")
@@ -388,15 +365,7 @@ class ReKotlinRouterIntegerationTests {
                         assertThat(mockRoutable.callsToPushRouteSegment.last().second).isTrue()
                     }
                 }}
-
             }
-
         }
-
     }
-
-
-
 }
-
-

rekotlin-router/src/test/java/org/rekotlinrouter/ReKotlinRouterUnitTests.kt

@@ -4,15 +4,13 @@ package org.rekotlinrouter
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
-
 internal class ReKotlinRouterUnitTests {
 
     val mainActivityIdentifier = "MainActivity"
     val counterActivityIdentifier = "CounterActivity"
     val statsActivityIdentifier = "StatsActivity"
     val infoActivityIdentifier = "InfoActivity"
 
-
     @Test
     //@DisplayName("calculates transitions from an empty route to a multi segment route")
     fun test_transition_from_empty_to_multi_segment_route(){
@@ -45,7 +43,6 @@ internal class ReKotlinRouterUnitTests {
         assertThat(routingActions.count()).isEqualTo(2)
     }
 
-
     @Test
    // @DisplayName("generates a Change action on the last common subroute")
     fun test_change_action_on_last_common_subroute(){
@@ -277,4 +274,4 @@ internal class ReKotlinRouterUnitTests {
         assertThat(action2Correct).isTrue()
         assertThat(routingActions.count()).isEqualTo(2)
     }
-}
+}