Skip to content

Commit

Permalink
Removing Lombok
Browse files Browse the repository at this point in the history
  • Loading branch information
sivaprasadreddy committed Dec 23, 2022
1 parent b38fe91 commit f80ed9b
Show file tree
Hide file tree
Showing 92 changed files with 731 additions and 211 deletions.
2 changes: 1 addition & 1 deletion .sdkmanrc
@@ -1,2 +1,2 @@
java=17.0.4-tem
gradle=7.5.1
gradle=7.6
7 changes: 2 additions & 5 deletions application/build.gradle
@@ -1,7 +1,7 @@
plugins {
id "java"
id "jacoco"
id "org.springframework.boot" version "3.0.0"
id "org.springframework.boot" version "3.0.1"
id "io.spring.dependency-management" version "1.1.0"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
id "com.google.cloud.tools.jib" version "3.3.1"
Expand Down Expand Up @@ -52,7 +52,7 @@ ext {
set("font_awesome_version", "6.2.0")
set("commons_lang_version", "3.12.0")
set("commons_io_version", "2.11.0")
set("springdoc_openapi", "1.6.13")
set("springdoc_openapi", "1.6.14")
set("opencsv_version", "5.7.1")
set("jsoup_version", "1.15.3")
set("datasource_proxy_version", "1.8.1")
Expand Down Expand Up @@ -86,16 +86,13 @@ dependencies {
implementation "org.webjars:jquery:${jquery_version}"
implementation "org.webjars:font-awesome:${font_awesome_version}"

compileOnly "org.projectlombok:lombok"
developmentOnly "org.springframework.boot:spring-boot-devtools"
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
annotationProcessor "org.projectlombok:lombok"

testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.springframework.security:spring-security-test"
testImplementation "org.testcontainers:junit-jupiter"
testImplementation "org.testcontainers:postgresql"
testImplementation "org.projectlombok:lombok"
testImplementation "com.tngtech.archunit:archunit-junit5:${archunit_junit5_version}"
testImplementation "com.apptasticsoftware:rssreader:3.2.5"
}
Expand Down
Expand Up @@ -5,19 +5,15 @@
import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;

@MappedSuperclass
@Setter
@Getter
public abstract class BaseEntity {

@Column(updatable = false)
private LocalDateTime createdAt = LocalDateTime.now();
protected LocalDateTime createdAt = LocalDateTime.now();

@Column(insertable = false)
private LocalDateTime updatedAt = LocalDateTime.now();
protected LocalDateTime updatedAt = LocalDateTime.now();

protected abstract Long getId();

Expand All @@ -30,4 +26,20 @@ public void onCreate() {
public void onUpdate() {
updatedAt = LocalDateTime.now();
}

public LocalDateTime getCreatedAt() {
return this.createdAt;
}

public LocalDateTime getUpdatedAt() {
return this.updatedAt;
}

public void setCreatedAt(LocalDateTime createdAt) {
this.createdAt = createdAt;
}

public void setUpdatedAt(LocalDateTime updatedAt) {
this.updatedAt = updatedAt;
}
}
Expand Up @@ -2,15 +2,9 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

@Setter
@Getter
@AllArgsConstructor
public class PagedResult<T> {
private Pageable pageable;
private List<T> data;
Expand Down Expand Up @@ -41,4 +35,97 @@ public PagedResult(Page<T> page) {
this.setHasNext(page.hasNext());
this.setHasPrevious(page.hasPrevious());
}

public PagedResult(
Pageable pageable,
List<T> data,
long totalElements,
int pageNumber,
int totalPages,
boolean isFirst,
boolean isLast,
boolean hasNext,
boolean hasPrevious) {
this.pageable = pageable;
this.data = data;
this.totalElements = totalElements;
this.pageNumber = pageNumber;
this.totalPages = totalPages;
this.isFirst = isFirst;
this.isLast = isLast;
this.hasNext = hasNext;
this.hasPrevious = hasPrevious;
}

public Pageable getPageable() {
return this.pageable;
}

public List<T> getData() {
return this.data;
}

public long getTotalElements() {
return this.totalElements;
}

public int getPageNumber() {
return this.pageNumber;
}

public int getTotalPages() {
return this.totalPages;
}

public boolean isFirst() {
return this.isFirst;
}

public boolean isLast() {
return this.isLast;
}

public boolean isHasNext() {
return this.hasNext;
}

public boolean isHasPrevious() {
return this.hasPrevious;
}

public void setPageable(Pageable pageable) {
this.pageable = pageable;
}

public void setData(List<T> data) {
this.data = data;
}

public void setTotalElements(long totalElements) {
this.totalElements = totalElements;
}

public void setPageNumber(int pageNumber) {
this.pageNumber = pageNumber;
}

public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}

public void setFirst(boolean isFirst) {
this.isFirst = isFirst;
}

public void setLast(boolean isLast) {
this.isLast = isLast;
}

public void setHasNext(boolean hasNext) {
this.hasNext = hasNext;
}

public void setHasPrevious(boolean hasPrevious) {
this.hasPrevious = hasPrevious;
}
}
Expand Up @@ -4,22 +4,30 @@
import com.sivalabs.devzone.links.domain.services.LinksImportService;
import java.util.List;
import java.util.Locale;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.CommandLineRunner;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

@Component
@Transactional
@RequiredArgsConstructor
@Slf4j
public class DataInitializer implements CommandLineRunner {
private static final Logger log = LoggerFactory.getLogger(DataInitializer.class);
private final ApplicationProperties applicationProperties;
private final LinksImportService linksImportService;
private final MessageSource messageSource;

public DataInitializer(
ApplicationProperties applicationProperties,
LinksImportService linksImportService,
MessageSource messageSource) {
this.applicationProperties = applicationProperties;
this.linksImportService = linksImportService;
this.messageSource = messageSource;
}

@Override
public void run(String... args) throws Exception {
log.info(
Expand Down
Expand Up @@ -2,7 +2,6 @@

import com.sivalabs.devzone.config.argresolvers.CurrentUserArgumentResolver;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.filter.HiddenHttpMethodFilter;
Expand All @@ -12,10 +11,13 @@
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
@RequiredArgsConstructor
public class WebMvcConfig implements WebMvcConfigurer {
private final CurrentUserArgumentResolver currentUserArgumentResolver;

public WebMvcConfig(CurrentUserArgumentResolver currentUserArgumentResolver) {
this.currentUserArgumentResolver = currentUserArgumentResolver;
}

@Override
public void addViewControllers(ViewControllerRegistry registry) {
registry.addRedirectViewController("/", "/links");
Expand Down
Expand Up @@ -3,7 +3,6 @@
import com.sivalabs.devzone.config.annotations.CurrentUser;
import com.sivalabs.devzone.users.domain.services.SecurityService;
import java.lang.annotation.Annotation;
import lombok.RequiredArgsConstructor;
import org.springframework.core.MethodParameter;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.stereotype.Component;
Expand All @@ -13,10 +12,13 @@
import org.springframework.web.method.support.ModelAndViewContainer;

@Component
@RequiredArgsConstructor
public class CurrentUserArgumentResolver implements HandlerMethodArgumentResolver {
private final SecurityService securityService;

public CurrentUserArgumentResolver(SecurityService securityService) {
this.securityService = securityService;
}

@Override
public boolean supportsParameter(MethodParameter methodParameter) {
return findMethodAnnotation(CurrentUser.class, methodParameter) != null;
Expand Down
@@ -1,19 +1,21 @@
package com.sivalabs.devzone.config.logging;

import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

@Aspect
@Component
@Slf4j
public class LoggingAspect {

private static final Logger log = LoggerFactory.getLogger(LoggingAspect.class);

@Pointcut(
"within(@org.springframework.stereotype.Repository *)"
+ " || within(@org.springframework.stereotype.Service *)"
Expand Down
@@ -1,11 +1,5 @@
package com.sivalabs.devzone.config.security;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
/*
@Configuration
public class SecurityConfig {
Expand All @@ -19,4 +13,4 @@ public AuthenticationManager authenticationManager(AuthenticationConfiguration a
throws Exception {
return authConfig.getAuthenticationManager();
}
}
}*/
Expand Up @@ -2,10 +2,8 @@

import com.sivalabs.devzone.users.domain.models.User;
import java.util.Set;
import lombok.EqualsAndHashCode;
import org.springframework.security.core.authority.SimpleGrantedAuthority;

@EqualsAndHashCode(callSuper = true)
public class SecurityUser extends org.springframework.security.core.userdetails.User {
private final String name;

Expand Down
@@ -1,18 +1,19 @@
package com.sivalabs.devzone.config.security;

import com.sivalabs.devzone.users.domain.services.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;

@Service("userDetailsService")
@RequiredArgsConstructor
public class SecurityUserDetailsService implements UserDetailsService {

private final UserService userService;

public SecurityUserDetailsService(UserService userService) {
this.userService = userService;
}

@Override
public UserDetails loadUserByUsername(String username) {
return userService
Expand Down

0 comments on commit f80ed9b

Please sign in to comment.