add user profile service

api-lib-core/pom.xml

@@ -42,11 +42,11 @@
 			<version>${vorgang-manager.version}</version>
 		</dependency>
 		
-<!--		<dependency>-->
-<!--			<groupId>de.ozgcloud.user</groupId>-->
-<!--			<artifactId>user-manager-interface</artifactId>-->
-<!--			<version>${user-manager.version}</version>-->
-<!--		</dependency>-->
+		<dependency>
+			<groupId>de.ozgcloud.user</groupId>
+			<artifactId>user-manager-interface</artifactId>
+			<version>${user-manager.version}</version>
+		</dependency>
 
 		<!--spring -->
 		<dependency>

api-lib-core/src/main/java/de/ozgcloud/apilib/user/GrpcOzgCloudUserProfileService.java

 package de.ozgcloud.apilib.user;
 
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
+import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest;
 import lombok.RequiredArgsConstructor;
+import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @RequiredArgsConstructor
-public class GrpcOzgCloudUserProfileService {
-//implements OzgCloudUserProfileService {
-	/*
-	 * @GrpcClient("user-manager") private final UserProfileServiceBlockingStub
-	 * serviceStub;
-	 * 
-	 * private final UserProfileMapper mapper;
-	 * 
-	 * @Override public OzgCloudUserProfile getById(OzgCloudUserId userId) { var
-	 * grpcUserProfileResponse = serviceStub.getById(buildGetUserRequest(userId));
-	 * 
-	 * return mapper.mapFromGrpc(grpcUserProfileResponse.getUserProfile()); }
-	 * 
-	 * private GrpcGetUserProfileRequest buildGetUserRequest(OzgCloudUserId id) {
-	 * return GrpcGetUserProfileRequest.newBuilder() .setUserId(id.toString())
-	 * .build(); }
-	 */
+public class GrpcOzgCloudUserProfileService
+		implements OzgCloudUserProfileService {
+
+	@GrpcClient("user-manager")
+	private final UserProfileServiceBlockingStub serviceStub;
+
+	private final UserProfileMapper mapper;
+
+	@Override
+	public OzgCloudUserProfile getById(OzgCloudUserId userId) {
+		var grpcUserProfileResponse = serviceStub.getById(buildGetUserRequest(userId));
+
+		return mapper.mapFromGrpc(grpcUserProfileResponse.getUserProfile());
+	}
+
+	private GrpcGetUserProfileRequest buildGetUserRequest(OzgCloudUserId id) {
+		return GrpcGetUserProfileRequest.newBuilder().setUserId(id.toString())
+				.build();
+	}
+
 }

api-lib-core/src/main/java/de/ozgcloud/apilib/user/UserProfileMapper.java

 package de.ozgcloud.apilib.user;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import de.ozgcloud.user.userprofile.GrpcUserProfile;
+import lombok.NonNull;
 
 @Mapper
 public interface UserProfileMapper {
-	/*
-	 * OzgCloudUserProfile mapFromGrpc(GrpcUserProfile userProfile);
-	 * 
-	 * default OzgCloudUserId toOzgCloudUserId(@NonNull String id) { return
-	 * OzgCloudUserId.from(id); }
-	 */
+
+	@Mapping(target = "email", source = "email")
+	OzgCloudUserProfile mapFromGrpc(GrpcUserProfile userProfile);
+
+	default OzgCloudUserId toOzgCloudUserId(@NonNull String id) {
+		return OzgCloudUserId.from(id);
+	}
+
 }

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

@@ -31,12 +31,12 @@ 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;
-import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
 import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
+import io.grpc.ManagedChannelBuilder;
 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")
@@ -169,8 +169,11 @@ public class OzgCloudClientAutoConfiguration {
 
 	@Bean
 	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("ozgcloud-command-manager") CommandServiceBlockingStub commandServiceStub,
-			CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
+	OzgCloudCommandService grpcOzgCloudCommandService(CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
+		var channel = ManagedChannelBuilder.forTarget(commandManagerProperties.getAddress()).usePlaintext().build();
+
+		var commandServiceStub = CommandServiceGrpc.newBlockingStub(channel);
+
 		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
 				GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
 	}

pom.xml

@@ -28,8 +28,8 @@
 		<failsafe-plugin.version>3.2.2</failsafe-plugin.version>
 		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
 		
-		<vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
-		<user-manager.version>2.0.0-SNAPSHOT</user-manager.version>
+		<vorgang-manager.version>2.0.0</vorgang-manager.version>
+		<user-manager.version>2.1.0-SNAPSHOT</user-manager.version>
 	</properties>
 
 	<build>