Skip to content

Commit

Permalink
fix compilation error after 4.0 branch changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@saragluna
saragluna committed Feb 24, 2022
1 parent 76361d6 commit 58e7b2e
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 39 deletions.
4 changes: 2 additions & 2 deletions ...ADB2CResourceServerSampleApplication.java → ...adB2cResourceServerSampleApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class AzureADB2CResourceServerSampleApplication {
public class AadB2cResourceServerSampleApplication {

public static void main(String[] args) {
SpringApplication.run(AzureADB2CResourceServerSampleApplication.class, args);
SpringApplication.run(AadB2cResourceServerSampleApplication.class, args);
}
}
4 changes: 2 additions & 2 deletions ...rver/src/main/java/com/azure/spring/sample/aad/b2c/security/WebSecurityConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.aad.b2c.security;

import com.azure.spring.cloud.autoconfigure.aad.implementation.webapi.AADJwtBearerTokenAuthenticationConverter;
import com.azure.spring.cloud.autoconfigure.aad.implementation.webapi.AadJwtBearerTokenAuthenticationConverter;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
Expand All @@ -18,6 +18,6 @@ protected void configure(HttpSecurity http) throws Exception {
http.authorizeRequests((requests) -> requests.anyRequest().authenticated())
.oauth2ResourceServer()
.jwt()
.jwtAuthenticationConverter(new AADJwtBearerTokenAuthenticationConverter());
.jwtAuthenticationConverter(new AadJwtBearerTokenAuthenticationConverter());
}
}
5 changes: 2 additions & 3 deletions .../b2c/AzureADB2COIDCSampleApplication.java → .../aad/b2c/AadB2cOIDCSampleApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class AzureADB2COIDCSampleApplication {
public class AadB2cOIDCSampleApplication {

public static void main(String[] args) {
//
SpringApplication.run(AzureADB2COIDCSampleApplication.class, args);
SpringApplication.run(AadB2cOIDCSampleApplication.class, args);
}
}
6 changes: 3 additions & 3 deletions ...tion/src/main/java/com/azure/spring/sample/aad/b2c/security/WebSecurityConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

package com.azure.spring.sample.aad.b2c.security;

import com.azure.spring.cloud.autoconfigure.aadb2c.AADB2COidcLoginConfigurer;
import com.azure.spring.cloud.autoconfigure.aadb2c.AadB2cOidcLoginConfigurer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;

@EnableWebSecurity
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {

private final AADB2COidcLoginConfigurer configurer;
private final AadB2cOidcLoginConfigurer configurer;

public WebSecurityConfiguration(AADB2COidcLoginConfigurer configurer) {
public WebSecurityConfiguration(AadB2cOidcLoginConfigurer configurer) {
this.configurer = configurer;
}

Expand Down
6 changes: 3 additions & 3 deletions ...er-stateless/src/main/java/com/azure/spring/sample/aad/security/AADWebSecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.aad.security;

import com.azure.spring.cloud.autoconfigure.aad.filter.AADAppRoleStatelessAuthenticationFilter;
import com.azure.spring.cloud.autoconfigure.aad.filter.AadAppRoleStatelessAuthenticationFilter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
Expand All @@ -14,10 +14,10 @@

@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class AADWebSecurityConfig extends WebSecurityConfigurerAdapter {
public class AadWebSecurityConfig extends WebSecurityConfigurerAdapter {

@Autowired
private AADAppRoleStatelessAuthenticationFilter aadAuthFilter;
private AadAppRoleStatelessAuthenticationFilter aadAuthFilter;

@Override
protected void configure(HttpSecurity http) throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...ngBootAutoconfigureSampleApplication.java → ...ngBootAutoconfigureSampleApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class AzureAdIntegrationSpringBootAutoconfigureSampleApplication {
public class AadIntegrationSpringBootAutoconfigureSampleApplication {

public static void main(String[] args) {
SpringApplication.run(AzureAdIntegrationSpringBootAutoconfigureSampleApplication.class, args);
SpringApplication.run(AadIntegrationSpringBootAutoconfigureSampleApplication.class, args);
}
}
4 changes: 2 additions & 2 deletions ...er-by-filter/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.spring.sample.aad.controller;

import com.azure.spring.cloud.autoconfigure.aad.filter.UserPrincipal;
import com.azure.spring.cloud.autoconfigure.aad.properties.AADAuthenticationProperties;
import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties;
import com.azure.spring.sample.aad.model.TodoItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
Expand All @@ -30,7 +30,7 @@
@RestController
public class TodoListController {
@Autowired
private AADAuthenticationProperties aadAuthenticationProperties;
private AadAuthenticationProperties aadAuthenticationProperties;

private final List<TodoItem> todoList = new ArrayList<>();

Expand Down
4 changes: 2 additions & 2 deletions ...erver-by-filter/src/main/java/com/azure/spring/sample/aad/security/WebSecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.aad.security;

import com.azure.spring.cloud.autoconfigure.aad.filter.AADAuthenticationFilter;
import com.azure.spring.cloud.autoconfigure.aad.filter.AadAuthenticationFilter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
Expand All @@ -17,7 +17,7 @@
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {

@Autowired
private AADAuthenticationFilter aadAuthFilter;
private AadAuthenticationFilter aadAuthFilter;

@Override
protected void configure(HttpSecurity http) throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...Auth2ResourceServerSampleApplication.java → ...Auth2ResourceServerSampleApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class AzureADOAuth2ResourceServerSampleApplication {
public class AadOAuth2ResourceServerSampleApplication {

public static void main(String[] args) {
SpringApplication.run(AzureADOAuth2ResourceServerSampleApplication.class, args);
SpringApplication.run(AadOAuth2ResourceServerSampleApplication.class, args);
}
}
4 changes: 2 additions & 2 deletions ...ppAndResourceServerSampleApplication.java → ...ppAndResourceServerSampleApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class AzureADOAuth2WebAppAndResourceServerSampleApplication {
public class AadOAuth2WebAppAndResourceServerSampleApplication {

public static void main(String[] args) {
SpringApplication.run(AzureADOAuth2WebAppAndResourceServerSampleApplication.class, args);
SpringApplication.run(AadOAuth2WebAppAndResourceServerSampleApplication.class, args);
}
}
10 changes: 5 additions & 5 deletions ...n/java/com/azure/spring/sample/aad/security/AADWebApplicationAndResourceServerConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

package com.azure.spring.sample.aad.security;

import com.azure.spring.cloud.autoconfigure.aad.AADResourceServerWebSecurityConfigurerAdapter;
import com.azure.spring.cloud.autoconfigure.aad.AADWebSecurityConfigurerAdapter;
import com.azure.spring.cloud.autoconfigure.aad.AadResourceServerWebSecurityConfigurerAdapter;
import com.azure.spring.cloud.autoconfigure.aad.AadWebSecurityConfigurerAdapter;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
Expand All @@ -13,11 +13,11 @@

@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class AADWebApplicationAndResourceServerConfig {
public class AadWebApplicationAndResourceServerConfig {

@Order(1)
@Configuration
public static class ApiWebSecurityConfigurationAdapter extends AADResourceServerWebSecurityConfigurerAdapter {
public static class ApiWebSecurityConfigurationAdapter extends AadResourceServerWebSecurityConfigurerAdapter {
protected void configure(HttpSecurity http) throws Exception {
super.configure(http);
http.antMatcher("/api/**")
Expand All @@ -26,7 +26,7 @@ protected void configure(HttpSecurity http) throws Exception {
}

@Configuration
public static class HtmlWebSecurityConfigurerAdapter extends AADWebSecurityConfigurerAdapter {
public static class HtmlWebSecurityConfigurerAdapter extends AadWebSecurityConfigurerAdapter {

@Override
protected void configure(HttpSecurity http) throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion ...eventhubs-integration/src/main/java/com/azure/spring/sample/eventhubs/SendController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.spring.sample.eventhubs;

import com.azure.spring.eventhubs.core.EventHubsTemplate;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
8 changes: 4 additions & 4 deletions ...spring/sample/servicebus/MultipleNamespacesAzureServiceBusMessagingAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
import com.azure.spring.servicebus.core.ServiceBusProcessorContainer;
import com.azure.spring.servicebus.core.ServiceBusProcessorFactory;
import com.azure.spring.servicebus.core.ServiceBusProducerFactory;
import com.azure.spring.servicebus.core.ServiceBusTemplate;
import com.azure.spring.servicebus.core.processor.DefaultServiceBusNamespaceProcessorFactory;
import com.azure.spring.servicebus.core.processor.ServiceBusProcessorFactory;
import com.azure.spring.servicebus.core.producer.DefaultServiceBusNamespaceProducerFactory;
import com.azure.spring.servicebus.core.producer.ServiceBusProducerFactory;
import com.azure.spring.servicebus.core.properties.ProcessorProperties;
import com.azure.spring.servicebus.core.properties.ProducerProperties;
import com.azure.spring.servicebus.implementation.core.DefaultServiceBusNamespaceProcessorFactory;
import com.azure.spring.servicebus.implementation.core.DefaultServiceBusNamespaceProducerFactory;
import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 1 addition & 1 deletion ...iple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueReceiveService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.servicebus;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import com.azure.spring.integration.servicebus.inbound.ServiceBusInboundChannelAdapter;
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.checkpoint.Checkpointer;
Expand Down
2 changes: 1 addition & 1 deletion ...ultiple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueSendService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.servicebus;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
import com.azure.spring.servicebus.core.ServiceBusTemplate;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/QueueSendController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.servicebus;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
import com.azure.spring.servicebus.core.ServiceBusTemplate;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/TopicSendController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.servicebus;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
import com.azure.spring.servicebus.core.ServiceBusTemplate;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/ReceiveService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.springframework.stereotype.Service;

/**
* @author Miao Cao
*
*/
@Service
public class ReceiveService {
Expand Down
2 changes: 1 addition & 1 deletion ...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/SendController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.sample.storage.queue;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.handler.DefaultMessageHandler;
import com.azure.spring.storage.queue.core.StorageQueueTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down

0 comments on commit 58e7b2e

Please sign in to comment.