Skip to content

Commit

Permalink
[#1107] Added array initilization indent to the checkstyle
Browse files Browse the repository at this point in the history
fixes #1107
  • Loading branch information
niklasteichmann authored and Kevin Gómez committed Nov 29, 2018
1 parent ff4e5e0 commit 7c78d41
Show file tree
Hide file tree
Showing 27 changed files with 657 additions and 656 deletions.
Expand Up @@ -145,6 +145,7 @@
<module name="ArrayTypeStyle"/>
<!-- Indentation -->
<module name="Indentation">
<property name="arrayInitIndent" value="2"/>
<property name="caseIndent" value="0"/>
<property name="basicOffset" value="2"/>
<property name="braceAdjustment" value="0"/>
Expand Down
Expand Up @@ -65,8 +65,8 @@ public class GradoopId implements NormalizableKey<GradoopId>, CopyableValue<Grad
* Required for {@link GradoopId#toString()}
*/
private static final char[] HEX_CHARS = new char[] {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };

/**
* Internal byte representation
Expand Down
Expand Up @@ -1000,21 +1000,21 @@ public BytesTest(PropertyValue propertyValue, byte type) {
@Parameterized.Parameters
public static Collection properties() {
return Arrays.asList(new Object[][] {
{create(NULL_VAL_0), PropertyValue.TYPE_NULL},
{create(BOOL_VAL_1), PropertyValue.TYPE_BOOLEAN},
{create(INT_VAL_2), PropertyValue.TYPE_INTEGER},
{create(LONG_VAL_3), PropertyValue.TYPE_LONG},
{create(FLOAT_VAL_4), PropertyValue.TYPE_FLOAT},
{create(DOUBLE_VAL_5), PropertyValue.TYPE_DOUBLE},
{create(STRING_VAL_6), PropertyValue.TYPE_STRING},
{create(BIG_DECIMAL_VAL_7), PropertyValue.TYPE_BIG_DECIMAL},
{create(GRADOOP_ID_VAL_8), PropertyValue.TYPE_GRADOOP_ID},
{create(MAP_VAL_9), PropertyValue.TYPE_MAP},
{create(LIST_VAL_a), PropertyValue.TYPE_LIST},
{create(DATE_VAL_b), PropertyValue.TYPE_DATE},
{create(TIME_VAL_c), PropertyValue.TYPE_TIME},
{create(DATETIME_VAL_d), PropertyValue.TYPE_DATETIME},
{create(SHORT_VAL_e), PropertyValue.TYPE_SHORT}
{create(NULL_VAL_0), PropertyValue.TYPE_NULL},
{create(BOOL_VAL_1), PropertyValue.TYPE_BOOLEAN},
{create(INT_VAL_2), PropertyValue.TYPE_INTEGER},
{create(LONG_VAL_3), PropertyValue.TYPE_LONG},
{create(FLOAT_VAL_4), PropertyValue.TYPE_FLOAT},
{create(DOUBLE_VAL_5), PropertyValue.TYPE_DOUBLE},
{create(STRING_VAL_6), PropertyValue.TYPE_STRING},
{create(BIG_DECIMAL_VAL_7), PropertyValue.TYPE_BIG_DECIMAL},
{create(GRADOOP_ID_VAL_8), PropertyValue.TYPE_GRADOOP_ID},
{create(MAP_VAL_9), PropertyValue.TYPE_MAP},
{create(LIST_VAL_a), PropertyValue.TYPE_LIST},
{create(DATE_VAL_b), PropertyValue.TYPE_DATE},
{create(TIME_VAL_c), PropertyValue.TYPE_TIME},
{create(DATETIME_VAL_d), PropertyValue.TYPE_DATETIME},
{create(SHORT_VAL_e), PropertyValue.TYPE_SHORT}
});
}

Expand Down
Expand Up @@ -66,23 +66,23 @@ public class PatternMatchingRunner extends AbstractRunner implements ProgramDesc
* Used for console output
*/
private static final String[] AVAILABLE_ALGORITHMS = new String[] {
ALGO_DUAL_BULK,
ALGO_DUAL_DELTA,
ALGO_ISO_EXP,
ALGO_ISO_EXP_BC_HASH_FIRST,
ALGO_CYPHER
ALGO_DUAL_BULK,
ALGO_DUAL_DELTA,
ALGO_ISO_EXP,
ALGO_ISO_EXP_BC_HASH_FIRST,
ALGO_CYPHER
};
/**
* Option to declare path to input graph
*/
private static final String OPTION_INPUT_PATH = "i";
private static final String OPTION_INPUT_PATH = "i";
/**
* Option to declare input graph format (csv, indexed, json)
*/
private static final String OPTION_INPUT_FORMAT = "f";
/**
*Option to declare path to output graph
*/
* Option to declare path to output graph
*/
private static final String OPTION_OUTPUT_PATH = "o";
/**
* GDL/Cypher query string
Expand Down Expand Up @@ -244,7 +244,7 @@ private static GraphCollection execute(
MatchStrategy.ISOMORPHISM, MatchStrategy.ISOMORPHISM,
statistics);
break;
default :
default:
throw new IllegalArgumentException(algorithm + " not supported");
}

Expand Down
Expand Up @@ -129,7 +129,7 @@ private DataSet<EmbeddingWithTiePoint<K>> iterate(

// traverse to outgoing/incoming edges
String[] forwardedFieldsEdgeSteps = new String[] {
"f0" // forward edge id
"f0" // forward edge id
};
DataSet<EmbeddingWithTiePoint<K>> nextWorkSet = traverseEdges(edges,
embeddings, superstep, TraverserStrategy.SET_PAIR_BULK_ITERATION,
Expand Down
Expand Up @@ -31,7 +31,7 @@
/**
* Extracts {@link Embedding}s iteratively from a given graph by traversing the
* graph according to a given {@link TraversalCode}.
*
* <p>
* For the iteration the traverser uses a basic for loop.
*
* @param <K> key type
Expand Down Expand Up @@ -115,12 +115,12 @@ private DataSet<EmbeddingWithTiePoint<K>> iterate(
.fromElements(i + 1);

String[] forwardedFieldEdgeSteps = new String[] {
// forward edge id
"f0",
// forward source or target id to tie point id
step.isOutgoing() ? "f1->f1" : "f2->f1",
// forward source or target id to next id
step.isOutgoing() ? "f2->f2" : "f1->f2"
// forward edge id
"f0",
// forward source or target id to tie point id
step.isOutgoing() ? "f1->f1" : "f2->f1",
// forward source or target id to next id
step.isOutgoing() ? "f2->f2" : "f1->f2"
};

embeddings = traverseEdges(edges, embeddings, superstep,
Expand Down
Expand Up @@ -49,40 +49,40 @@ public BasicPatternsTransactionalFSMTestBase(String testName, String asciiGraphs
@Parameterized.Parameters(name = "{index}: {0}")
public static Iterable data() {
return Arrays.asList(new String[] {
"Single_Edge",
BasicPatternsData.FSM_SINGLE_EDGE,
"g1,g2,g3,g4",
"s1"
"Single_Edge",
BasicPatternsData.FSM_SINGLE_EDGE,
"g1,g2,g3,g4",
"s1"
}, new String[] {
"Simple_Graph",
BasicPatternsData.FSM_SIMPLE_GRAPH,
"g1,g2,g3",
"s1,s2,s3,s4,s5"
"Simple_Graph",
BasicPatternsData.FSM_SIMPLE_GRAPH,
"g1,g2,g3",
"s1,s2,s3,s4,s5"
}, new String[] {
"Parallel_Edges",
BasicPatternsData.FSM_PARALLEL_EDGES,
"g1,g2,g3",
"s1,s2"
"Parallel_Edges",
BasicPatternsData.FSM_PARALLEL_EDGES,
"g1,g2,g3",
"s1,s2"
}, new String[] {
"Loop",
BasicPatternsData.FSM_LOOP,
"g1,g2,g3,g4",
"s1,s2,s3"
"Loop",
BasicPatternsData.FSM_LOOP,
"g1,g2,g3,g4",
"s1,s2,s3"
}, new String[] {
"Diamond",
BasicPatternsData.FSM_DIAMOND,
"g1,g2,g3",
"s1,s2,s3,s4,s5,s6,s7"
"Diamond",
BasicPatternsData.FSM_DIAMOND,
"g1,g2,g3",
"s1,s2,s3,s4,s5,s6,s7"
}, new String[] {
"Circle_with_Branch",
BasicPatternsData.FSM_CIRCLE_WITH_BRANCH,
"g1,g2,g3",
"s1,s2,s3,s4,s5,s6,s7,s8,s9,s10"
"Circle_with_Branch",
BasicPatternsData.FSM_CIRCLE_WITH_BRANCH,
"g1,g2,g3",
"s1,s2,s3,s4,s5,s6,s7,s8,s9,s10"
}, new String[] {
"Colored Circle",
BasicPatternsData.MULTI_LABELED_CIRCLE,
"g1,g2",
"s1,s2,s3,s4,s5,s6,s7"
"Colored Circle",
BasicPatternsData.MULTI_LABELED_CIRCLE,
"g1,g2",
"s1,s2,s3,s4,s5,s6,s7"
});
}

Expand Down
Expand Up @@ -33,115 +33,115 @@ public SubgraphHomomorphismTest(String testName, String dataGraph,
@Parameterized.Parameters(name = "{index}: {0}")
public static Iterable<String[]> data() {
return Arrays.asList(new String[] {
"Graph1_Chain0",
GRAPH_1, CHAIN_PATTERN_0,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)]" +
"Graph1_Chain0",
GRAPH_1, CHAIN_PATTERN_0,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)]" +
"expected2[(v2)-[e3]->(v6)]" +
"expected3[(v5)-[e6]->(v4)]"
}, new String[] {
"Graph1_Chain2",
GRAPH_1, CHAIN_PATTERN_2,
"expected1,expected2,expected3",
"expected1[(v1)]" +
"Graph1_Chain2",
GRAPH_1, CHAIN_PATTERN_2,
"expected1,expected2,expected3",
"expected1[(v1)]" +
"expected2[(v2)]" +
"expected3[(v5)]"
}, new String[] {
"Graph2_Chain3",
GRAPH_2, CHAIN_PATTERN_3,
"expected1",
"expected1[(v9)-[e15]->(v9)]"
"Graph2_Chain3",
GRAPH_2, CHAIN_PATTERN_3,
"expected1",
"expected1[(v9)-[e15]->(v9)]"
}, new String[] {
"Graph2_Loop0",
GRAPH_2,
LOOP_PATTERN_0,
"expected1",
"expected1[(v9)-[e15]->(v9)]"
"Graph2_Loop0",
GRAPH_2,
LOOP_PATTERN_0,
"expected1",
"expected1[(v9)-[e15]->(v9)]"
}, new String[] {
"Graph1_Cycle2",
GRAPH_1,
CYCLE_PATTERN_2,
"expected1",
"expected1[" +
"Graph1_Cycle2",
GRAPH_1,
CYCLE_PATTERN_2,
"expected1",
"expected1[" +
"(v2)-[e3]->(v6)" +
"(v6)-[e7]->(v2)" +
"(v6)-[e9]->(v7)" +
"]"
}, new String[] {
"Graph1_Cycle4",
GRAPH_1,
CYCLE_PATTERN_4,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)-[e8]->(v5)-[e6]->(v4)-[e4]->(v1)]" +
"Graph1_Cycle4",
GRAPH_1,
CYCLE_PATTERN_4,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)-[e8]->(v5)-[e6]->(v4)-[e4]->(v1)]" +
"expected2[(v5)-[e6]->(v4)-[e4]->(v1)-[e2]->(v6)-[e8]->(v5)]" +
"expected3[(v2)-[e3]->(v6)-[e7]->(v2)-[e3]->(v6)-[e7]->(v2)]"
}, new String[] {
"Graph2_Cycle5",
GRAPH_2,
CYCLE_PATTERN_5,
"expected1,expected2",
"expected1[(v0)-[e1]->(v4)<-[e2]-(v0)]" +
"Graph2_Cycle5",
GRAPH_2,
CYCLE_PATTERN_5,
"expected1,expected2",
"expected1[(v0)-[e1]->(v4)<-[e2]-(v0)]" +
"expected2[(v5)-[e9]->(v4)<-[e10]-(v5)]"
}, new String[] {
"Graph4_Chain4",
GRAPH_4, CHAIN_PATTERN_4,
"expected1,expected2,expected3,expected4",
"expected1[(v0)-[e0]->(v1)-[e1]->(v2)]" +
"Graph4_Chain4",
GRAPH_4, CHAIN_PATTERN_4,
"expected1,expected2,expected3,expected4",
"expected1[(v0)-[e0]->(v1)-[e1]->(v2)]" +
"expected2[(v0)-[e0]->(v1)-[e2]->(v2)]" +
"expected3[(v1)-[e1]->(v2)-[e3]->(v3)]" +
"expected4[(v1)-[e2]->(v2)-[e3]->(v3)]"
}, new String[] {
"Graph4_Cycle6",
GRAPH_4, CYCLE_PATTERN_6,
"expected1,expected2,expected3,expected4,expected5,expected6",
"expected1[(v0)-[e0]->(v1)<-[e0]-(v0)]" +
"Graph4_Cycle6",
GRAPH_4, CYCLE_PATTERN_6,
"expected1,expected2,expected3,expected4,expected5,expected6",
"expected1[(v0)-[e0]->(v1)<-[e0]-(v0)]" +
"expected2[(v1)-[e1]->(v2)<-[e1]-(v1)]" +
"expected3[(v1)-[e2]->(v2)<-[e2]-(v1)]" +
"expected4[(v1)-[e1]->(v2)<-[e2]-(v1)]" +
"expected5[(v1)-[e2]->(v2)<-[e1]-(v1)]" +
"expected6[(v2)-[e3]->(v3)<-[e3]-(v2)]"
}, new String[] {
"Graph5_Chain6",
GRAPH_5,
CHAIN_PATTERN_6,
"expected1",
"expected1[(v0)-[e0]->(v1)]"
"Graph5_Chain6",
GRAPH_5,
CHAIN_PATTERN_6,
"expected1",
"expected1[(v0)-[e0]->(v1)]"
}, new String[] {
"Graph5_Chain7",
GRAPH_5,
CHAIN_PATTERN_7,
"expected1",
"expected1[(v0)-[e0]->(v1)]"
"Graph5_Chain7",
GRAPH_5,
CHAIN_PATTERN_7,
"expected1",
"expected1[(v0)-[e0]->(v1)]"
}, new String[] {
"Graph3_Unlabeled0",
GRAPH_3,
UNLABELED_PATTERN_0,
"expected1,expected2,expected3,expected4",
"expected1[(v0)]" +
"Graph3_Unlabeled0",
GRAPH_3,
UNLABELED_PATTERN_0,
"expected1,expected2,expected3,expected4",
"expected1[(v0)]" +
"expected2[(v1)]" +
"expected3[(v2)]" +
"expected4[(v3)]"
}, new String[] {
"Graph3_Unlabeled1",
GRAPH_3,
UNLABELED_PATTERN_1,
"expected1,expected2,expected3",
"expected1[(v0)-[e0]->(v1)]" +
"Graph3_Unlabeled1",
GRAPH_3,
UNLABELED_PATTERN_1,
"expected1,expected2,expected3",
"expected1[(v0)-[e0]->(v1)]" +
"expected2[(v1)-[e1]->(v2)]" +
"expected3[(v2)-[e2]->(v3)]"
}, new String[] {
"Graph1_Unlabeled2",
GRAPH_1,
UNLABELED_PATTERN_2,
"expected1,expected2",
"expected1[(v4)-[e5]->(v3)]" +
"Graph1_Unlabeled2",
GRAPH_1,
UNLABELED_PATTERN_2,
"expected1,expected2",
"expected1[(v4)-[e5]->(v3)]" +
"expected2[(v6)-[e9]->(v7)]"
}, new String[] {
"Graph1_Unlabeled3",
GRAPH_1,
UNLABELED_PATTERN_3,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)]" +
"Graph1_Unlabeled3",
GRAPH_1,
UNLABELED_PATTERN_3,
"expected1,expected2,expected3",
"expected1[(v1)-[e2]->(v6)]" +
"expected2[(v5)-[e6]->(v4)]" +
"expected3[(v2)-[e3]->(v6)]"
});
Expand Down

0 comments on commit 7c78d41

Please sign in to comment.