This is an automated email from the ASF dual-hosted git repository. jialiang pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 89764d1f981be05570915878d2f24615855d396f Author: jialiang <[email protected]> AuthorDate: Tue Jan 21 13:29:58 2025 +0800 AMBARI-26293: upgrade guice to 6.0 (#3933) * AMBARI-26293: upgrade guice to 6.0 (cherry picked from commit e2fdaf8f8d3f4cd29ffd1a90db70e94ec0576dbb) --- ambari-project/pom.xml | 2 +- ambari-server/checkstyle.xml | 2 +- ambari-server/pom.xml | 11 +++ .../inject/persist/jpa/AmbariJpaPersistModule.java | 2 +- .../persist/jpa/AmbariJpaPersistService.java | 4 +- .../ambari/server/agent/HeartBeatHandler.java | 2 +- .../server/agent/stomp/AgentClusterDataHolder.java | 2 +- .../server/agent/stomp/AgentHostDataHolder.java | 2 +- .../server/agent/stomp/AgentReportsController.java | 3 +- .../server/agent/stomp/AlertDefinitionsHolder.java | 6 +- .../ambari/server/api/services/KeyService.java | 3 +- .../api/services/PersistKeyValueService.java | 3 +- .../checks/DatabaseConsistencyCheckHelper.java | 2 +- .../ambari/server/cleanup/CleanupServiceImpl.java | 2 +- .../configuration/spring/AgentStompConfig.java | 2 +- .../configuration/spring/ApiSecurityConfig.java | 87 ++++++++-------------- .../configuration/spring/ApiStompConfig.java | 3 +- .../configuration/spring/RootStompConfig.java | 2 - .../server/controller/AmbariHandlerList.java | 7 +- .../ambari/server/controller/AmbariServer.java | 11 +-- .../server/controller/AmbariSessionManager.java | 3 +- .../server/controller/ResourceProviderFactory.java | 2 +- .../KerberosDescriptorResourceProvider.java | 2 +- .../controller/internal/StageResourceProvider.java | 4 +- .../logging/LoggingRequestHelperFactoryImpl.java | 2 +- .../alerts/AlertDefinitionsUIUpdateListener.java | 2 +- .../ambari/server/hooks/users/UserHookService.java | 4 +- .../server/ldap/service/AmbariLdapFacade.java | 4 +- .../ads/DefaultLdapAttributeDetectionService.java | 4 +- .../ads/DefaultLdapConfigurationService.java | 4 +- .../ads/DefaultLdapConnectionConfigService.java | 4 +- .../service/ads/LdapConnectionTemplateFactory.java | 6 +- .../ads/detectors/AttributeDetectorFactory.java | 6 +- .../ads/detectors/ChainedAttributeDetector.java | 4 +- .../ads/detectors/GroupMemberAttrDetector.java | 2 +- .../ads/detectors/GroupNameAttrDetector.java | 2 +- .../ads/detectors/GroupObjectClassDetector.java | 2 +- .../ads/detectors/UserGroupMemberAttrDetector.java | 2 +- .../ads/detectors/UserNameAttrDetector.java | 4 +- .../ads/detectors/UserObjectClassDetector.java | 2 +- .../server/orm/dao/AmbariConfigurationDAO.java | 4 +- .../server/orm/dao/KerberosDescriptorDAO.java | 6 +- .../server/scheduler/ExecutionScheduleManager.java | 1 + .../AmbariBasicAuthenticationFilter.java | 4 +- .../AmbariKerberosAuthenticationFilter.java | 2 - .../AmbariKerberosAuthenticationProvider.java | 2 +- .../kerberos/AmbariProxiedUserDetailsService.java | 2 +- .../pam/PamAuthenticationFactory.java | 2 +- .../security/encryption/AESEncryptionService.java | 2 +- .../users/CsvFilePersisterService.java | 2 +- .../users/PostUserCreationHookServerAction.java | 4 +- .../users/ShellCommandUtilityCallable.java | 2 +- .../users/ShellCommandUtilityWrapper.java | 4 +- .../ambari/server/topology/AmbariContext.java | 2 +- .../ambari/server/topology/PersistedStateImpl.java | 2 +- .../ambari/server/topology/TopologyManager.java | 2 +- .../addservice/AddServiceOrchestrator.java | 4 +- .../topology/addservice/RequestValidator.java | 2 +- .../addservice/ResourceProviderAdapter.java | 4 +- .../topology/addservice/StackAdvisorAdapter.java | 2 +- .../validators/TopologyValidatorService.java | 2 +- .../server/upgrade/UpdateAlertScriptPaths.java | 2 +- .../server/view/RemoteAmbariClusterRegistry.java | 4 +- .../apache/ambari/server/view/ViewExtractor.java | 2 +- .../server/view/ViewInstanceOperationHandler.java | 4 +- .../apache/ambari/server/view/ViewRegistry.java | 6 +- .../ambari/server/view/ViewThrottleFilter.java | 1 - .../server/view/persistence/DataStoreImpl.java | 2 +- .../server/controller/AmbariHandlerListTest.java | 3 +- .../ambari/server/controller/AmbariServerTest.java | 2 +- .../AmbariAuthorizationFilterTest.java | 1 + .../server/view/configuration/ViewConfigTest.java | 3 +- .../ambari/view/examples/AutoClusterService.java | 2 +- .../ambari/view/proxy/CalculatorResource.java | 2 +- .../ambari/view/cluster/PropertyService.java | 2 +- .../ambari/view/favorite/FavoriteService.java | 2 +- .../apache/ambari/view/phonelist/DataMigrator.java | 2 +- .../view/property/PropertyValidatorService.java | 2 +- .../ambari/view/property/PropertyService.java | 2 +- .../ambari/view/restricted/RestrictedResource.java | 2 +- .../view/restricted/UnrestrictedResource.java | 2 +- .../apache/ambari/view/simple/SimpleService.java | 2 +- 82 files changed, 164 insertions(+), 166 deletions(-) diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 1aa76fe3e4..e4baef6dd7 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -39,7 +39,7 @@ <slf4j.version>2.0.0</slf4j.version> <reload4j.version>1.2.22</reload4j.version> <logback.version>1.5.16</logback.version> - <guice.version>5.1.0</guice.version> + <guice.version>6.0.0</guice.version> <spring.version>6.0.0</spring.version> <spring.security.version>6.0.0</spring.security.version> <fasterxml.jackson.version>2.18.2</fasterxml.jackson.version> diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml index 79e62d4293..7281f93dce 100644 --- a/ambari-server/checkstyle.xml +++ b/ambari-server/checkstyle.xml @@ -27,7 +27,7 @@ <property name="illegalPkgs" value="sun, org.apache.ambari.metrics.sink.relocated, org.apache.hadoop.metrics2.sink.relocated"/> </module> <module name="ImportOrder"> - <property name="groups" value="java,javax,org,com,*"/> + <property name="groups" value="java,javax,jakarta,org,com,*"/> <property name="ordered" value="true"/> <property name="separated" value="true"/> <property name="option" value="top"/> <!-- static imports --> diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index afe23eab66..536b189a14 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1215,6 +1215,17 @@ </profile> </profiles> <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jndi</artifactId> + <version>11.0.15</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + <version>11.0.15</version> + </dependency> + <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> diff --git a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java index c9c504ff94..d488e99329 100644 --- a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java +++ b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java @@ -68,7 +68,7 @@ public class AmbariJpaPersistModule extends PersistModule { bindConstant().annotatedWith(Jpa.class).to(jpaUnit); bind(AmbariJpaPersistService.class).in(Singleton.class); - + bind(JpaPersistOptions.class).annotatedWith(Jpa.class).toInstance( JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build()); bind(PersistService.class).to(AmbariJpaPersistService.class); bind(UnitOfWork.class).to(AmbariJpaPersistService.class); bind(EntityManager.class).toProvider(AmbariJpaPersistService.class); diff --git a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java index d01445fa5c..322d3c4bcc 100644 --- a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java +++ b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java @@ -31,7 +31,9 @@ public class AmbariJpaPersistService extends JpaPersistService { @Inject public AmbariJpaPersistService(@Jpa String persistenceUnitName, @Jpa Map<?, ?> persistenceProperties) { - super(persistenceUnitName, persistenceProperties); + super( JpaPersistOptions.builder() + .setAutoBeginWorkOnEntityManagerCreation(true) + .build(), persistenceUnitName, persistenceProperties); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java index 4e79f0154e..6955684cd6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; -import javax.inject.Named; +import jakarta.inject.Named; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.HostNotFoundException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java index eb739d1400..2aa8b00f72 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentClusterDataHolder.java @@ -20,7 +20,7 @@ package org.apache.ambari.server.agent.stomp; import java.util.Objects; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.agent.stomp.dto.Hashable; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java index 7205d62135..003a2b7945 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.AmbariRuntimeException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentReportsController.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentReportsController.java index ef596d6193..da1e28e7e2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentReportsController.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentReportsController.java @@ -22,7 +22,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.inject.Provider; +import jakarta.inject.Provider; + import jakarta.ws.rs.WebApplicationException; import org.apache.ambari.server.AmbariException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java index 30faa16be4..4e1edb1bfa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.AmbariRuntimeException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java index dbd7865085..e16a5c4b74 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java @@ -20,11 +20,12 @@ package org.apache.ambari.server.api.services; import java.io.IOException; import java.util.Collection; +import javax.xml.bind.JAXBException; + import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import javax.xml.bind.JAXBException; import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.utils.StageUtils; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java index 1149701e0a..b19b7a5ee4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import javax.xml.bind.JAXBException; + import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.PUT; @@ -31,7 +33,6 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import javax.xml.bind.JAXBException; import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.state.fsm.InvalidStateTransitionException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java index 5f2c491817..05ec752388 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.inject.Provider; import javax.persistence.EntityManager; import javax.persistence.Query; import javax.persistence.TypedQuery; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java index d636c6163e..9b04d44bb7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.ambari.server.cleanup; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.orm.dao.Cleanable; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java index 062193c43a..904b2bd3d9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java @@ -29,9 +29,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; import org.springframework.web.socket.server.jetty.JettyRequestUpgradeStrategy; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java index c586eeb372..449c6bac9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java @@ -1,20 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.apache.ambari.server.configuration.spring; import org.apache.ambari.server.security.AmbariEntryPoint; @@ -35,13 +18,16 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.authentication.ProviderManager; import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; +import java.util.Arrays; + @Configuration @EnableWebSecurity @Import(GuiceBeansConfig.class) @@ -61,51 +47,44 @@ public class ApiSecurityConfig { this.guiceBeansConfig = guiceBeansConfig; } - @Autowired - public void configureAuthenticationManager(AuthenticationManagerBuilder auth, - AmbariJwtAuthenticationProvider ambariJwtAuthenticationProvider, - AmbariPamAuthenticationProvider ambariPamAuthenticationProvider, - AmbariLocalAuthenticationProvider ambariLocalAuthenticationProvider, - AmbariLdapAuthenticationProvider ambariLdapAuthenticationProvider, - AmbariInternalAuthenticationProvider ambariInternalAuthenticationProvider, - AmbariKerberosAuthenticationProvider ambariKerberosAuthenticationProvider - ) { - auth.authenticationProvider(ambariJwtAuthenticationProvider) - .authenticationProvider(ambariPamAuthenticationProvider) - .authenticationProvider(ambariLocalAuthenticationProvider) - .authenticationProvider(ambariLdapAuthenticationProvider) - .authenticationProvider(ambariInternalAuthenticationProvider) - .authenticationProvider(ambariKerberosAuthenticationProvider); - } - @Bean - public AuthenticationManager authenticationManagerBean(AuthenticationConfiguration authenticationConfiguration) throws Exception { - return authenticationConfiguration.getAuthenticationManager(); + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.csrf().disable() + .authorizeHttpRequests(authz -> authz.anyRequest().authenticated()) + .headers(headers -> headers.httpStrictTransportSecurity().disable().frameOptions().disable()) + .exceptionHandling(exceptionHandling -> exceptionHandling.authenticationEntryPoint(ambariEntryPoint)) + .addFilterBefore(guiceBeansConfig.ambariUserAuthorizationFilter(), BasicAuthenticationFilter.class) + .addFilterAt(delegatingAuthenticationFilter, BasicAuthenticationFilter.class) + .addFilterBefore(authorizationFilter, FilterSecurityInterceptor.class); + return http.build(); } @Bean - protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable() - .authorizeRequests() - .anyRequest().authenticated() - .and() - .headers().httpStrictTransportSecurity().disable() - .frameOptions().disable().and() - .exceptionHandling().authenticationEntryPoint(ambariEntryPoint) - .and() - .addFilterBefore(guiceBeansConfig.ambariUserAuthorizationFilter(), BasicAuthenticationFilter.class) - .addFilterAt(delegatingAuthenticationFilter, BasicAuthenticationFilter.class) - .addFilterBefore(authorizationFilter, FilterSecurityInterceptor.class); + public AuthenticationManager authenticationManager( + AmbariJwtAuthenticationProvider ambariJwtAuthenticationProvider, + AmbariPamAuthenticationProvider ambariPamAuthenticationProvider, + AmbariLocalAuthenticationProvider ambariLocalAuthenticationProvider, + AmbariLdapAuthenticationProvider ambariLdapAuthenticationProvider, + AmbariInternalAuthenticationProvider ambariInternalAuthenticationProvider, + AmbariKerberosAuthenticationProvider ambariKerberosAuthenticationProvider) { + return new ProviderManager(Arrays.asList( + ambariJwtAuthenticationProvider, + ambariPamAuthenticationProvider, + ambariLocalAuthenticationProvider, + ambariLdapAuthenticationProvider, + ambariInternalAuthenticationProvider, + ambariKerberosAuthenticationProvider + )); } @Bean public AmbariKerberosAuthenticationProvider ambariKerberosAuthenticationProvider( - AmbariKerberosTicketValidator ambariKerberosTicketValidator, - AmbariAuthToLocalUserDetailsService authToLocalUserDetailsService, - AmbariProxiedUserDetailsService proxiedUserDetailsService) { + AmbariKerberosTicketValidator ambariKerberosTicketValidator, + AmbariAuthToLocalUserDetailsService authToLocalUserDetailsService, + AmbariProxiedUserDetailsService proxiedUserDetailsService) { return new AmbariKerberosAuthenticationProvider(authToLocalUserDetailsService, - proxiedUserDetailsService, - ambariKerberosTicketValidator); + proxiedUserDetailsService, + ambariKerberosTicketValidator); } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java index 0427e234b0..7f5106a28c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java @@ -29,9 +29,10 @@ import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import com.google.inject.Injector; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; + @Configuration @EnableWebSocketMessageBroker diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java index 25bfbe5650..99f205df1c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java @@ -28,8 +28,6 @@ import org.apache.ambari.server.agent.stomp.AmbariSubscriptionRegistry; import org.apache.ambari.server.api.AmbariSendToMethodReturnValueHandler; import org.apache.ambari.server.events.DefaultMessageEmitter; import org.apache.ambari.server.events.publishers.AmbariEventPublisher; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java index f24721b612..f9317156a9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java @@ -25,9 +25,10 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; + import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java index b4bf10fbd5..212c40e2e3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.logging.LogManager; import javax.crypto.BadPaddingException; + import jakarta.servlet.DispatcherType; import org.apache.ambari.server.AmbariException; @@ -130,11 +131,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.http.HttpVersion; import org.apache.log4j.PropertyConfigurator; import org.apache.velocity.app.Velocity; -import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.server.CustomRequestLog; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.CustomRequestLog; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -836,13 +836,14 @@ public class AmbariServer { if (configs.isApiGzipped()) { GzipHandler gzipHandler = new GzipHandler(); gzipHandler.setIncludedMethods("GET", "POST", "PUT", "DELETE"); - gzipHandler.setExcludedPaths(".*\\.woff", ".*\\.ttf", ".*\\.woff2", ".*\\.eot", ".*\\.svg"); + gzipHandler.setExcludedPaths("*.woff", "*.ttf", "*.woff2", "*.eot", "*.svg"); gzipHandler.setIncludedMimeTypes( "text/html", "text/plain", "text/xml", "text/css", "application/x-javascript", "application/xml", - "application/x-www-form-urlencoded", "application/javascript", "application/json" + "application/x-www-form-urlencoded", "application/javascript", + "application/json" ); - gzipHandler.setMinGzipSize(Integer.valueOf(configs.getApiGzipMinSize())); + gzipHandler.setMinGzipSize(Integer.parseInt(configs.getApiGzipMinSize())); context.setGzipHandler(gzipHandler); } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java index 380d48bdbd..e1b7876312 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java @@ -18,7 +18,8 @@ package org.apache.ambari.server.controller; -import javax.inject.Inject; +import jakarta.inject.Inject; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java index 830366a312..f25f239943 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java @@ -19,7 +19,7 @@ package org.apache.ambari.server.controller; -import javax.inject.Named; +import jakarta.inject.Named; import org.apache.ambari.server.controller.internal.AlertTargetResourceProvider; import org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java index 6e20c8aff9..332c55e76a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java index ac900a6f13..fb5d9f32dd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.apache.ambari.server.StaticallyInject; import org.apache.ambari.server.actionmanager.HostRoleStatus; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java index 3761b29bc8..bbaf2e8a95 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java @@ -19,7 +19,7 @@ package org.apache.ambari.server.controller.logging; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java index 79cc93a3a9..699682327b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertDefinitionsUIUpdateListener.java @@ -23,7 +23,7 @@ import static org.apache.ambari.server.events.AlertDefinitionEventType.UPDATE; import java.util.Collections; import java.util.Map; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.EagerSingleton; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java index f8d0501848..fb84339ac9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java index a9fd59b9fd..00cbdff3a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java @@ -18,8 +18,8 @@ package org.apache.ambari.server.ldap.service; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionService.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionService.java index be1d447934..5a2c50f129 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionService.java @@ -19,8 +19,8 @@ import static org.apache.ambari.server.configuration.AmbariServerConfigurationCa import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java index a1a6d06da6..22fc3a8873 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java @@ -18,8 +18,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration; import org.apache.ambari.server.ldap.service.AmbariLdapException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java index 82b527f608..99f58b9d4b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java @@ -19,8 +19,8 @@ import static javax.net.ssl.TrustManagerFactory.getDefaultAlgorithm; import java.io.FileInputStream; import java.security.KeyStore; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/LdapConnectionTemplateFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/LdapConnectionTemplateFactory.java index 5e4e0ca5b6..e3b4f9ec4b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/LdapConnectionTemplateFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/LdapConnectionTemplateFactory.java @@ -14,9 +14,9 @@ package org.apache.ambari.server.ldap.service.ads; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.apache.ambari.server.events.AmbariConfigurationChangedEvent; import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/AttributeDetectorFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/AttributeDetectorFactory.java index eba0bd9ba5..6c4d082965 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/AttributeDetectorFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/AttributeDetectorFactory.java @@ -16,9 +16,9 @@ package org.apache.ambari.server.ldap.service.ads.detectors; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.apache.ambari.server.ldap.service.AttributeDetector; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/ChainedAttributeDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/ChainedAttributeDetector.java index 094922b21a..0351484599 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/ChainedAttributeDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/ChainedAttributeDetector.java @@ -17,8 +17,8 @@ package org.apache.ambari.server.ldap.service.ads.detectors; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.ldap.service.AttributeDetector; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetector.java index accbd7b323..8426504ada 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetector.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupNameAttrDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupNameAttrDetector.java index 47f87821fe..68272aaf79 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupNameAttrDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupNameAttrDetector.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupObjectClassDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupObjectClassDetector.java index 1ad056a879..be6c2f4b09 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupObjectClassDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupObjectClassDetector.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserGroupMemberAttrDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserGroupMemberAttrDetector.java index 61da75ea74..4b617d33ca 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserGroupMemberAttrDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserGroupMemberAttrDetector.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserNameAttrDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserNameAttrDetector.java index cf97984227..7480388968 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserNameAttrDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserNameAttrDetector.java @@ -14,8 +14,8 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserObjectClassDetector.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserObjectClassDetector.java index 09e87b4bb8..a50bfc1c85 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserObjectClassDetector.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserObjectClassDetector.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.ldap.service.ads.detectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.directory.api.ldap.model.entry.Entry; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java index 4a4042337c..ab5400c2f3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.persistence.EntityExistsException; import javax.persistence.EntityNotFoundException; import javax.persistence.TypedQuery; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java index dd71f70514..b08d1b9ae0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java @@ -19,9 +19,9 @@ package org.apache.ambari.server.orm.dao; import java.util.List; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java index 191fe2374b..dd43a788bc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java @@ -44,6 +44,7 @@ import java.util.regex.Pattern; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientRequestFilter; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java index e0471da0b2..46d3556de7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java @@ -21,9 +21,9 @@ import java.io.IOException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; -//import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.ambari.server.security.AmbariEntryPoint; import org.apache.ambari.server.utils.RequestUtils; import org.apache.commons.lang.StringUtils; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java index 1340810041..6304ea3867 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java @@ -22,8 +22,6 @@ import java.io.IOException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationProvider.java index bf5566e4b3..4112913506 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationProvider.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security.authentication.kerberos; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.security.authentication.AmbariProxiedUserDetailsImpl; import org.apache.ambari.server.security.authentication.tproxy.TrustedProxyAuthenticationDetails; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariProxiedUserDetailsService.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariProxiedUserDetailsService.java index 0d11a3c063..199d8e4b83 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariProxiedUserDetailsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariProxiedUserDetailsService.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.orm.entities.GroupEntity; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/pam/PamAuthenticationFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/pam/PamAuthenticationFactory.java index 791f055377..ebd664d1e8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/pam/PamAuthenticationFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/pam/PamAuthenticationFactory.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security.authentication.pam; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.apache.ambari.server.configuration.Configuration; import org.jvnet.libpam.PAM; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/AESEncryptionService.java b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/AESEncryptionService.java index effaddb06a..48812dc0f2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/AESEncryptionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/AESEncryptionService.java @@ -22,7 +22,7 @@ import java.io.UncheckedIOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.utils.TextEncoding; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/CsvFilePersisterService.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/CsvFilePersisterService.java index 5c869e01bf..a4501b736a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/CsvFilePersisterService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/CsvFilePersisterService.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java index 17c55ba189..1ac366488c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentMap; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.HostRoleStatus; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityCallable.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityCallable.java index 18cfe5d03b..778ed67ead 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityCallable.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityCallable.java @@ -20,7 +20,7 @@ package org.apache.ambari.server.serveraction.users; import java.util.concurrent.Callable; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.apache.ambari.server.utils.ShellCommandUtil; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityWrapper.java index 4ab1e6d39c..79b81cef24 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityWrapper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/ShellCommandUtilityWrapper.java @@ -21,8 +21,8 @@ package org.apache.ambari.server.serveraction.users; import java.io.IOException; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.utils.ShellCommandUtil; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java index e6b778c67a..ddef4915c0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; import javax.annotation.Nullable; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java index bb1f85234d..d659e985f3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.HostRoleCommand; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java index b0cb3c2d16..fc793359f8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java @@ -36,7 +36,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.HostRoleCommand; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java index 6eed1af11d..65e658eb58 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/RequestValidator.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/RequestValidator.java index 5ccd3b6100..ebf80f9d1f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/RequestValidator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/RequestValidator.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/ResourceProviderAdapter.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/ResourceProviderAdapter.java index 95fcc17849..dbc90582f9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/ResourceProviderAdapter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/ResourceProviderAdapter.java @@ -28,8 +28,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.controller.AmbariManagementController; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java index de0a2ac3ec..427d64775a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/StackAdvisorAdapter.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/TopologyValidatorService.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/TopologyValidatorService.java index 425cf1ec59..5a9bdd6198 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/TopologyValidatorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/TopologyValidatorService.java @@ -14,7 +14,7 @@ package org.apache.ambari.server.topology.validators; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.topology.ClusterTopology; import org.apache.ambari.server.topology.InvalidTopologyException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpdateAlertScriptPaths.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpdateAlertScriptPaths.java index 087a5af5e5..d3fefba060 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpdateAlertScriptPaths.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpdateAlertScriptPaths.java @@ -19,7 +19,7 @@ package org.apache.ambari.server.upgrade; import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariClusterRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariClusterRegistry.java index 12ba9283fe..3674f9d9fe 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariClusterRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariClusterRegistry.java @@ -25,8 +25,8 @@ import java.util.Collection; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java index ad99950dde..69cb9ac72e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.view.configuration.ViewConfig; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewInstanceOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewInstanceOperationHandler.java index 56850f7031..d0cf8ade73 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewInstanceOperationHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewInstanceOperationHandler.java @@ -20,8 +20,8 @@ package org.apache.ambari.server.view; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.ambari.server.orm.dao.PrivilegeDAO; import org.apache.ambari.server.orm.dao.ViewDAO; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index 15ebb0121b..7e1169710a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -40,9 +40,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import javax.xml.bind.JAXBException; import org.apache.ambari.server.AmbariException; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java index aeb4f1cc75..d2d0015ab5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java @@ -31,7 +31,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; -//import org.eclipse.jetty.continuation.Continuation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java index aa4831587a..6c67afc5b6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java index c15155cd53..3e5c804268 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java @@ -28,7 +28,8 @@ import static org.easymock.EasyMock.verify; import java.util.ArrayList; import java.util.Arrays; -import javax.inject.Provider; +import jakarta.inject.Provider; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java index 5109715911..ea6abf74e9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java @@ -40,6 +40,7 @@ import java.util.EnumSet; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; + import jakarta.servlet.DispatcherType; import jakarta.servlet.SessionCookieConfig; @@ -64,7 +65,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlets.GzipFilter; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.After; import org.junit.Assert; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java index a4185cac8c..9ab39023e6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java @@ -27,6 +27,7 @@ import static org.easymock.EasyMock.verify; import java.util.Collections; import javax.persistence.EntityManager; + import jakarta.servlet.FilterChain; import jakarta.servlet.FilterConfig; import jakarta.servlet.http.HttpServletRequest; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java index 6203e04ac6..0f4ba7b56e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java @@ -24,11 +24,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import jakarta.servlet.http.HttpServlet; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; +import jakarta.servlet.http.HttpServlet; + import org.apache.ambari.view.NoSuchResourceException; import org.apache.ambari.view.ReadRequest; import org.apache.ambari.view.ResourceAlreadyExistsException; diff --git a/ambari-views/examples/auto-cluster-view/src/main/java/org/apache/ambari/view/examples/AutoClusterService.java b/ambari-views/examples/auto-cluster-view/src/main/java/org/apache/ambari/view/examples/AutoClusterService.java index 2ce1f3278b..579c903fe8 100644 --- a/ambari-views/examples/auto-cluster-view/src/main/java/org/apache/ambari/view/examples/AutoClusterService.java +++ b/ambari-views/examples/auto-cluster-view/src/main/java/org/apache/ambari/view/examples/AutoClusterService.java @@ -22,7 +22,7 @@ import org.apache.ambari.view.AmbariStreamProvider; import org.apache.ambari.view.URLStreamProvider; import org.apache.ambari.view.cluster.Cluster; import org.apache.commons.codec.binary.Base64; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/ambari-views/examples/calculator-view/src/main/java/org/apache/ambari/view/proxy/CalculatorResource.java b/ambari-views/examples/calculator-view/src/main/java/org/apache/ambari/view/proxy/CalculatorResource.java index 8627bd8b62..32194d5423 100644 --- a/ambari-views/examples/calculator-view/src/main/java/org/apache/ambari/view/proxy/CalculatorResource.java +++ b/ambari-views/examples/calculator-view/src/main/java/org/apache/ambari/view/proxy/CalculatorResource.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.proxy; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/PropertyService.java b/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/PropertyService.java index abd2fd6b4a..5424ead9ea 100644 --- a/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/PropertyService.java +++ b/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/PropertyService.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.cluster; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; /** diff --git a/ambari-views/examples/favorite-view/src/main/java/org/apache/ambari/view/favorite/FavoriteService.java b/ambari-views/examples/favorite-view/src/main/java/org/apache/ambari/view/favorite/FavoriteService.java index 83d7e53cda..dcf5cd1383 100644 --- a/ambari-views/examples/favorite-view/src/main/java/org/apache/ambari/view/favorite/FavoriteService.java +++ b/ambari-views/examples/favorite-view/src/main/java/org/apache/ambari/view/favorite/FavoriteService.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.favorite; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/DataMigrator.java b/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/DataMigrator.java index 1cbb199cf2..0670eda281 100644 --- a/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/DataMigrator.java +++ b/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/DataMigrator.java @@ -25,7 +25,7 @@ import org.apache.ambari.view.migration.ViewDataMigrationException; import org.apache.ambari.view.migration.ViewDataMigrator; import org.springframework.beans.BeanUtils; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; /** diff --git a/ambari-views/examples/property-validator-view/src/main/java/org/apache/ambari/view/property/PropertyValidatorService.java b/ambari-views/examples/property-validator-view/src/main/java/org/apache/ambari/view/property/PropertyValidatorService.java index 839ee18737..145e8429ef 100644 --- a/ambari-views/examples/property-validator-view/src/main/java/org/apache/ambari/view/property/PropertyValidatorService.java +++ b/ambari-views/examples/property-validator-view/src/main/java/org/apache/ambari/view/property/PropertyValidatorService.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.property; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/ambari-views/examples/property-view/src/main/java/org/apache/ambari/view/property/PropertyService.java b/ambari-views/examples/property-view/src/main/java/org/apache/ambari/view/property/PropertyService.java index 495e9e102a..79e22b2e20 100644 --- a/ambari-views/examples/property-view/src/main/java/org/apache/ambari/view/property/PropertyService.java +++ b/ambari-views/examples/property-view/src/main/java/org/apache/ambari/view/property/PropertyService.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.property; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/RestrictedResource.java b/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/RestrictedResource.java index 0ef47d3a1f..efa63a9b85 100644 --- a/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/RestrictedResource.java +++ b/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/RestrictedResource.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.restricted; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; diff --git a/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/UnrestrictedResource.java b/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/UnrestrictedResource.java index 73897f8ed0..bf8798d62b 100644 --- a/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/UnrestrictedResource.java +++ b/ambari-views/examples/restricted-view/src/main/java/org/apache/ambari/view/restricted/UnrestrictedResource.java @@ -20,7 +20,7 @@ package org.apache.ambari.view.restricted; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; diff --git a/ambari-views/examples/simple-view/src/main/java/org/apache/ambari/view/simple/SimpleService.java b/ambari-views/examples/simple-view/src/main/java/org/apache/ambari/view/simple/SimpleService.java index fbb3caac6a..e34e95e1b9 100644 --- a/ambari-views/examples/simple-view/src/main/java/org/apache/ambari/view/simple/SimpleService.java +++ b/ambari-views/examples/simple-view/src/main/java/org/apache/ambari/view/simple/SimpleService.java @@ -19,7 +19,7 @@ package org.apache.ambari.view.simple; import org.apache.ambari.view.ViewContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
