#233 migrate using https://docs.openrewrite.org/recipes/java/spring/b…

…oot3/upgradespringboot_3_2

src/main/java/org/tb/SalatApplication.java

@@ -4,15 +4,17 @@
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+@Configuration
 @EnableJpaRepositories
 @EnableJpaAuditing
 @EnableTransactionManagement
-@SpringBootApplication(exclude = { SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
 @EnableWebSecurity
 public class SalatApplication {
 

src/main/java/org/tb/auth/AfterLogin.java

@@ -5,8 +5,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.struts.util.MessageResources;

src/main/java/org/tb/auth/AuthService.java

@@ -9,6 +9,7 @@
 import static org.tb.auth.AuthorizationRule.Category.TIMEREPORT;
 import static org.tb.common.GlobalConstants.SUBORDER_INVOICE_YES;
 
+import jakarta.annotation.PostConstruct;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.util.HashMap;
@@ -17,7 +18,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-import javax.annotation.PostConstruct;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/org/tb/chicoree/ChangeDayAction.java

@@ -1,8 +1,8 @@
 package org.tb.chicoree;
 
 import java.time.LocalDate;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

src/main/java/org/tb/chicoree/ChicoreeSessionStore.java

@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

src/main/java/org/tb/chicoree/DeleteTimereportAction.java

@@ -1,7 +1,7 @@
 package org.tb.chicoree;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

src/main/java/org/tb/chicoree/EditTimereportAction.java

@@ -5,8 +5,8 @@
 import static org.tb.common.util.DateUtils.validateDate;
 
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

src/main/java/org/tb/chicoree/RefreshTimereportFormFieldsAction.java

@@ -3,8 +3,8 @@
 import static org.tb.common.util.DateUtils.validateDate;
 
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

src/main/java/org/tb/chicoree/ShowDashboardAction.java

@@ -2,8 +2,8 @@
 
 import static org.tb.common.util.DateUtils.today;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

src/main/java/org/tb/chicoree/StoreTimereportAction.java

@@ -1,7 +1,7 @@
 package org.tb.chicoree;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

src/main/java/org/tb/chicoree/TimereportForm.java

@@ -5,7 +5,7 @@
 import static org.tb.common.util.DateUtils.validateDate;
 
 import java.time.LocalDate;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.struts.action.ActionErrors;

src/main/java/org/tb/common/configuration/AuthenticationFilter.java

@@ -2,11 +2,11 @@
 
 import java.io.IOException;
 import java.security.Principal;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/org/tb/common/configuration/BuildInformationProvider.java

@@ -1,9 +1,9 @@
 package org.tb.common.configuration;
 
 import java.util.Properties;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/tb/common/configuration/PerformanceLoggingFilter.java

@@ -1,11 +1,11 @@
 package org.tb.common.configuration;
 
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

src/main/java/org/tb/common/configuration/ResourceUrlProviderExposingFilter.java

@@ -1,11 +1,11 @@
 package org.tb.common.configuration;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpFilter;
 import java.io.IOException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.ServletRequestBindingException;
@@ -19,8 +19,8 @@ public class ResourceUrlProviderExposingFilter extends HttpFilter {
   private final ResourceUrlProvider resourceUrlProvider;
 
   @Override
-  public void doFilter(
-      ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+  protected void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+      throws IOException, ServletException {
     try {
       request.setAttribute(RESOURCE_URL_PROVIDER_ATTR, this.resourceUrlProvider);
     }

src/main/java/org/tb/common/jsptags/FormatDurationTag.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDate;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import lombok.Setter;
 import org.tb.common.util.DurationUtils;
 

src/main/java/org/tb/common/jsptags/FormatLocalDateTag.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 import java.time.LocalDate;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import lombok.Setter;
 import org.tb.common.util.DateUtils;
 

src/main/java/org/tb/common/jsptags/FormatLocalDateTimeTag.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 import java.time.LocalDateTime;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import lombok.Setter;
 import org.tb.common.util.DateUtils;
 

src/main/java/org/tb/common/jsptags/FormatYearMonthTag.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.YearMonth;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import lombok.Setter;
 import org.tb.common.util.DateUtils;
 

src/main/java/org/tb/common/jsptags/TreeTag.java

@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.tb.common.GlobalConstants;

src/main/java/org/tb/common/struts/DelegatingRequestProcessor.java

@@ -1,9 +1,9 @@
 package org.tb.common.struts;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.struts.action.Action;

src/main/java/org/tb/common/struts/LoginRequiredAction.java

@@ -4,8 +4,8 @@
 
 import java.text.MessageFormat;
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

src/main/java/org/tb/common/struts/TypedAction.java

@@ -4,8 +4,8 @@
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

src/main/java/org/tb/common/util/DurationUtils.java

@@ -23,7 +23,7 @@ public static String format(Duration duration) {
       sb.append('-');
     }
     sb.append(abs(duration.toHours())).append(':');
-    sb.append(String.format("%02d", abs(duration.toMinutesPart())));
+    sb.append("%02d".formatted(abs(duration.toMinutesPart())));
     return sb.toString();
   }
 
@@ -117,7 +117,7 @@ public static String decimalFormat(Duration duration) {
         .multiply(BigDecimal.valueOf(100))
         .divide(BigDecimal.valueOf(MINUTES_PER_HOUR), RoundingMode.HALF_UP)
         .intValueExact();
-    sb.append(String.format("%02d", abs(minutesDecimal)));
+    sb.append("%02d".formatted(abs(minutesDecimal)));
     return sb.toString();
   }
 

src/main/java/org/tb/common/util/UrlUtils.java

@@ -1,6 +1,6 @@
 package org.tb.common.util;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

src/main/java/org/tb/customer/AddCustomerForm.java

@@ -1,6 +1,6 @@
 package org.tb.customer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.struts.action.ActionForm;

src/main/java/org/tb/customer/CreateCustomerAction.java

@@ -1,8 +1,8 @@
 package org.tb.customer;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

src/main/java/org/tb/customer/CustomerRepository.java

@@ -5,14 +5,15 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
-import org.tb.employee.domain.Employeecontract;
 
 @Repository
 public interface CustomerRepository extends PagingAndSortingRepository<Customer, Long>,
-    CrudRepository<Customer,Long> {
+    CrudRepository<Customer, Long> {
 
-  @Query("select c from Customer c where upper(c.id) like upper(:filter) or upper(c.name) like upper(:filter) "
-      + "or upper(c.address) like upper(:filter) or upper(c.shortname) like upper(:filter) order by c.name asc")
+  @Query("""
+      select c from Customer c where upper(c.id) like upper(:filter) or upper(c.name) like upper(:filter) \
+      or upper(c.address) like upper(:filter) or upper(c.shortname) like upper(:filter) order by c.name asc\
+      """)
   List<Customer> findAllByFilterIgnoringCase(String filter);
 
 }

src/main/java/org/tb/customer/DeleteCustomerAction.java

@@ -1,7 +1,7 @@
 package org.tb.customer;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.struts.action.ActionForm;

src/main/java/org/tb/customer/EditCustomerAction.java

@@ -1,7 +1,7 @@
 package org.tb.customer;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

src/main/java/org/tb/customer/ShowCustomerAction.java

@@ -1,7 +1,7 @@
 package org.tb.customer;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;