removed lombok dependency

Author: conikeec

pom.xml

@@ -44,13 +44,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.16.6</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
+       <dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 		</dependency>

src/main/java/io/shiftleft/controller/AccountController.java

@@ -1,24 +1,29 @@
 package io.shiftleft.controller;
 
+import io.shiftleft.data.DataLoader;
 import io.shiftleft.model.Account;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import io.shiftleft.repository.AccountRepository;
-import lombok.extern.slf4j.Slf4j;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 
 /**
  * Admin checks login
  */
-@Slf4j
+
 @RestController
 public class AccountController {
     @Autowired
     private AccountRepository accountRepository;
 
+    private static Logger log = LoggerFactory.getLogger(DataLoader.class);
+    
     @GetMapping("/account")
     public Iterable<Account> getAccountList(HttpServletResponse response, HttpServletRequest request) {
         response.addHeader("test-header-detection", new Account().toString());

src/main/java/io/shiftleft/controller/CustomerController.java

@@ -35,6 +35,8 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -52,18 +54,18 @@
 
 import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 
+import io.shiftleft.data.DataLoader;
 import io.shiftleft.exception.CustomerNotFoundException;
 import io.shiftleft.exception.InvalidCustomerRequestException;
 import io.shiftleft.model.Customer;
 import io.shiftleft.repository.CustomerRepository;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.util.HtmlUtils;
 
 /**
  * Customer Controller exposes a series of RESTful endpoints
  */
-@Slf4j
+
 @Configuration
 @EnableEncryptableProperties
 @PropertySource({ "classpath:config/application-sfdc.properties" })
@@ -75,6 +77,8 @@ public class CustomerController {
 
 	@Autowired
 	Environment env;
+	
+	private static Logger log = LoggerFactory.getLogger(CustomerController.class);
 
 	@PostConstruct
 	public void init() {

src/main/java/io/shiftleft/controller/PatientController.java

@@ -1,8 +1,11 @@
 package io.shiftleft.controller;
 
+import io.shiftleft.data.DataLoader;
 import io.shiftleft.model.Patient;
 import io.shiftleft.repository.PatientRepository;
-import lombok.extern.slf4j.Slf4j;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,10 +15,11 @@
 /**
  * Admin checks login
  */
-@Slf4j
+
 @RestController
 public class PatientController {
 
+  private static Logger log = LoggerFactory.getLogger(PatientController.class);
 
   @Autowired
   private PatientRepository patientRepository;

src/main/java/io/shiftleft/data/DataLoader.java

@@ -4,8 +4,11 @@
 import java.util.Properties;
 
 import io.shiftleft.model.Patient;
+
 import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.jasypt.properties.EncryptableProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Configuration;
@@ -20,84 +23,82 @@
 import io.shiftleft.repository.CustomerRepository;
 import io.shiftleft.repository.PatientRepository;
 
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @Component
 @Configuration
 @EnableEncryptableProperties
 @PropertySource({ "classpath:config/application-aws.properties", "classpath:config/application-mysql.properties",
-		"classpath:config/application-sfdc.properties" })
+    "classpath:config/application-sfdc.properties" })
 public class DataLoader implements CommandLineRunner {
 
-	@Autowired
-	private DataBuilder dataBuilder;
+  private static Logger log = LoggerFactory.getLogger(DataLoader.class);
+
+  @Autowired
+  private DataBuilder dataBuilder;
 
-	@Autowired
-	Environment env;
+  @Autowired
+  Environment env;
 
-	@Autowired
-	private CustomerRepository customerRepository;
+  @Autowired
+  private CustomerRepository customerRepository;
 
-	@Autowired
-	private PatientRepository patientRepository;
+  @Autowired
+  private PatientRepository patientRepository;
 
-	/*
-	 * Internal workings of @EnableEncryptableProperties annotation
-	 */
-	private String getSecurePassword(String masterPassword) throws IOException {
-		StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
-		encryptor.setPassword(masterPassword);
-		Properties props = new EncryptableProperties(encryptor);
-		props.load(this.getClass().getClassLoader().getResourceAsStream("config/application-mysql.properties"));
-		return props.getProperty("db.password");
-	}
+  /*
+   * Internal workings of @EnableEncryptableProperties annotation
+   */
+  private String getSecurePassword(String masterPassword) throws IOException {
+    StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
+    encryptor.setPassword(masterPassword);
+    Properties props = new EncryptableProperties(encryptor);
+    props.load(this.getClass().getClassLoader().getResourceAsStream("config/application-mysql.properties"));
+    return props.getProperty("db.password");
+  }
 
-	private boolean connectToAws() {
+  private boolean connectToAws() {
 
-		log.info("Start Loading AWS Properties");
-		log.info("AWS AccessKey is {} and SecretKey is {}", env.getProperty("aws.accesskey"),
-				env.getProperty("aws.secretkey"));
-		log.info("AWS Bucket is {}", env.getProperty("aws.bucket"));
-		log.info("End Loading AWS Properties");
+    log.info("Start Loading AWS Properties");
+    log.info("AWS AccessKey is {} and SecretKey is {}", env.getProperty("aws.accesskey"),
+        env.getProperty("aws.secretkey"));
+    log.info("AWS Bucket is {}", env.getProperty("aws.bucket"));
+    log.info("End Loading AWS Properties");
 
-		// Connect to AWS resources and do something
+    // Connect to AWS resources and do something
 
-		return true;
-	}
+    return true;
+  }
 
-	private boolean connectToMySQL() {
+  private boolean connectToMySQL() {
 
-		log.info("Start Loading MySQL Properties");
-		log.info("Url is {}", env.getProperty("db.url"));
-		log.info("UserName is {}", env.getProperty("db.username"));
-		log.info("Password is {}", env.getProperty("db.password"));
-		log.info("End Loading MySQL Properties");
+    log.info("Start Loading MySQL Properties");
+    log.info("Url is {}", env.getProperty("db.url"));
+    log.info("UserName is {}", env.getProperty("db.username"));
+    log.info("Password is {}", env.getProperty("db.password"));
+    log.info("End Loading MySQL Properties");
 
-		// Connect to DB MySQL resources and do something
+    // Connect to DB MySQL resources and do something
 
-		return true;
-	}
+    return true;
+  }
 
-	@Override
-	public void run(String... arg0) throws Exception {
+  @Override
+  public void run(String... arg0) throws Exception {
 
-	  SimpleCommandLinePropertySource ps = new SimpleCommandLinePropertySource(arg0);
+    SimpleCommandLinePropertySource ps = new SimpleCommandLinePropertySource(arg0);
     String encryptor = (String) ps.getProperty("jasypt.encryptor.password");
-		log.info("JASP Master Creds is {}", encryptor);
+    log.info("JASP Master Creds is {}", encryptor);
 
-		connectToMySQL();
+    connectToMySQL();
 
-		connectToAws();
+    connectToAws();
 
-		log.debug("Loading test data...");
-		for(Customer customer : dataBuilder.createCustomers()) {
-		    customerRepository.save(customer);
-		}
-		for (Patient patient : dataBuilder.createPatients()) {
-			patientRepository.save(patient);
-		}
-		log.debug("Test data loaded...");
-	}
+    log.debug("Loading test data...");
+    for (Customer customer : dataBuilder.createCustomers()) {
+      customerRepository.save(customer);
+    }
+    for (Patient patient : dataBuilder.createPatients()) {
+      patientRepository.save(patient);
+    }
+    log.debug("Test data loaded...");
+  }
 }

src/main/java/io/shiftleft/exception/ControllerExceptionHandler.java

@@ -1,16 +1,20 @@
 package io.shiftleft.exception;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import lombok.extern.slf4j.Slf4j;
+import io.shiftleft.controller.CustomerController;
+
 
-@Slf4j
 @ControllerAdvice
 public class ControllerExceptionHandler {
 
+  private static Logger log = LoggerFactory.getLogger(CustomerController.class);
+  
 	@ResponseStatus(HttpStatus.NOT_FOUND) // 404
 	@ExceptionHandler(CustomerNotFoundException.class)
 	public void handleNotFound(CustomerNotFoundException ex) {