Merge pull request rabbitmq#2 from sofastack/add_maven_center

khotyn · web-flow · commit 3c70e3a77c67 · 2018-03-15T15:29:47.000+08:00
add maven center
diff --git a/pom.xml b/pom.xml
@@ -8,6 +8,7 @@
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
+    <description>A library that provide some utility functions to other SOFA libraries</description>
     <url>https://github.com/sofastack/sofa-common-tools</url>
 
     <licenses>
@@ -103,7 +104,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>com.springsource.slf4j.jcl</artifactId>
+            <artifactId>slf4j-jcl</artifactId>
             <version>1.6.1</version>
             <scope>provided</scope>
         </dependency>
@@ -193,4 +194,65 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.9.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+    </profiles>
+
+
+
 </project>
diff --git a/src/main/java/com/alipay/sofa/common/log/MultiAppLoggerSpaceManager.java b/src/main/java/com/alipay/sofa/common/log/MultiAppLoggerSpaceManager.java
@@ -227,22 +227,20 @@ private static AbstractLoggerSpaceFactory getILoggerFactoryBySpaceName(SpaceId s
     }
 
     /**
-     * 用于并发场景非严格判断space是否init用；
+     * 用于并发场景非严格判断space是否init用；该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；
      *
      * @param spaceName
      * @return
-     * @NotThreadSafe 该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；
      */
     public static boolean isSpaceInitialized(String spaceName) {
         return isSpaceInitialized(new SpaceId(spaceName));
     }
 
     /**
-     * 用于并发场景非严格判断space是否init用；
+     * 用于并发场景非严格判断space是否init用；该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；
      *
      * @param spaceId
      * @return
-     * @NotThreadSafe 该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；
      */
     public static boolean isSpaceInitialized(SpaceId spaceId) {
         return spacesMap.get(spaceId) != null;
diff --git a/src/main/java/com/alipay/sofa/common/log/ReportUtil.java b/src/main/java/com/alipay/sofa/common/log/ReportUtil.java
@@ -20,7 +20,7 @@
  * ReportUtil
  * <p>
  * 参照:slf4j 输出信息到控制台及默认（业务app中配置的）日志
- * <p/>
+ * <p>
  * Created by yangguanchao on 16/9/24.
  */
 public class ReportUtil {
diff --git a/src/main/java/com/alipay/sofa/common/log/env/LogEnvUtils.java b/src/main/java/com/alipay/sofa/common/log/env/LogEnvUtils.java
@@ -24,7 +24,7 @@
 
 /**
  * 日志环境工具类:根据不同的环境选择不同的日志实现
- * <p/>
+ * <p>
  * Created by yangguanchao on 16/9/20.
  */
 public final class LogEnvUtils {
diff --git a/src/main/java/com/alipay/sofa/common/log/factory/LoggerSpaceFactory4CommonsLoggingBuilder.java b/src/main/java/com/alipay/sofa/common/log/factory/LoggerSpaceFactory4CommonsLoggingBuilder.java
@@ -34,7 +34,7 @@
 
 /**
  * 日志环境工具类:根据不同的环境选择不同的日志实现:日志实现仍然使用log4j,不过兼容了 commons-logging 日志打印的情况
- * <p/>
+ * <p>
  * Created by yangguanchao on 17/01/17.
  */
 public class LoggerSpaceFactory4CommonsLoggingBuilder extends AbstractLoggerSpaceFactoryBuilder {
diff --git a/src/main/java/com/alipay/sofa/common/log/factory/LoggerSpaceFactory4Log4jBuilder.java b/src/main/java/com/alipay/sofa/common/log/factory/LoggerSpaceFactory4Log4jBuilder.java
@@ -34,7 +34,7 @@
 
 /**
  * 日志环境工具类:根据不同的环境选择不同的日志实现
- * <p/>
+ * <p>
  * Created by yangguanchao on 17/01/17.
  */
 public class LoggerSpaceFactory4Log4jBuilder extends AbstractLoggerSpaceFactoryBuilder {
diff --git a/src/main/java/com/alipay/sofa/common/log/global/Slite2LogPathInit.java b/src/main/java/com/alipay/sofa/common/log/global/Slite2LogPathInit.java
@@ -21,14 +21,14 @@
 
 /**
  * Slite2LogPathInit
- * <p/>
+ * <p>
  * Created by yangguanchao on 16/11/3.
  */
 public class Slite2LogPathInit {
 
     /***
      * 在中间件 starter 的 ApplicationContextInitializer 要调用此函数做判断,来达到设置日志路径的目的:
-     * <p/>
+     * <p>
      * 1.是否设置了全局路径参数 logging.path
      * 2.没有设置将设置路径 middlewareLoggingPath
      *
diff --git a/src/main/java/com/alipay/sofa/common/profile/diagnostic/Profiler.java b/src/main/java/com/alipay/sofa/common/profile/diagnostic/Profiler.java
@@ -41,15 +41,11 @@ public static void start() {
     }
 
     public static void start(String message) {
-        entryStack.set(new Profiler.Entry(message,
-                null,
-                null));
+        entryStack.set(new Profiler.Entry(message, null, null));
     }
 
     public static void start(Profiler.Message message) {
-        entryStack.set(new Profiler.Entry(message,
-                null,
-                null));
+        entryStack.set(new Profiler.Entry(message, null, null));
     }
 
     public static void reset() {
@@ -81,8 +77,7 @@ public static void release() {
     }
 
     public static long getDuration() {
-        Profiler.Entry entry = (Profiler.Entry) entryStack
-                .get();
+        Profiler.Entry entry = (Profiler.Entry) entryStack.get();
         return entry != null ? entry.getDuration() : -1L;
     }
 
@@ -95,8 +90,7 @@ public static String dump(String prefix) {
     }
 
     public static String dump(String prefix1, String prefix2) {
-        Profiler.Entry entry = (Profiler.Entry) entryStack
-                .get();
+        Profiler.Entry entry = (Profiler.Entry) entryStack.get();
         return entry != null ? entry.toString(prefix1, prefix2) : "";
     }
 
@@ -105,8 +99,7 @@ public static Profiler.Entry getEntry() {
     }
 
     private static Profiler.Entry getCurrentEntry() {
-        Profiler.Entry subEntry = (Profiler.Entry) entryStack
-                .get();
+        Profiler.Entry subEntry = (Profiler.Entry) entryStack.get();
         Profiler.Entry entry = null;
         if (subEntry != null) {
             do {
@@ -127,33 +120,30 @@ public interface Message {
     }
 
     public static final class MessageLevel extends IntegerEnum {
-        private static final long serialVersionUID = 3257849896026388537L;
-        public static final Profiler.MessageLevel NO_MESSAGE = (Profiler.MessageLevel) create();
-        public static final Profiler.MessageLevel BRIEF_MESSAGE = (Profiler.MessageLevel) create();
+        private static final long                 serialVersionUID = 3257849896026388537L;
+        public static final Profiler.MessageLevel NO_MESSAGE       = (Profiler.MessageLevel) create();
+        public static final Profiler.MessageLevel BRIEF_MESSAGE    = (Profiler.MessageLevel) create();
         public static final Profiler.MessageLevel DETAILED_MESSAGE = (Profiler.MessageLevel) create();
 
         public MessageLevel() {
         }
     }
 
     public static final class Entry {
-        private final List subEntries;
-        private final Object message;
+        private final List           subEntries;
+        private final Object         message;
         private final Profiler.Entry parentEntry;
         private final Profiler.Entry firstEntry;
-        private final long baseTime;
-        private final long startTime;
-        private long endTime;
+        private final long           baseTime;
+        private final long           startTime;
+        private long                 endTime;
 
-        private Entry(Object message,
-                      Profiler.Entry parentEntry,
-                      Profiler.Entry firstEntry) {
+        private Entry(Object message, Profiler.Entry parentEntry, Profiler.Entry firstEntry) {
             this.subEntries = new ArrayList(4);
             this.message = message;
             this.startTime = System.currentTimeMillis();
             this.parentEntry = parentEntry;
-            this.firstEntry = (Profiler.Entry) ObjectUtil
-                    .defaultIfNull(firstEntry, this);
+            this.firstEntry = (Profiler.Entry) ObjectUtil.defaultIfNull(firstEntry, this);
             this.baseTime = firstEntry == null ? 0L : firstEntry.startTime;
         }
 
@@ -198,8 +188,7 @@ public long getDurationOfSelf() {
                 return duration;
             } else {
                 for (int i = 0; i < this.subEntries.size(); ++i) {
-                    Profiler.Entry subEntry = (Profiler.Entry) this.subEntries
-                            .get(i);
+                    Profiler.Entry subEntry = (Profiler.Entry) this.subEntries.get(i);
                     duration -= subEntry.getDuration();
                 }
 
@@ -240,16 +229,14 @@ private boolean isReleased() {
         }
 
         private void enterSubEntry(Object message) {
-            Profiler.Entry subEntry = new Profiler.Entry(
-                    message, this, this.firstEntry);
+            Profiler.Entry subEntry = new Profiler.Entry(message, this, this.firstEntry);
             this.subEntries.add(subEntry);
         }
 
         private Profiler.Entry getUnreleasedEntry() {
             Profiler.Entry subEntry = null;
             if (!this.subEntries.isEmpty()) {
-                subEntry = (Profiler.Entry) this.subEntries
-                        .get(this.subEntries.size() - 1);
+                subEntry = (Profiler.Entry) this.subEntries.get(this.subEntries.size() - 1);
                 if (subEntry.isReleased()) {
                     subEntry = null;
                 }
@@ -276,8 +263,8 @@ private void toString(StringBuffer buffer, String prefix1, String prefix2) {
             long durationOfSelf = this.getDurationOfSelf();
             double percent = this.getPecentage();
             double percentOfAll = this.getPecentageOfAll();
-            Object[] params = new Object[]{message, new Long(startTime), new Long(duration),
-                    new Long(durationOfSelf), new Double(percent), new Double(percentOfAll)};
+            Object[] params = new Object[] { message, new Long(startTime), new Long(duration),
+                    new Long(durationOfSelf), new Double(percent), new Double(percentOfAll) };
             StringBuffer pattern = new StringBuffer("{1,number} ");
             if (this.isReleased()) {
                 pattern.append("[{2,number}ms");
@@ -305,8 +292,7 @@ private void toString(StringBuffer buffer, String prefix1, String prefix2) {
             buffer.append(MessageFormat.format(pattern.toString(), params));
 
             for (int i = 0; i < this.subEntries.size(); ++i) {
-                Profiler.Entry subEntry = (Profiler.Entry) this.subEntries
-                        .get(i);
+                Profiler.Entry subEntry = (Profiler.Entry) this.subEntries.get(i);
                 buffer.append('\n');
                 if (i == this.subEntries.size() - 1) {
                     subEntry.toString(buffer, prefix2 + "`---", prefix2 + "    ");
diff --git a/src/main/java/com/alipay/sofa/common/security/SensitiveDataUtil.java b/src/main/java/com/alipay/sofa/common/security/SensitiveDataUtil.java

Original file line number	Diff line number	Diff line change
`@@ -227,22 +227,20 @@ private static AbstractLoggerSpaceFactory getILoggerFactoryBySpaceName(SpaceId s`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/**`
`230`		`- * 用于并发场景非严格判断space是否init用；`
	`230`	`+ * 用于并发场景非严格判断space是否init用；该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；`
`231`	`231`	`*`
`232`	`232`	`* @param spaceName`
`233`	`233`	`* @return`
`234`		`- * @NotThreadSafe 该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；`
`235`	`234`	`*/`
`236`	`235`	`public static boolean isSpaceInitialized(String spaceName) {`
`237`	`236`	`return isSpaceInitialized(new SpaceId(spaceName));`
`238`	`237`	`}`
`239`	`238`
`240`	`239`	`/**`
`241`		`- * 用于并发场景非严格判断space是否init用；`
	`240`	`+ * 用于并发场景非严格判断space是否init用；该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；`
`242`	`241`	`*`
`243`	`242`	`* @param spaceId`
`244`	`243`	`* @return`
`245`		`- * @NotThreadSafe 该场景中不和初始化场景锁同步，也就是不保证并发时严格判断正确；`
`246`	`244`	`*/`
`247`	`245`	`public static boolean isSpaceInitialized(SpaceId spaceId) {`
`248`	`246`	`return spacesMap.get(spaceId) != null;`