BIGTOP-4172: Rename mapstruct class name (#28)

apache · Jul 30, 2024 · 538b969 · 538b969
1 parent d2a2dae
commit 538b969
Show file tree

Hide file tree

Showing 38 changed files with 208 additions and 147 deletions.
diff --git a/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/utils/DateUtils.java b/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/utils/DateUtils.java
@@ -31,14 +31,18 @@
 public final class DateUtils {
 
     /**
-     * date format of yyyy-MM-dd HH:mm:ss
+     * date format pattern of yyyy-MM-dd HH:mm:ss
      */
-    public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+    private static final String DEFAULT_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
     private DateUtils() {
         throw new UnsupportedOperationException("Construct DateUtils");
     }
 
+    public static String format(Timestamp timestamp) {
+        return format(timestamp, DEFAULT_PATTERN);
+    }
+
     public static String format(Timestamp timestamp, String pattern) {
         if (Objects.isNull(timestamp)) {
             return StringUtils.EMPTY;
@@ -47,6 +51,10 @@ public static String format(Timestamp timestamp, String pattern) {
         return format(new Date(timestamp.getTime()), pattern);
     }
 
+    public static String format(Date date) {
+        return format(date, DEFAULT_PATTERN);
+    }
+
     public static String format(Date date, String pattern) {
         if (Objects.isNull(date)) {
             return StringUtils.EMPTY;

diff --git a/...a/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java b/...a/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java
@@ -30,9 +30,9 @@
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
 import org.apache.bigtop.manager.server.command.job.runner.AbstractJobRunner;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
+import org.apache.bigtop.manager.server.model.converter.ClusterConverter;
 import org.apache.bigtop.manager.server.model.dto.ClusterDTO;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
-import org.apache.bigtop.manager.server.model.mapper.ClusterMapper;
 import org.apache.bigtop.manager.server.service.ClusterService;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -73,7 +73,7 @@ public void beforeRun() {
 
         // Save cluster
         CommandDTO commandDTO = getCommandDTO();
-        ClusterDTO clusterDTO = ClusterMapper.INSTANCE.fromCommand2DTO(commandDTO.getClusterCommand());
+        ClusterDTO clusterDTO = ClusterConverter.INSTANCE.fromCommand2DTO(commandDTO.getClusterCommand());
         clusterService.save(clusterDTO);
     }
 

diff --git a/.../org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java b/.../org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java
@@ -33,13 +33,13 @@
 import org.apache.bigtop.manager.server.command.CommandIdentifier;
 import org.apache.bigtop.manager.server.command.job.runner.AbstractJobRunner;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
+import org.apache.bigtop.manager.server.model.converter.ComponentConverter;
+import org.apache.bigtop.manager.server.model.converter.ServiceConverter;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.ComponentDTO;
 import org.apache.bigtop.manager.server.model.dto.ComponentHostDTO;
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
-import org.apache.bigtop.manager.server.model.mapper.ComponentMapper;
-import org.apache.bigtop.manager.server.model.mapper.ServiceMapper;
 import org.apache.bigtop.manager.server.service.ConfigService;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 
@@ -107,7 +107,7 @@ private void upsertService(Service service, ServiceCommandDTO serviceCommand) {
         // 1. Persist service
         if (service == null) {
             ServiceDTO serviceDTO = StackUtils.getServiceDTO(stackName, stackVersion, serviceName);
-            service = ServiceMapper.INSTANCE.fromDTO2Entity(serviceDTO, cluster);
+            service = ServiceConverter.INSTANCE.fromDTO2Entity(serviceDTO, cluster);
             service = serviceRepository.save(service);
         }
 
@@ -121,7 +121,7 @@ private void upsertService(Service service, ServiceCommandDTO serviceCommand) {
             Component component = componentRepository.findByClusterIdAndComponentName(clusterId, componentName);
             if (component == null) {
                 ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName);
-                component = ComponentMapper.INSTANCE.fromDTO2Entity(componentDTO, service, cluster);
+                component = ComponentConverter.INSTANCE.fromDTO2Entity(componentDTO, service, cluster);
                 component = componentRepository.save(component);
             }
 

diff --git a/.../apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java b/.../apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java
@@ -47,10 +47,10 @@
 import org.apache.bigtop.manager.grpc.utils.ProtobufUtil;
 import org.apache.bigtop.manager.server.command.stage.factory.StageType;
 import org.apache.bigtop.manager.server.command.stage.runner.AbstractStageRunner;
+import org.apache.bigtop.manager.server.model.converter.RepoConverter;
 import org.apache.bigtop.manager.server.model.dto.PropertyDTO;
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
-import org.apache.bigtop.manager.server.model.mapper.RepoMapper;
 import org.apache.bigtop.manager.server.utils.StackConfigUtils;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 
@@ -202,7 +202,7 @@ private void genCaches() {
 
         repoList = new ArrayList<>();
         repos.forEach(repo -> {
-            RepoInfo repoInfo = RepoMapper.INSTANCE.fromEntity2Message(repo);
+            RepoInfo repoInfo = RepoConverter.INSTANCE.fromEntity2Message(repo);
             repoList.add(repoInfo);
         });
 
@@ -239,7 +239,7 @@ private void genEmptyCaches() {
         StackDTO stackDTO = immutablePair.getLeft();
         List<ServiceDTO> serviceDTOList = immutablePair.getRight();
 
-        repoList = RepoMapper.INSTANCE.fromDTO2Message(stageContext.getRepoInfoList());
+        repoList = RepoConverter.INSTANCE.fromDTO2Message(stageContext.getRepoInfoList());
         clusterInfo = new ClusterInfo();
         clusterInfo.setClusterName(stageContext.getClusterName());
         clusterInfo.setStackName(stageContext.getStackName());

diff --git a/...r-server/src/main/java/org/apache/bigtop/manager/server/config/MapStructSharedConfig.java b/...r-server/src/main/java/org/apache/bigtop/manager/server/config/MapStructSharedConfig.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
+ *
+ *    https://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 org.apache.bigtop.manager.server.config;
+
+import org.mapstruct.MapperConfig;
+import org.mapstruct.ReportingPolicy;
+
+@MapperConfig(unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public class MapStructSharedConfig {}
diff --git a/...r-server/src/main/java/org/apache/bigtop/manager/server/controller/ClusterController.java b/...r-server/src/main/java/org/apache/bigtop/manager/server/controller/ClusterController.java
@@ -18,8 +18,8 @@
  */
 package org.apache.bigtop.manager.server.controller;
 
+import org.apache.bigtop.manager.server.model.converter.ClusterConverter;
 import org.apache.bigtop.manager.server.model.dto.ClusterDTO;
-import org.apache.bigtop.manager.server.model.mapper.ClusterMapper;
 import org.apache.bigtop.manager.server.model.req.ClusterReq;
 import org.apache.bigtop.manager.server.model.vo.ClusterVO;
 import org.apache.bigtop.manager.server.service.ClusterService;
@@ -62,7 +62,7 @@ public ResponseEntity<ClusterVO> get(@PathVariable Long id) {
     @Operation(summary = "update", description = "Update a cluster")
     @PutMapping("/{id}")
     public ResponseEntity<ClusterVO> update(@PathVariable Long id, @RequestBody @Validated ClusterReq clusterReq) {
-        ClusterDTO clusterDTO = ClusterMapper.INSTANCE.fromReq2DTO(clusterReq);
+        ClusterDTO clusterDTO = ClusterConverter.INSTANCE.fromReq2DTO(clusterReq);
         return ResponseEntity.success(clusterService.update(id, clusterDTO));
     }
 }
diff --git a/...r-server/src/main/java/org/apache/bigtop/manager/server/controller/CommandController.java b/...r-server/src/main/java/org/apache/bigtop/manager/server/controller/CommandController.java
@@ -19,8 +19,8 @@
 package org.apache.bigtop.manager.server.controller;
 
 import org.apache.bigtop.manager.server.annotations.Audit;
+import org.apache.bigtop.manager.server.model.converter.CommandConverter;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
-import org.apache.bigtop.manager.server.model.mapper.CommandMapper;
 import org.apache.bigtop.manager.server.model.req.CommandReq;
 import org.apache.bigtop.manager.server.model.vo.CommandVO;
 import org.apache.bigtop.manager.server.service.CommandService;
@@ -49,7 +49,7 @@ public class CommandController {
     @Operation(summary = "command", description = "Command for component by [host,component,service,cluster]")
     @PostMapping
     public ResponseEntity<CommandVO> command(@RequestBody @Validated CommandReq commandReq) {
-        CommandDTO commandDTO = CommandMapper.INSTANCE.fromReq2DTO(commandReq);
+        CommandDTO commandDTO = CommandConverter.INSTANCE.fromReq2DTO(commandReq);
         CommandVO commandVO = commandService.command(commandDTO);
         return ResponseEntity.success(commandVO);
     }

diff --git a/...ager-server/src/main/java/org/apache/bigtop/manager/server/controller/HostController.java b/...ager-server/src/main/java/org/apache/bigtop/manager/server/controller/HostController.java
@@ -18,8 +18,8 @@
  */
 package org.apache.bigtop.manager.server.controller;
 
+import org.apache.bigtop.manager.server.model.converter.HostConverter;
 import org.apache.bigtop.manager.server.model.dto.HostDTO;
-import org.apache.bigtop.manager.server.model.mapper.HostMapper;
 import org.apache.bigtop.manager.server.model.req.HostReq;
 import org.apache.bigtop.manager.server.model.req.HostnamesReq;
 import org.apache.bigtop.manager.server.model.vo.HostVO;
@@ -63,7 +63,7 @@ public ResponseEntity<HostVO> get(@PathVariable Long id) {
     @Operation(summary = "update", description = "Update a host")
     // @PutMapping("/{id}")
     public ResponseEntity<HostVO> update(@PathVariable Long id, @RequestBody @Validated HostReq hostReq) {
-        HostDTO hostDTO = HostMapper.INSTANCE.fromReq2DTO(hostReq);
+        HostDTO hostDTO = HostConverter.INSTANCE.fromReq2DTO(hostReq);
         return ResponseEntity.success(hostService.update(id, hostDTO));
     }
 

diff --git a/...ger-server/src/main/java/org/apache/bigtop/manager/server/controller/LoginController.java b/...ger-server/src/main/java/org/apache/bigtop/manager/server/controller/LoginController.java
@@ -22,8 +22,8 @@
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.holder.SessionUserHolder;
+import org.apache.bigtop.manager.server.model.converter.LoginConverter;
 import org.apache.bigtop.manager.server.model.dto.LoginDTO;
-import org.apache.bigtop.manager.server.model.mapper.LoginMapper;
 import org.apache.bigtop.manager.server.model.req.LoginReq;
 import org.apache.bigtop.manager.server.model.vo.LoginVO;
 import org.apache.bigtop.manager.server.service.LoginService;
@@ -55,7 +55,7 @@ public ResponseEntity<LoginVO> login(@RequestBody LoginReq loginReq) {
             throw new ApiException(ApiExceptionEnum.USERNAME_OR_PASSWORD_REQUIRED);
         }
 
-        LoginDTO loginDTO = LoginMapper.INSTANCE.fromReq2DTO(loginReq);
+        LoginDTO loginDTO = LoginConverter.INSTANCE.fromReq2DTO(loginReq);
         return ResponseEntity.success(loginService.login(loginDTO));
     }
 

diff --git a/...ager-server/src/main/java/org/apache/bigtop/manager/server/controller/UserController.java b/...ager-server/src/main/java/org/apache/bigtop/manager/server/controller/UserController.java
@@ -19,8 +19,8 @@
 package org.apache.bigtop.manager.server.controller;
 
 import org.apache.bigtop.manager.server.annotations.Audit;
+import org.apache.bigtop.manager.server.model.converter.UserConverter;
 import org.apache.bigtop.manager.server.model.dto.UserDTO;
-import org.apache.bigtop.manager.server.model.mapper.UserMapper;
 import org.apache.bigtop.manager.server.model.req.UserReq;
 import org.apache.bigtop.manager.server.model.vo.UserVO;
 import org.apache.bigtop.manager.server.service.UserService;
@@ -56,7 +56,7 @@ public ResponseEntity<UserVO> current() {
     @Operation(summary = "update", description = "Update a user")
     @PutMapping
     public ResponseEntity<UserVO> update(@RequestBody @Validated UserReq userReq) {
-        UserDTO userDTO = UserMapper.INSTANCE.fromReq2DTO(userReq);
+        UserDTO userDTO = UserConverter.INSTANCE.fromReq2DTO(userReq);
         return ResponseEntity.success(userService.update(userDTO));
     }
 }
diff --git a/...er/server/model/mapper/ClusterMapper.java → ...ver/model/converter/ClusterConverter.java b/...er/server/model/mapper/ClusterMapper.java → ...ver/model/converter/ClusterConverter.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
 import org.apache.bigtop.manager.dao.entity.Cluster;
 import org.apache.bigtop.manager.dao.entity.Stack;
+import org.apache.bigtop.manager.server.config.MapStructSharedConfig;
 import org.apache.bigtop.manager.server.model.dto.ClusterDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ClusterCommandDTO;
@@ -31,10 +32,10 @@
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
-@Mapper
-public interface ClusterMapper {
+@Mapper(config = MapStructSharedConfig.class)
+public interface ClusterConverter {
 
-    ClusterMapper INSTANCE = Mappers.getMapper(ClusterMapper.class);
+    ClusterConverter INSTANCE = Mappers.getMapper(ClusterConverter.class);
 
     ClusterDTO fromReq2DTO(ClusterReq clusterReq);
 

diff --git a/...er/server/model/mapper/CommandMapper.java → ...ver/model/converter/CommandConverter.java b/...er/server/model/mapper/CommandMapper.java → ...ver/model/converter/CommandConverter.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
+import org.apache.bigtop.manager.server.config.MapStructSharedConfig;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
 import org.apache.bigtop.manager.server.model.req.CommandReq;
@@ -28,10 +29,10 @@
 
 import java.util.List;
 
-@Mapper
-public interface CommandMapper {
+@Mapper(config = MapStructSharedConfig.class)
+public interface CommandConverter {
 
-    CommandMapper INSTANCE = Mappers.getMapper(CommandMapper.class);
+    CommandConverter INSTANCE = Mappers.getMapper(CommandConverter.class);
 
     CommandDTO fromReq2DTO(CommandReq commandReq);
 

diff --git a/.../server/model/mapper/ComponentMapper.java → ...r/model/converter/ComponentConverter.java b/.../server/model/mapper/ComponentMapper.java → ...r/model/converter/ComponentConverter.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
 import org.apache.bigtop.manager.dao.entity.Cluster;
 import org.apache.bigtop.manager.dao.entity.Component;
 import org.apache.bigtop.manager.dao.entity.Service;
+import org.apache.bigtop.manager.server.config.MapStructSharedConfig;
 import org.apache.bigtop.manager.server.model.dto.ComponentDTO;
 import org.apache.bigtop.manager.server.model.vo.ComponentVO;
 import org.apache.bigtop.manager.server.stack.model.ComponentModel;
@@ -32,10 +33,12 @@
 
 import java.util.List;
 
-@Mapper(uses = {TypeConvert.class})
-public interface ComponentMapper {
+@Mapper(
+        uses = {ConverterTool.class},
+        config = MapStructSharedConfig.class)
+public interface ComponentConverter {
 
-    ComponentMapper INSTANCE = Mappers.getMapper(ComponentMapper.class);
+    ComponentConverter INSTANCE = Mappers.getMapper(ComponentConverter.class);
 
     @Mapping(target = "commandScript", source = "commandScript", qualifiedByName = "obj2Json")
     @Mapping(target = "customCommands", source = "customCommands", qualifiedByName = "obj2Json")

diff --git a/...ager/server/model/mapper/TypeConvert.java → ...server/model/converter/ConverterTool.java b/...ager/server/model/mapper/TypeConvert.java → ...server/model/converter/ConverterTool.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.model.dto.PropertyDTO;
@@ -28,7 +28,7 @@
 
 import java.util.List;
 
-public class TypeConvert {
+public class ConverterTool {
 
     @Named("obj2Json")
     public <T> String obj2Json(T obj) {

diff --git a/...ver/model/mapper/HostComponentMapper.java → ...del/converter/HostComponentConverter.java b/...ver/model/mapper/HostComponentMapper.java → ...del/converter/HostComponentConverter.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
 import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.server.config.MapStructSharedConfig;
 import org.apache.bigtop.manager.server.model.vo.HostComponentVO;
 
 import org.mapstruct.Mapper;
@@ -27,10 +28,10 @@
 
 import java.util.List;
 
-@Mapper
-public interface HostComponentMapper {
+@Mapper(config = MapStructSharedConfig.class)
+public interface HostComponentConverter {
 
-    HostComponentMapper INSTANCE = Mappers.getMapper(HostComponentMapper.class);
+    HostComponentConverter INSTANCE = Mappers.getMapper(HostComponentConverter.class);
 
     @Mapping(target = "componentName", source = "component.componentName")
     @Mapping(target = "displayName", source = "component.displayName")

diff --git a/...nager/server/model/mapper/HostMapper.java → ...server/model/converter/HostConverter.java b/...nager/server/model/mapper/HostMapper.java → ...server/model/converter/HostConverter.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.bigtop.manager.server.model.mapper;
+package org.apache.bigtop.manager.server.model.converter;
 
 import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.server.config.MapStructSharedConfig;
 import org.apache.bigtop.manager.server.model.dto.HostDTO;
 import org.apache.bigtop.manager.server.model.req.HostReq;
 import org.apache.bigtop.manager.server.model.vo.HostVO;
@@ -29,10 +30,10 @@
 
 import java.util.List;
 
-@Mapper
-public interface HostMapper {
+@Mapper(config = MapStructSharedConfig.class)
+public interface HostConverter {
 
-    HostMapper INSTANCE = Mappers.getMapper(HostMapper.class);
+    HostConverter INSTANCE = Mappers.getMapper(HostConverter.class);
 
     HostDTO fromReq2DTO(HostReq hostReq);