Merge branch 'master' of git.ozg-sh.de:mgm/ozgcloud-api-lib

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

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

@@ -25,14 +25,12 @@ 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.vorgang.OzgCloudVorgangIdMapperImpl;
 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.OzgCloudEingangMapperImpl;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
-import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapperImpl;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
+import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapperImpl;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
 import net.devh.boot.grpc.client.config.GrpcChannelProperties;
 import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
@@ -42,9 +40,9 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @ComponentScan("de.ozgcloud.client.autoconfigure")
 @Import({
 		GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
-		OzgCloudCallContextAttachingInterceptor.class,
-		OzgCloudVorgangMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class
+		OzgCloudCallContextAttachingInterceptor.class, OzgCloudVorgangStubMapperImpl.class
 })
+
 public class OzgCloudClientAutoConfiguration {
 
 	private static final String CLIENT_NAME_VORGANG_MANAGER = "vorgang-manager";
@@ -139,5 +137,4 @@ public class OzgCloudClientAutoConfiguration {
 	AlfaService alfaService() {
 		return new DummyAlfaService();
 	}
-
 }