Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(notifications): fix MicrosoftTeamsConfig which has unused retrofit1 parameters #1485

Merged
merged 1 commit into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,18 @@
import com.netflix.spinnaker.config.OkHttp3ClientConfiguration;
import com.netflix.spinnaker.echo.microsoftteams.MicrosoftTeamsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import retrofit.RestAdapter;
import retrofit.client.Client;

@Configuration
@ConditionalOnProperty("microsoftteams.enabled")
@Slf4j
public class MicrosoftTeamsConfig {

@Autowired OkHttp3ClientConfiguration okHttp3ClientConfiguration;

@Bean
public MicrosoftTeamsService microsoftTeamsService(
Client retrofitClient, RestAdapter.LogLevel retrofitLogLevel) {
OkHttp3ClientConfiguration okHttp3ClientConfiguration) {
log.info("Microsoft Teams service loaded");

return new MicrosoftTeamsService(okHttp3ClientConfiguration);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright 2025 OpsMx, Inc.
*
* Licensed 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 com.netflix.spinnaker.echo.config;

import static org.junit.jupiter.api.Assertions.assertNotNull;

import com.netflix.spinnaker.echo.microsoftteams.MicrosoftTeamsService;
import com.netflix.spinnaker.echo.test.config.Retrofit2BasicLogTestConfig;
import com.netflix.spinnaker.echo.test.config.Retrofit2TestConfig;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {
MicrosoftTeamsConfig.class,
Retrofit2TestConfig.class,
Retrofit2BasicLogTestConfig.class
},
properties = "microsoftteams.enabled=true")
public class MicrosoftTeamsServiceTest {

@Autowired private MicrosoftTeamsService microsoftTeamsService;

@Test
void testMicrosoftTeamsServiceConfiguration() {
assertNotNull(microsoftTeamsService);
}
}