Skip to content

Commit

Permalink
Add AnnotationLocation checkstyle rule
Browse files Browse the repository at this point in the history 
This rule ensures that annotations are placed in the right places.
  • Loading branch information
@lutovich
lutovich committed May 9, 2016
1 parent 8611ef2 commit be556a7
Show file tree
Hide file tree
Showing 85 changed files with 430 additions and 235 deletions.
5 changes: 5 additions & 0 deletions build/checkstyle.xml
View file
Expand Up @@ -51,6 +51,11 @@
<module name="EmptyCatchBlock">
<property name="exceptionVariableName" value="ignore|ignored"/>
</module>
<module name="AnnotationLocation">
<property name="allowSamelineMultipleAnnotations" value="false"/>
<property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
<property name="allowSamelineParameterizedAnnotation" value="false"/>
</module>

</module>

Expand Down
3 changes: 2 additions & 1 deletion community/collections/src/main/java/org/neo4j/helpers/collection/Pair.java
View file
Expand Up @@ -112,7 +112,8 @@ public boolean equals( Object obj )
}
if ( obj instanceof Pair )
{
@SuppressWarnings( "rawtypes" ) Pair that = (Pair) obj;
@SuppressWarnings( "rawtypes" )
Pair that = (Pair) obj;
return equals( this.other(), that.other() ) && equals( this.first(), that.first() );
}
return false;
Expand Down
13 changes: 8 additions & 5 deletions community/common/src/test/java/org/neo4j/kernel/lifecycle/TestLifecycleException.java
View file
Expand Up @@ -65,11 +65,14 @@ public void shouldMakeShutdownIntoHumanReadableShutdownMessage() throws Exceptio

private LifecycleException exceptionFor( LifecycleStatus from, LifecycleStatus to )
{
return new LifecycleException( new Object(){
@Override public String toString(){
return"SomeComponent";
}
}, from, to, null );
return new LifecycleException( new Object()
{
@Override
public String toString()
{
return "SomeComponent";
}
}, from, to, null );
}

}
3 changes: 2 additions & 1 deletion ...c/test/java/org/neo4j/consistency/checking/NodeDynamicLabelOrphanChainStartCheckTest.java
View file
Expand Up @@ -47,7 +47,8 @@ public NodeDynamicLabelOrphanChainStartCheckTest()
super( new NodeDynamicLabelOrphanChainStartCheck(), DynamicLabelConsistencyReport.class, new int[0] );
}

@Test @Ignore("2013-07-17 Revisit once we store sorted label ids")
@Test
@Ignore("2013-07-17 Revisit once we store sorted label ids")
public void shouldReportOrphanRecordsThatAreNotFirst() throws Exception
{
// given
Expand Down
3 changes: 2 additions & 1 deletion ...ncy-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java
View file
Expand Up @@ -374,7 +374,8 @@ public void shouldNotReportAnythingForNodeWithConsistentChainOfDynamicRecordsWit
assertTrue( "should be consistent", stats.isConsistent() );
}

@Test @Ignore("2013-07-17 Revisit once we store sorted label ids")
@Test
@Ignore("2013-07-17 Revisit once we store sorted label ids")
public void shouldReportOrphanNodeDynamicLabelAsInconsistency() throws Exception
{
// given
Expand Down
3 changes: 2 additions & 1 deletion community/csv/src/test/java/org/neo4j/csv/reader/ReadablesTest.java
View file
Expand Up @@ -309,5 +309,6 @@ private void assertReadText( CharReadable readable, String text ) throws IOExcep
assertArrayEquals( text.toCharArray(), copyOfRange( readText.array(), readText.pivot(), readText.front() ) );
}

public final @Rule TestDirectory directory = new TestDirectory();
@Rule
public final TestDirectory directory = new TestDirectory();
}
14 changes: 6 additions & 8 deletions community/graph-algo/src/test/java/org/neo4j/graphalgo/impl/ancestor/AncestorTestCase.java
View file
Expand Up @@ -19,15 +19,15 @@
*/
package org.neo4j.graphalgo.impl.ancestor;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import org.neo4j.graphdb.Direction;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
Expand All @@ -45,10 +45,8 @@

public class AncestorTestCase implements GraphHolder
{

public @Rule
TestData<Map<String, Node>> data = TestData.producedThrough( GraphDescription.createGraphFor(
this, true ) );
@Rule
public TestData<Map<String,Node>> data = TestData.producedThrough( GraphDescription.createGraphFor( this, true ) );
private static GraphDatabaseService gdb;

@Test
Expand Down
2 changes: 1 addition & 1 deletion community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java
View file
Expand Up @@ -253,7 +253,7 @@ long yearsAgo( int years )
private int count( Iterable<?> objects )
{
int count = 0;
for ( @SuppressWarnings( "unused" ) Object object : objects )
for ( Object ignore : objects )
{
count++;
}
Expand Down
4 changes: 2 additions & 2 deletions community/graph-matching/src/test/java/matching/TestPatternMatching.java
View file
Expand Up @@ -71,8 +71,8 @@ public GraphDatabaseService graphdb()
public static TargetDirectory.TestDirectory testDirectory =
TargetDirectory.testDirForTest( TestPatternMatching.class );

public @Rule
TestData<Map<String, Node>> data = TestData.producedThrough( GraphDescription.createGraphFor( this, true ) );
@Rule
public TestData<Map<String,Node>> data = TestData.producedThrough( GraphDescription.createGraphFor( this, true ) );

private static GraphDatabaseService graphDb;
private Transaction tx;
Expand Down
13 changes: 8 additions & 5 deletions community/graphdb-api/src/main/java/org/neo4j/graphdb/impl/StandardExpander.java
View file
Expand Up @@ -43,7 +43,6 @@
import org.neo4j.helpers.collection.NestingIterator;

import static java.util.Arrays.asList;

import static org.neo4j.graphdb.traversal.Paths.singleNodePath;

public abstract class StandardExpander implements PathExpander
Expand Down Expand Up @@ -266,21 +265,24 @@ public boolean accept( Node start, Relationship rel )
},
INCOMING( Direction.OUTGOING )
{
@Override Exclusion reversed()
@Override
Exclusion reversed()
{
return OUTGOING;
}
},
OUTGOING( Direction.INCOMING )
{
@Override Exclusion reversed()
@Override
Exclusion reversed()
{
return INCOMING;
}
},
NONE( Direction.BOTH, "" )
{
@Override boolean includes( Direction direction )
@Override
boolean includes( Direction direction )
{
return true;
}
Expand Down Expand Up @@ -767,9 +769,10 @@ public final StandardExpansion<Relationship> expand( Path path, BranchState stat
return new RelationshipExpansion( this, path, state );
}

@SuppressWarnings( "unchecked" )
static <T> T[] append( T[] array, T item )
{
@SuppressWarnings("unchecked") T[] result = (T[]) Array.newInstance(
T[] result = (T[]) Array.newInstance(
array.getClass().getComponentType(), array.length + 1 );
System.arraycopy( array, 0, result, 0, array.length );
result[array.length] = item;
Expand Down
174 changes: 148 additions & 26 deletions community/kernel/src/main/java/org/neo4j/kernel/api/properties/ArrayValue.java
View file
Expand Up @@ -33,51 +33,173 @@ interface FloatingPointArray extends ArrayValue
double doubleValue( int index );
}

// <pre>
final class ByteArray implements IntegralArray
{
private final byte[] value; ByteArray( byte[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public long longValue( int index ) { return value[index]; }
private final byte[] value;

ByteArray( byte[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public long longValue( int index )
{
return value[index];
}
}

final class ShortArray implements IntegralArray
{
private final short[] value; ShortArray( short[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public long longValue( int index ) { return value[index]; }
private final short[] value;

ShortArray( short[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public long longValue( int index )
{
return value[index];
}
}

final class IntArray implements IntegralArray
{
private final int[] value; IntArray( int[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public long longValue( int index ) { return value[index]; }
private final int[] value;

IntArray( int[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public long longValue( int index )
{
return value[index];
}
}

final class LongArray implements IntegralArray
{
private final long[] value; LongArray( long[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public long longValue( int index ) { return value[index]; }
private final long[] value;

LongArray( long[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public long longValue( int index )
{
return value[index];
}
}

final class FloatArray implements FloatingPointArray
{
private final float[] value; FloatArray( float[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public double doubleValue( int index ) { return value[index]; }
private final float[] value;

FloatArray( float[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public double doubleValue( int index )
{
return value[index];
}
}

final class DoubleArray implements FloatingPointArray
{
private final double[] value; DoubleArray( double[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public double doubleValue( int index ) { return value[index]; }
private final double[] value;

DoubleArray( double[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public double doubleValue( int index )
{
return value[index];
}
}

final class NumberArray implements IntegralArray, FloatingPointArray
{
static IntegralArray asIntegral( Number[] value ) { return new NumberArray( value ); }
static FloatingPointArray asFloatingPoint( Number[] value ) { return new NumberArray( value ); }
private final Number[] value; private NumberArray( Number[] value ) { this.value = value; }
@Override public int length() { return value.length; }
@Override public long longValue( int index ) { return value[index].longValue(); }
@Override public double doubleValue( int index ) { return value[index].doubleValue(); }
static IntegralArray asIntegral( Number[] value )
{
return new NumberArray( value );
}

static FloatingPointArray asFloatingPoint( Number[] value )
{
return new NumberArray( value );
}

private final Number[] value;

private NumberArray( Number[] value )
{
this.value = value;
}

@Override
public int length()
{
return value.length;
}

@Override
public long longValue( int index )
{
return value[index].longValue();
}

@Override
public double doubleValue( int index )
{
return value[index].doubleValue();
}
}
//</pre>
}

0 comments on commit be556a7

Please sign in to comment.