Merge pull request alibaba#172 from N2XK/master

craftsman适配4.0.1版本的cola framwork
hn8530 · May 28, 2021 · 921fb70 · 921fb70
2 parents f574823 + 388f9a3
commit 921fb70
Show file tree

Hide file tree

Showing 35 changed files with 193 additions and 167 deletions.
diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
@@ -128,7 +128,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.55</version>
+                <version>1.2.70</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>

diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -135,7 +135,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.55</version>
+                <version>1.2.70</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>

diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml
@@ -101,17 +101,17 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.sonatype.plugins</groupId>-->
+<!--                <artifactId>nexus-staging-maven-plugin</artifactId>-->
+<!--                <version>1.6.8</version>-->
+<!--                <extensions>true</extensions>-->
+<!--                <configuration>-->
+<!--                    <serverId>ossrh</serverId>-->
+<!--                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
+<!--                    <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

diff --git a/cola-components/cola-component-dto/src/main/java/com/alibaba/cola/dto/ClientObject.java b/cola-components/cola-component-dto/src/main/java/com/alibaba/cola/dto/ClientObject.java
@@ -0,0 +1,39 @@
+package com.alibaba.cola.dto;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This is the object communicate with Client.
+ * The clients could be view layer or other HSF Consumers
+ * @author fulan.zjf 2017-10-27 PM 12:19:15
+ */
+public abstract class ClientObject implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This is for extended values
+     */
+    protected Map<String, Object> extValues = new HashMap<String, Object>();
+
+    public Object getExtField(String key){
+        if(extValues != null){
+            return extValues.get(key);
+        }
+        return null;
+    }
+
+    public void putExtField(String fieldName, Object value){
+        this.extValues.put(fieldName, value);
+    }
+
+    public Map<String, Object> getExtValues() {
+        return extValues;
+    }
+
+    public void setExtValues(Map<String, Object> extValues) {
+        this.extValues = extValues;
+    }
+}
diff --git a/cola-components/pom.xml b/cola-components/pom.xml
@@ -112,7 +112,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.60</version>
+                <version>1.2.70</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -154,17 +154,17 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.sonatype.plugins</groupId>-->
+<!--                <artifactId>nexus-staging-maven-plugin</artifactId>-->
+<!--                <version>1.6.8</version>-->
+<!--                <extensions>true</extensions>-->
+<!--                <configuration>-->
+<!--                    <serverId>ossrh</serverId>-->
+<!--                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
+<!--                    <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

diff --git a/...es/craftsman/craftsman-controller/pom.xml → samples/craftsman/craftsman-adapter/pom.xml b/...es/craftsman/craftsman-controller/pom.xml → samples/craftsman/craftsman-adapter/pom.xml
@@ -8,9 +8,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>craftsman-controller</artifactId>
+    <artifactId>craftsman-adapter</artifactId>
     <packaging>jar</packaging>
-    <name>craftsman-controller</name>
+    <name>craftsman-adapter</name>
 
     <dependencies>
         <dependency>

diff --git a/...aftsman/controller/MetricsController.java → ...baba/craftsman/web/MetricsController.java b/...aftsman/controller/MetricsController.java → ...baba/craftsman/web/MetricsController.java
@@ -1,4 +1,4 @@
-package com.alibaba.craftsman.controller;
+package com.alibaba.craftsman.web;
 
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.Response;

diff --git a/samples/craftsman/craftsman-app/pom.xml b/samples/craftsman/craftsman-app/pom.xml
@@ -13,6 +13,10 @@
     <name>craftsman-app</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-catchlog-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.craftsman</groupId>
             <artifactId>craftsman-client</artifactId>

diff --git a/...aftsman/craftsman-app/src/main/java/com/alibaba/craftsman/command/RefreshScoreCmdExe.java b/...aftsman/craftsman-app/src/main/java/com/alibaba/craftsman/command/RefreshScoreCmdExe.java
@@ -2,8 +2,6 @@
 
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.Assert;
-import com.alibaba.cola.logger.Logger;
-import com.alibaba.cola.logger.LoggerFactory;
 import com.alibaba.craftsman.domain.metrics.SubMetric;
 import com.alibaba.craftsman.domain.metrics.appquality.AppMetric;
 import com.alibaba.craftsman.domain.metrics.appquality.AppQualityMetric;
@@ -13,7 +11,6 @@
 import com.alibaba.craftsman.domain.metrics.techinfluence.InfluenceMetric;
 import com.alibaba.craftsman.domain.user.UserProfile;
 import com.alibaba.craftsman.dto.RefreshScoreCmd;
-import com.alibaba.craftsman.event.handler.MetricItemCreatedHandler;
 import com.alibaba.craftsman.domain.gateway.MetricGateway;
 import com.alibaba.craftsman.domain.gateway.UserProfileGateway;
 import org.springframework.stereotype.Component;
@@ -23,7 +20,6 @@
 
 @Component
 public class RefreshScoreCmdExe{
-    private Logger logger = LoggerFactory.getLogger(MetricItemCreatedHandler.class);
 
     @Resource
     private UserProfileGateway userProfileGateway;

diff --git a/...sman/craftsman-app/src/main/java/com/alibaba/craftsman/command/query/ATAMetricQryExe.java b/...sman/craftsman-app/src/main/java/com/alibaba/craftsman/command/query/ATAMetricQryExe.java
@@ -27,7 +27,7 @@ public MultiResponse<ATAMetricCO> execute(ATAMetricQry cmd) {
             ataMetricCO.setOwnerId(metricDO.getUserId());
             ataMetricCOList.add(ataMetricCO);
         });
-        return MultiResponse.ofWithoutTotal(ataMetricCOList);
+        return MultiResponse.of(ataMetricCOList);
     }
 
 }
diff --git a/...raftsman-app/src/main/java/com/alibaba/craftsman/command/query/UserProfileListQryExe.java b/...raftsman-app/src/main/java/com/alibaba/craftsman/command/query/UserProfileListQryExe.java
@@ -26,7 +26,7 @@ public MultiResponse<UserProfileCO> execute(UserProfileListQry qry) {
             BeanUtils.copyProperties(userDO, userProfileCO);
             userProfileCOList.add(userProfileCO);
         });
-        return MultiResponse.ofWithoutTotal(userProfileCOList);
+        return MultiResponse.of(userProfileCOList);
     }
 
 }

diff --git a/...tsman-app/src/main/java/com/alibaba/craftsman/event/handler/MetricItemCreatedHandler.java b/...tsman-app/src/main/java/com/alibaba/craftsman/event/handler/MetricItemCreatedHandler.java
@@ -1,23 +1,20 @@
 package com.alibaba.craftsman.event.handler;
 
 
+import com.alibaba.cola.catchlog.CatchAndLog;
 import com.alibaba.cola.dto.Response;
-import com.alibaba.cola.logger.Logger;
-import com.alibaba.cola.logger.LoggerFactory;
 import com.alibaba.craftsman.api.UserProfileServiceI;
 import com.alibaba.craftsman.dto.RefreshScoreCmd;
 import com.alibaba.craftsman.dto.domainevent.MetricItemCreatedEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 
+@CatchAndLog
 public class MetricItemCreatedHandler {
 
-    private Logger logger = LoggerFactory.getLogger(MetricItemCreatedHandler.class);
-
     @Autowired
     private UserProfileServiceI userProfileService;
 
     public Response execute(MetricItemCreatedEvent event) {
-        logger.debug("Handling Event: " + event);
         RefreshScoreCmd cmd = new RefreshScoreCmd(event.getUserId());
         userProfileService.refreshScore(cmd);
         return Response.buildSuccess();

diff --git a/...aftsman/craftsman-app/src/main/java/com/alibaba/craftsman/service/MetricsServiceImpl.java b/...aftsman/craftsman-app/src/main/java/com/alibaba/craftsman/service/MetricsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.alibaba.craftsman.service;
 
+import com.alibaba.cola.catchlog.CatchAndLog;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.craftsman.api.MetricsServiceI;
@@ -18,6 +19,7 @@
  * @date 2019-03-01 11:41 AM
  */
 @Service
+@CatchAndLog
 public class MetricsServiceImpl implements MetricsServiceI{
 
     @Resource

diff --git a/...man/craftsman-app/src/main/java/com/alibaba/craftsman/service/UserProfileServiceImpl.java b/...man/craftsman-app/src/main/java/com/alibaba/craftsman/service/UserProfileServiceImpl.java
@@ -1,5 +1,6 @@
 package com.alibaba.craftsman.service;
 
+import com.alibaba.cola.catchlog.CatchAndLog;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
@@ -22,6 +23,7 @@
  * @date 2019-02-28 6:22 PM
  */
 @Service
+@CatchAndLog
 public class UserProfileServiceImpl implements UserProfileServiceI{
     @Resource
     private UserProfileAddCmdExe userProfileAddCmdExe;

diff --git a/samples/craftsman/craftsman-client/pom.xml b/samples/craftsman/craftsman-client/pom.xml
@@ -14,8 +14,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>cola-common</artifactId>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-dto</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/samples/craftsman/craftsman-domain/pom.xml b/samples/craftsman/craftsman-domain/pom.xml
@@ -15,8 +15,16 @@
     <dependencies>
         <!-- COLA Framework -->
         <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>cola-core</artifactId>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-domain-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-exception</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba.craftsman</groupId>

diff --git a/...craftsman/craftsman-domain/src/main/java/com/alibaba/craftsman/domain/metrics/Metric.java b/...craftsman/craftsman-domain/src/main/java/com/alibaba/craftsman/domain/metrics/Metric.java
@@ -1,7 +1,7 @@
 package com.alibaba.craftsman.domain.metrics;
 
 
-import com.alibaba.cola.domain.EntityObject;
+import com.alibaba.cola.domain.Entity;
 import com.alibaba.craftsman.domain.user.UserProfile;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,7 +12,8 @@
  * @author Frank Zhang
  * @date 2018-07-04 1:23 PM
  */
-public abstract class Metric extends EntityObject implements Measurable{
+@Entity
+public abstract class Metric implements Measurable{
 
     private double score;
 

diff --git a/...tsman/craftsman-domain/src/main/java/com/alibaba/craftsman/domain/metrics/MetricItem.java b/...tsman/craftsman-domain/src/main/java/com/alibaba/craftsman/domain/metrics/MetricItem.java
@@ -1,12 +1,11 @@
 package com.alibaba.craftsman.domain.metrics;
 
-import com.alibaba.cola.domain.EntityObject;
-import com.alibaba.cola.logger.Logger;
-import com.alibaba.cola.logger.LoggerFactory;
+import com.alibaba.cola.domain.Entity;
 import com.alibaba.craftsman.domain.user.UserProfile;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * MetricItem
@@ -15,9 +14,9 @@
  * @date 2018-07-04 1:23 PM
  */
 @Data
-public abstract class MetricItem extends EntityObject implements Measurable{
-
-    private static Logger logger = LoggerFactory.getLogger(MetricItem.class);
+@Entity
+@Slf4j
+public abstract class MetricItem implements Measurable{
 
     /**
      * The metric this MetricItem belongs to
@@ -41,7 +40,7 @@ public void setSubMetric(SubMetric subMetric){
      */
     public String toJsonString() {
         String jsonStr = JSON.toJSONString(this, JSONPropertyFilter.singleton);
-        logger.debug("\n From : " + this + " \n To: " + jsonStr);
+        log.debug("\n From : " + this + " \n To: " + jsonStr);
         return jsonStr;
     }
 

diff --git a/...n-domain/src/main/java/com/alibaba/craftsman/domain/metrics/appquality/AppMetricItem.java b/...n-domain/src/main/java/com/alibaba/craftsman/domain/metrics/appquality/AppMetricItem.java
@@ -1,13 +1,12 @@
 package com.alibaba.craftsman.domain.metrics.appquality;
 
-import com.alibaba.cola.logger.Logger;
-import com.alibaba.cola.logger.LoggerFactory;
 import com.alibaba.craftsman.domain.metrics.MetricItem;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 @Data
+@Slf4j
 public class AppMetricItem extends MetricItem {
-    private final static Logger logger = LoggerFactory.getLogger(AppMetricItem.class);
 
     private String appName;//应用名称
     private int cyclomaticComplexityCount;//圈复杂度超标的数目
@@ -26,7 +25,7 @@ public double calculateScore() {
         score = duductScore(score, duplicatedMethodCount);
         score = duductScore(score, longMethodCount);
         score = duductScore(score, blockedCodeConductCount);
-        logger.debug("Calculated App score is "+score );
+        log.debug("Calculated App score is "+score );
         return score;
     }
 
@@ -36,4 +35,4 @@ private double duductScore(double score, int count) {
         }
         return score;
     }
-}
+}
diff --git a/...c/main/java/com/alibaba/craftsman/domain/metrics/techcontribution/ContributionMetric.java b/...c/main/java/com/alibaba/craftsman/domain/metrics/techcontribution/ContributionMetric.java
@@ -1,7 +1,5 @@
 package com.alibaba.craftsman.domain.metrics.techcontribution;
 
-import com.alibaba.cola.logger.Logger;
-import com.alibaba.cola.logger.LoggerFactory;
 import com.alibaba.craftsman.domain.metrics.MainMetric;
 import com.alibaba.craftsman.domain.metrics.MainMetricType;
 import com.alibaba.craftsman.domain.user.UserProfile;
@@ -16,8 +14,6 @@
 @Data
 public class ContributionMetric extends MainMetric {
 
-    private static Logger logger = LoggerFactory.getLogger(ContributionMetric.class);
-
     private CodeReviewMetric codeReviewMetric;
     private RefactoringMetric refactoringMetric;
     private MiscMetric miscMetric;