Skip to content

Commit 41b1832

Browse files
fix(notifications): fix MicrosoftTeamsConfig which has unused retrofit1 parameters (#1485)
1 parent 8a2b94a commit 41b1832

File tree

2 files changed

+44
-6
lines changed

2 files changed

+44
-6
lines changed

echo-notifications/src/main/java/com/netflix/spinnaker/echo/config/MicrosoftTeamsConfig.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,18 @@
1919
import com.netflix.spinnaker.config.OkHttp3ClientConfiguration;
2020
import com.netflix.spinnaker.echo.microsoftteams.MicrosoftTeamsService;
2121
import lombok.extern.slf4j.Slf4j;
22-
import org.springframework.beans.factory.annotation.Autowired;
2322
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2423
import org.springframework.context.annotation.Bean;
2524
import org.springframework.context.annotation.Configuration;
26-
import retrofit.RestAdapter;
27-
import retrofit.client.Client;
2825

2926
@Configuration
3027
@ConditionalOnProperty("microsoftteams.enabled")
3128
@Slf4j
3229
public class MicrosoftTeamsConfig {
3330

34-
@Autowired OkHttp3ClientConfiguration okHttp3ClientConfiguration;
35-
3631
@Bean
3732
public MicrosoftTeamsService microsoftTeamsService(
38-
Client retrofitClient, RestAdapter.LogLevel retrofitLogLevel) {
33+
OkHttp3ClientConfiguration okHttp3ClientConfiguration) {
3934
log.info("Microsoft Teams service loaded");
4035

4136
return new MicrosoftTeamsService(okHttp3ClientConfiguration);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright 2025 OpsMx, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.netflix.spinnaker.echo.config;
18+
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
20+
21+
import com.netflix.spinnaker.echo.microsoftteams.MicrosoftTeamsService;
22+
import com.netflix.spinnaker.echo.test.config.Retrofit2BasicLogTestConfig;
23+
import com.netflix.spinnaker.echo.test.config.Retrofit2TestConfig;
24+
import org.junit.jupiter.api.Test;
25+
import org.springframework.beans.factory.annotation.Autowired;
26+
import org.springframework.boot.test.context.SpringBootTest;
27+
28+
@SpringBootTest(
29+
classes = {
30+
MicrosoftTeamsConfig.class,
31+
Retrofit2TestConfig.class,
32+
Retrofit2BasicLogTestConfig.class
33+
},
34+
properties = "microsoftteams.enabled=true")
35+
public class MicrosoftTeamsServiceTest {
36+
37+
@Autowired private MicrosoftTeamsService microsoftTeamsService;
38+
39+
@Test
40+
void testMicrosoftTeamsServiceConfiguration() {
41+
assertNotNull(microsoftTeamsService);
42+
}
43+
}

0 commit comments

Comments
 (0)