remove orig file

ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java.orig

-package de.ozgcloud.client.autoconfigure;
-
-import java.util.Map;
-
-import org.mapstruct.factory.Mappers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-
-import de.ozgcloud.apilib.alfa.AlfaService;
-import de.ozgcloud.apilib.alfa.CommandAlfaService;
-import de.ozgcloud.apilib.alfa.dummy.DummyAlfaService;
-import de.ozgcloud.apilib.common.callcontext.DefaultOzgCloudCallContextProvider;
-import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
-import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
-import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
-import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
-import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
-import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
-import de.ozgcloud.apilib.user.GrpcOzgCloudUserProfileService;
-import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
-import de.ozgcloud.apilib.user.UserProfileMapper;
-import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
-import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
-import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
-import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
-import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
-import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
-<<<<<<< HEAD
-import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-=======
-import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
->>>>>>> master
-import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
-import net.devh.boot.grpc.client.config.GrpcChannelProperties;
-import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
-import net.devh.boot.grpc.client.inject.GrpcClient;
-
-@AutoConfiguration(before = GrpcClientAutoConfiguration.class)
-@ComponentScan("de.ozgcloud.client.autoconfigure")
-@Import({
-		GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
-		OzgCloudCallContextAttachingInterceptor.class
-})
-
-public class OzgCloudClientAutoConfiguration {
-
-	private static final String CLIENT_NAME_VORGANG_MANAGER = "vorgang-manager";
-	private static final String CLIENT_NAME_FILE_MANAGER = "file-manager";
-	private static final String CLIENT_NAME_COMMAND_MANAGER = "command-manager";
-
-	@Autowired
-	private OzgCloudVorgangManagerProperties vorgangManagerProperties;
-	@Autowired
-	private OzgCloudFileManagerProperties fileManagerProperties;
-	@Autowired
-	private OzgCloudCommandManagerProperties commandManagerProperties;
-
-	// @Bean
-	// @ConditionalOnProperty("ozgcloud.vorgang-manager.address")
-	GrpcChannelsProperties channelProperties(GrpcChannelsProperties properties) {
-		// var properties = new GrpcChannelsProperties();
-		var clientMap = properties.getClient();
-
-		addVorgangManager(clientMap);
-		addFileManager(clientMap);
-		addCommandManager(clientMap);
-
-		return properties;
-	}
-
-	@Bean
-	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	GrpcChannelsProperties commandProperties() {
-		var properties = new GrpcChannelsProperties();
-		var clientMap = properties.getClient();
-		addCommandManager(clientMap);
-		return properties;
-	}
-
-	private void addVorgangManager(Map<String, GrpcChannelProperties> clientMap) {
-		var channelProps = new GrpcChannelProperties();
-		channelProps.setAddress(vorgangManagerProperties.getAddress());
-		channelProps.setNegotiationType(vorgangManagerProperties.getNegotiationType());
-
-		clientMap.put(CLIENT_NAME_VORGANG_MANAGER, channelProps);
-	}
-
-	private void addFileManager(Map<String, GrpcChannelProperties> clientMap) {
-		var channelProps = new GrpcChannelProperties();
-		channelProps.setAddress(fileManagerProperties.getAddress());
-		channelProps.setNegotiationType(fileManagerProperties.getNegotiationType());
-
-		clientMap.put(CLIENT_NAME_FILE_MANAGER, channelProps);
-	}
-
-	private void addCommandManager(Map<String, GrpcChannelProperties> clientMap) {
-		var channelProps = new GrpcChannelProperties();
-		channelProps.setAddress(commandManagerProperties.getAddress());
-		channelProps.setNegotiationType(commandManagerProperties.getNegotiationType());
-
-		clientMap.put(CLIENT_NAME_COMMAND_MANAGER, channelProps);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	OzgCloudCallContextProvider callContextProvider(ApplicationContext ctxt) {
-		return new DefaultOzgCloudCallContextProvider(ctxt);
-	}
-
-	@Bean("ozgCloudVorgangService")
-	@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
-	OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub,
-			OzgCloudVorgangMapper mapper,
-			OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
-
-		return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
-	}
-
-	@Bean
-	OzgCloudVorgangMapper ozgCloudVorgangMapper() {
-		return Mappers.getMapper(OzgCloudVorgangMapper.class);
-	}
-
-	@Bean
-	OzgCloudVorgangStubMapper ozgCloudVorgangStubMapper() {
-		return Mappers.getMapper(OzgCloudVorgangStubMapper.class);
-	}
-
-	@Bean("ozgCloudVorgangService")
-	@ConditionalOnMissingBean(OzgCloudVorgangService.class)
-	OzgCloudVorgangService dummyOzgCloudVorgangService() {
-		return new DummyVorgangService();
-	}
-
-	@Bean
-	OzgCloudVorgangIdMapper ozgCloudVorgangIdMapper() {
-		return Mappers.getMapper(OzgCloudVorgangIdMapper.class);
-	}
-
-	@Bean
-	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
-			CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
-		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
-				GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
-	}
-
-	@Bean
-	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	CommandMapper commandMapper() {
-		return Mappers.getMapper(CommandMapper.class);
-	}
-
-	@Bean
-	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	AlfaService commandAlfaService(OzgCloudCommandService commandService) {
-		return new CommandAlfaService(commandService);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	AlfaService alfaService() {
-		return new DummyAlfaService();
-	}
-
-	@Bean
-	@ConditionalOnProperty("ozgcloud.user-manager.address")
-	OzgCloudUserProfileService grpcOzgCloudUserProfileService(@GrpcClient("user-manager") UserProfileServiceBlockingStub grpcStub,
-			UserProfileMapper mapper) {
-		return new GrpcOzgCloudUserProfileService(grpcStub, mapper);
-	}
-}