Merge pull request #9 from support-project/develop

Release v1.4.0
support-project · May 23, 2016 · cf5632e · cf5632e
2 parents 01d2a9f + d515903
commit cf5632e
Show file tree

Hide file tree

Showing 156 changed files with 18,158 additions and 17,073 deletions.
diff --git a/config/code_format_on_eclipse.xml b/config/code_format_on_eclipse.xml
@@ -8,7 +8,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
@@ -202,7 +202,7 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>

diff --git a/config/stylecheck.xml b/config/stylecheck.xml
@@ -14,15 +14,25 @@ Slightly modified version of Sun Checks that better matches the default code for
   <module name="TreeWalker">
     <property name="tabWidth" value="4"/>
     <module name="JavadocMethod">
+      <property name="severity" value="ignore"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingThrowsTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
       <property name="suppressLoadErrors" value="true"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="JavadocType">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="JavadocVariable">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
-    <module name="JavadocType"/>
-    <module name="JavadocVariable"/>
     <module name="JavadocStyle">
       <property name="severity" value="ignore"/>
+      <property name="checkEmptyJavadoc" value="true"/>
+      <property name="checkFirstSentence" value="false"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
     <module name="ConstantName"/>
@@ -37,7 +47,10 @@ Slightly modified version of Sun Checks that better matches the default code for
     <module name="ParameterName"/>
     <module name="StaticVariableName"/>
     <module name="TypeName"/>
-    <module name="AvoidStarImport"/>
+    <module name="AvoidStarImport">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
     <module name="IllegalImport"/>
     <module name="RedundantImport"/>
     <module name="UnusedImports"/>
@@ -77,7 +90,9 @@ Slightly modified version of Sun Checks that better matches the default code for
     <module name="AvoidNestedBlocks"/>
     <module name="EmptyBlock"/>
     <module name="LeftCurly"/>
-    <module name="NeedBraces"/>
+    <module name="NeedBraces">
+      <property name="tokens" value="LITERAL_DO,LITERAL_FOR,LITERAL_WHILE"/>
+    </module>
     <module name="RightCurly"/>
     <module name="AvoidInlineConditionals"/>
     <module name="EmptyStatement"/>
@@ -131,6 +146,7 @@ Slightly modified version of Sun Checks that better matches the default code for
     <module name="OperatorWrap">
       <property name="tokens" value="BAND,BOR,BSR,BXOR,COLON,DIV,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MOD,NOT_EQUAL,PLUS,SL,SR,STAR"/>
     </module>
+    <module name="Indentation"/>
   </module>
   <module name="JavadocPackage">
     <property name="severity" value="ignore"/>

diff --git a/deploy.sh b/deploy.sh
@@ -1,2 +1,3 @@
 #! /bin/bash
-mvn clean deploy -DperformRelease=true -Dmaven.javadoc.skip=true -e
+# mvn clean deploy -DperformRelease=true -Dmaven.javadoc.skip=true -e
+mvn clean deploy -DperformRelease=true -e
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>common</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <packaging>jar</packaging>
 
     <name>common</name>
@@ -106,6 +106,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.5.1</version>
                         <configuration>
                             <encoding>UTF-8</encoding>
                             <source>1.8</source>
@@ -128,6 +129,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.5.1</version>
                         <configuration>
                             <encoding>UTF-8</encoding>
                             <source>1.8</source>

diff --git a/src/main/java/org/support/project/aop/Aspect.java b/src/main/java/org/support/project/aop/Aspect.java
@@ -5,20 +5,18 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * AOP(メソッドへ)
- * 
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target( {ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface Aspect {
-	
-	/**
-	 * 実行するアドバイス
-	 * @return
-	 */
-	Class<? extends Advice> advice();
-	
-	
+
+    /**
+     * 実行するアドバイス
+     * 
+     * @return Advice
+     */
+    Class<? extends Advice> advice();
+
 }
diff --git a/src/main/java/org/support/project/aop/GenericProxyFactory.java b/src/main/java/org/support/project/aop/GenericProxyFactory.java
@@ -6,14 +6,18 @@
  * インスタンスのプロクシー
  */
 public class GenericProxyFactory {
-	/**
-	 * プロクシでラップしたオブジェクトを取得
-	 * @param intf
-	 * @param obj
-	 * @return
-	 */
-	public static <T> T getProxy(Class<? extends T> intf, final T obj) {
-		return (T) Proxy.newProxyInstance(obj.getClass().getClassLoader(), 
-				new Class[] { intf }, new Intercepter(intf, obj));
-	}
+    /**
+     * プロクシでラップしたオブジェクトを取得
+     * 
+     * @param intf
+     *            type
+     * @param obj
+     *            object
+     * @param <T>
+     *            type
+     * @return proxy object
+     */
+    public static <T> T getProxy(Class<? extends T> intf, final T obj) {
+        return (T) Proxy.newProxyInstance(obj.getClass().getClassLoader(), new Class[] { intf }, new Intercepter(intf, obj));
+    }
 }