You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ti...@apache.org on 2015/11/19 02:57:00 UTC

[1/2] incubator-apex-malhar git commit: MLHR-1859 #resolve

Repository: incubator-apex-malhar
Updated Branches:
  refs/heads/devel-3 a4b999de1 -> 640dca0b2


MLHR-1859 #resolve


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a18950f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a18950f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a18950f0

Branch: refs/heads/devel-3
Commit: a18950f01501e90e14c402cbe426f5a92101a87a
Parents: a4b999d
Author: Chandni Singh <cs...@apache.org>
Authored: Wed Nov 18 17:37:51 2015 -0800
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Nov 18 17:37:51 2015 -0800

----------------------------------------------------------------------
 apex_checks.xml             | 171 +++++++++++++++++++++++++++++++++++++++
 checkstyle-suppressions.xml |  28 +++++++
 pom.xml                     |  14 ++++
 3 files changed, 213 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a18950f0/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
new file mode 100644
index 0000000..7474e67
--- /dev/null
+++ b/apex_checks.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<!--
+
+    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
+
+      http://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.
+
+-->
+<!DOCTYPE module PUBLIC
+  "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+  "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <property name="charset" value="UTF-8"/>
+
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
+
+  <module name="RegexpMultiline">
+    <property name="format" value="System\.(out)|(err)\.print(ln)?\("/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="OneTopLevelClass"/>
+    <!-- checks package and import stmts are not line wrapped -->
+    <module name="NoLineWrap"/>
+
+    <module name="EmptyBlock">
+      <property name="option" value="TEXT"/>
+      <property name="tokens"
+          value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>
+    <!-- checks for braces around code blocks -->
+    <module name="NeedBraces"/>
+
+    <module name="LeftCurly">
+      <property name="option" value="eol"/>
+      <property name="tokens"
+          value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH,
+          LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+    </module>
+
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+      <property name="tokens"
+          value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF,
+          OBJBLOCK"/>
+    </module>
+
+    <module name="RightCurly">
+      <property name="option" value="same"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE"/>
+    </module>
+
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+      <property name="tokens"
+          value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+    </module>
+
+    <module name="NoWhitespaceAfter">
+      <property name="tokens"
+          value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST, ARRAY_DECLARATOR"/>
+    </module>
+
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="COMMA, SEMI, POST_DEC, POST_INC"/>
+    </module>
+
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="DOT"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace."/>
+      <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+    </module>
+
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+
+    <module name="OneStatementPerLine"/>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="MissingSwitchDefault"/>
+
+    <!-- If the logic requires fallthrough then the text "fallthru", "fall through", "fallthrough",
+     "falls through" and "fallsthrough" can be placed as a comment after the last line of the case -->
+    <module name="FallThrough"/>
+
+    <module name="UpperEll"/>
+    <module name="ModifierOrder"/>
+    <module name="EmptyLineSeparator">
+      <property name="tokens"
+                value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens" value="DOT"/>
+      <property name="option" value="nl"/>
+    </module>
+
+    <module name="SeparatorWrap">
+      <property name="tokens" value="COMMA"/>
+      <property name="option" value="EOL"/>
+    </module>
+
+    <module name="NoFinalizer"/>
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+               value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded"
+               value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow"
+               value="GenericWhitespace ''{0}'' should be followed by whitespace."/>
+      <message key="ws.notPreceded"
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+    </module>
+
+    <module name="Indentation">
+      <property name="basicOffset" value="2"/>
+      <property name="braceAdjustment" value="0"/>
+      <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="2"/>
+      <property name="arrayInitIndent" value="2"/>
+      <property name="lineWrappingIndentation" value="4"/>
+      <property name="forceStrictCondition" value="true"/>
+    </module>
+
+    <module name="AnnotationLocation">
+      <property name="allowSamelineMultipleAnnotations" value="false"/>
+      <property name="allowSamelineSingleParameterlessAnnotation" value="true"/>
+      <property name="allowSamelineParameterizedAnnotation" value="false"/>
+    </module>
+
+    <module name="ImportOrder">
+      <property name="groups" value="/^javax?\./,org,/org\.apache/,com,/com\.datatorrent/,*"/>
+      <property name="ordered" value="true"/>
+      <property name="option" value="bottom"/>
+      <property name="sortStaticImportsAlphabetically" value="true"/>
+    </module>
+    <module name="AvoidStarImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <module name="MethodParamPad"/>
+  </module>
+
+</module>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a18950f0/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
new file mode 100644
index 0000000..7496011
--- /dev/null
+++ b/checkstyle-suppressions.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+
+    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
+
+      http://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.
+
+-->
+<!DOCTYPE suppressions PUBLIC
+  "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+  "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+  <suppress checks="RegexpMultiline" files="DTCli.java"/>
+</suppressions>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a18950f0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 52588f5..388c4ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,20 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <configuration>
+              <maxAllowedViolations>9071</maxAllowedViolations>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>6.12.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
       </build>
     </profile>


[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1859' into devel-3

Posted by ti...@apache.org.
Merge branch 'MLHR-1859' into devel-3


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/640dca0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/640dca0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/640dca0b

Branch: refs/heads/devel-3
Commit: 640dca0b21886cecdcfb4ac958dcf1e765adf552
Parents: a4b999d a18950f
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Wed Nov 18 17:53:32 2015 -0800
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Wed Nov 18 17:53:32 2015 -0800

----------------------------------------------------------------------
 apex_checks.xml             | 171 +++++++++++++++++++++++++++++++++++++++
 checkstyle-suppressions.xml |  28 +++++++
 pom.xml                     |  14 ++++
 3 files changed, 213 insertions(+)
----------------------------------------------------------------------