From 7d747b60a8607b88811cf913aec05c18312a5ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Wed, 2 Dec 2020 12:38:17 +0100
Subject: [PATCH] Renamed CasValidator -> DefaultUAMCasValidator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 .../java/com/plannaplan/controllers/TokenController.java    | 4 ++--
 .../{CasValidator.java => DefaultUAMCasValidator.java}      | 6 +++---
 ...asValidatorTest.java => DefaultUAMCasValidatorTest.java} | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename restservice/src/main/java/com/plannaplan/security/{CasValidator.java => DefaultUAMCasValidator.java} (87%)
 rename restservice/src/test/java/com/plannaplan/security/{CasValidatorTest.java => DefaultUAMCasValidatorTest.java} (77%)

diff --git a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
index 29df59d..f53181f 100755
--- a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
+++ b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
@@ -2,7 +2,7 @@ package com.plannaplan.controllers;
 
 import com.plannaplan.exceptions.UserNotFoundException;
 import com.plannaplan.security.CasValidationExcepiton;
-import com.plannaplan.security.CasValidator;
+import com.plannaplan.security.DefaultUAMCasValidator;
 import com.plannaplan.services.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@ public class TokenController {
     @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system")
     public ResponseEntity<String> getToken(
             @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.pl") final String ticket) {
-        final CasValidator validator = new CasValidator(SERVICE_URL, ticket);
+        final DefaultUAMCasValidator validator = new DefaultUAMCasValidator(SERVICE_URL, ticket);
 
         try {
             String authority = validator.validate();
diff --git a/restservice/src/main/java/com/plannaplan/security/CasValidator.java b/restservice/src/main/java/com/plannaplan/security/DefaultUAMCasValidator.java
similarity index 87%
rename from restservice/src/main/java/com/plannaplan/security/CasValidator.java
rename to restservice/src/main/java/com/plannaplan/security/DefaultUAMCasValidator.java
index 5ad718c..22f514d 100755
--- a/restservice/src/main/java/com/plannaplan/security/CasValidator.java
+++ b/restservice/src/main/java/com/plannaplan/security/DefaultUAMCasValidator.java
@@ -9,19 +9,19 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
-public class CasValidator {
+public class DefaultUAMCasValidator {
     private static String CAS_URL = "https://cas.amu.edu.pl/cas";
     private final CloseableHttpClient httpClient = HttpClients.createDefault();
     private String service;
     private String ticket;
 
-    public CasValidator(String service, String ticket) {
+    public DefaultUAMCasValidator(String service, String ticket) {
         this.service = service;
         this.ticket = ticket;
     }
 
     public String validate() throws Exception, CasValidationExcepiton {
-        HttpGet request = new HttpGet(CasValidator.CAS_URL + "/validate?service="
+        HttpGet request = new HttpGet(DefaultUAMCasValidator.CAS_URL + "/validate?service="
                 + URLEncoder.encode(this.service, "UTF-8") + "&ticket=" + URLEncoder.encode(this.ticket, "UTF-8"));
         try (CloseableHttpResponse response = httpClient.execute(request)) {
 
diff --git a/restservice/src/test/java/com/plannaplan/security/CasValidatorTest.java b/restservice/src/test/java/com/plannaplan/security/DefaultUAMCasValidatorTest.java
similarity index 77%
rename from restservice/src/test/java/com/plannaplan/security/CasValidatorTest.java
rename to restservice/src/test/java/com/plannaplan/security/DefaultUAMCasValidatorTest.java
index 9772b08..3823c03 100755
--- a/restservice/src/test/java/com/plannaplan/security/CasValidatorTest.java
+++ b/restservice/src/test/java/com/plannaplan/security/DefaultUAMCasValidatorTest.java
@@ -5,14 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class CasValidatorTest {
+public class DefaultUAMCasValidatorTest {
 
     @Test
     @Ignore
     public void shouldValidateTicket() {
         // you need to privide fresh ticket to make this test pass that's why it is
         // marked as ignored
-        final CasValidator validator = new CasValidator("http://localhost:3000",
+        final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000",
                 "ST-572267-cbgKrcJLd0tdCubeLqdW-cas.amu.edu.pl");
         try {
             System.out.println(validator.validate());
@@ -24,7 +24,7 @@ public class CasValidatorTest {
 
     @Test
     public void shouldNotValidateTicket() {
-        final CasValidator validator = new CasValidator("http://localhost:3000", "notticket");
+        final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000", "notticket");
         try {
             assertTrue(validator.validate().trim().equals(""));
         } catch (CasValidationExcepiton e) {