project structure: split server into jdbc + web

3 files changed, 2 insertions, 19 deletions

diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index 7b97f05b..9c99557d 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
 apply plugin: 'org.akhikhl.gretty'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':juick-server-web')
     compile 'com.ganyo:gcm-server:1.1.0'
     compile 'com.notnoop.apns:apns:1.0.0.Beta6'
     compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
diff --git a/juick-notifications/src/main/java/com/juick/components/service/BaseRestService.java b/juick-notifications/src/main/java/com/juick/components/service/BaseRestService.java
deleted file mode 100644
index d4bc369c..00000000
--- a/juick-notifications/src/main/java/com/juick/components/service/BaseRestService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.juick.components.service;
-
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Created by vitalyster on 15.12.2016.
- */
-public abstract class BaseRestService {
-    private RestTemplate rest;
-
-    public BaseRestService(RestTemplate rest) {
-        this.rest = rest;
-    }
-
-    public RestTemplate getRest() {
-        return rest;
-    }
-}
diff --git a/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java b/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
index 9ea3fd3e..4dd949c3 100644
--- a/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
+++ b/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
@@ -1,6 +1,7 @@
 package com.juick.components.service;
 
 import com.juick.TokensList;
+import com.juick.service.BaseRestService;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;