From ecd78982370218f3048d508155c1f4fcb3f41ff6 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Mon, 29 Jun 2020 13:00:34 +0300 Subject: [PATCH] Code clean up --- .../eu/eudat/controllers/LockController.java | 2 - .../ControllerUnauthorisedHandler.java | 5 +-- .../interceptors/RequestInterceptor.java | 5 +-- .../configuration/configuration.service.ts | 1 - .../src/common/base/base-http.service.ts | 39 ------------------- 5 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 dmp-frontend/src/common/base/base-http.service.ts diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java index 0901a6aa0..7c47240e3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java @@ -1,8 +1,6 @@ package eu.eudat.controllers; -import com.sun.org.apache.xpath.internal.operations.Bool; import eu.eudat.logic.managers.LockManager; -import eu.eudat.models.data.dmp.DataManagementPlan; import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.lock.Lock; import eu.eudat.models.data.security.Principal; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java index 0a8599265..63bf582cf 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java @@ -4,7 +4,6 @@ import eu.eudat.exceptions.security.UnauthorisedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -20,11 +19,9 @@ import javax.annotation.Priority; @Priority(4) public class ControllerUnauthorisedHandler { private static final Logger logger = LoggerFactory.getLogger(ControllerUnauthorisedHandler.class); -// private Logger logger; @Autowired - public ControllerUnauthorisedHandler(/*Logger logger*/) { -// this.logger = logger; + public ControllerUnauthorisedHandler() { } @ExceptionHandler(UnauthorisedException.class) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java index 24d0278e3..183e79194 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java @@ -1,6 +1,5 @@ package eu.eudat.controllers.interceptors; -import eu.eudat.logic.services.helpers.LoggerService; import eu.eudat.types.WarningLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,11 +17,9 @@ import java.util.Date; @Component public class RequestInterceptor extends HandlerInterceptorAdapter { private static final Logger logger = LoggerFactory.getLogger(RequestInterceptor.class); -// private LoggerService loggerService; @Autowired - public RequestInterceptor(/*LoggerService loggerService*/) { -// this.loggerService = loggerService; + public RequestInterceptor() { } @Override diff --git a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts index 0dcc59286..413c736ac 100644 --- a/dmp-frontend/src/app/core/services/configuration/configuration.service.ts +++ b/dmp-frontend/src/app/core/services/configuration/configuration.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; import { BaseHttpParams } from '@common/http/base-http-params'; import { InterceptorType } from '@common/http/interceptors/interceptor-type'; -import { BaseHttpService } from '@common/base/base-http.service'; import { BaseComponent } from '@common/base/base.component'; import { catchError, takeUntil } from 'rxjs/operators'; import { Observable, throwError } from 'rxjs'; diff --git a/dmp-frontend/src/common/base/base-http.service.ts b/dmp-frontend/src/common/base/base-http.service.ts deleted file mode 100644 index 7ac3735fe..000000000 --- a/dmp-frontend/src/common/base/base-http.service.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -@Injectable() -export class BaseHttpService { - constructor( - protected http: HttpClient - ) { - } - - get(url: string, options?: Object): Observable { - return this.http.get(url, options); - } - - post(url: string, body: any, options?: Object): Observable { - return this.http.post(url, body, options); - } - - put(url: string, body: any, options?: Object): Observable { - return this.http.put(url, body, options); - } - - delete(url: string, options?: Object): Observable { - return this.http.delete(url, options); - } - - patch(url: string, body: any, options?: Object): Observable { - return this.http.patch(url, body, options); - } - - head(url: string, options?: Object): Observable { - return this.http.head(url, options); - } - - options(url: string, options?: Object): Observable { - return this.http.options(url, options); - } -}