diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java
index 0f2459b84..a729e7871 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java
+++ b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java
@@ -5,6 +5,7 @@
 // tag::example[]
 public class LongEventFactory implements EventFactory<LongEvent>
 {
+    @Override
     public LongEvent newInstance()
     {
         return new LongEvent();
diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventHandler.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventHandler.java
index 4a695a2db..f2769f189 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventHandler.java
+++ b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventHandler.java
@@ -5,6 +5,7 @@
 // tag::example[]
 public class LongEventHandler implements EventHandler<LongEvent>
 {
+    @Override
     public void onEvent(LongEvent event, long sequence, boolean endOfBatch)
     {
         System.out.println("Event: " + event);
diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducer.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducer.java
index 8cbe889e2..dbdc4fcaa 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducer.java
+++ b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducer.java
@@ -19,6 +19,7 @@ public LongEventProducer(RingBuffer<LongEvent> ringBuffer)
     private static final EventTranslatorOneArg<LongEvent, ByteBuffer> TRANSLATOR =
         new EventTranslatorOneArg<LongEvent, ByteBuffer>()
         {
+            @Override
             public void translateTo(LongEvent event, long sequence, ByteBuffer bb)
             {
                 event.set(bb.getLong(0));
diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducerWithTranslator.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducerWithTranslator.java
index bb37acf4e..a1de441d1 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducerWithTranslator.java
+++ b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducerWithTranslator.java
@@ -18,6 +18,7 @@ public LongEventProducerWithTranslator(RingBuffer<LongEvent> ringBuffer)
     private static final EventTranslatorOneArg<LongEvent, ByteBuffer> TRANSLATOR =
         new EventTranslatorOneArg<LongEvent, ByteBuffer>()
         {
+            @Override
             public void translateTo(LongEvent event, long sequence, ByteBuffer bb)
             {
                 event.set(bb.getLong(0));
diff --git a/src/examples/java/com/lmax/disruptor/examples/objectevent/ClearingEventHandler.java b/src/examples/java/com/lmax/disruptor/examples/objectevent/ClearingEventHandler.java
index c992fc7d6..64cdcdc05 100644
--- a/src/examples/java/com/lmax/disruptor/examples/objectevent/ClearingEventHandler.java
+++ b/src/examples/java/com/lmax/disruptor/examples/objectevent/ClearingEventHandler.java
@@ -5,6 +5,7 @@
 
 public class ClearingEventHandler<T> implements EventHandler<ObjectEvent<T>>
 {
+    @Override
     public void onEvent(ObjectEvent<T> event, long sequence, boolean endOfBatch)
     {
         event.clear(); // <1>
diff --git a/src/main/java/com/lmax/disruptor/RingBuffer.java b/src/main/java/com/lmax/disruptor/RingBuffer.java
index f6383e7ba..031271bb9 100644
--- a/src/main/java/com/lmax/disruptor/RingBuffer.java
+++ b/src/main/java/com/lmax/disruptor/RingBuffer.java
@@ -440,6 +440,7 @@ public long getCursor()
      *
      * @return size of buffer
      */
+    @Override
     public int getBufferSize()
     {
         return bufferSize;
@@ -455,6 +456,7 @@ public int getBufferSize()
      * @return <code>true</code> If the specified <code>requiredCapacity</code> is available
      * <code>false</code> if not.
      */
+    @Override
     public boolean hasAvailableCapacity(final int requiredCapacity)
     {
         return sequencer.hasAvailableCapacity(requiredCapacity);
@@ -898,6 +900,7 @@ public void publish(final long lo, final long hi)
      *
      * @return The number of slots remaining.
      */
+    @Override
     public long remainingCapacity()
     {
         return sequencer.remainingCapacity();
diff --git a/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
index 323cc79d8..934f993e0 100644
--- a/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
@@ -451,6 +451,7 @@ public void setRewindable(final BatchEventProcessor<LongEvent> processor)
             this.processor = processor;
         }
 
+        @Override
         public void onEvent(final LongEvent event, final long sequence, final boolean endOfBatch) throws Exception
         {
 
diff --git a/src/test/java/com/lmax/disruptor/alternatives/RingBufferArray.java b/src/test/java/com/lmax/disruptor/alternatives/RingBufferArray.java
index 0bbf8b179..a76517649 100644
--- a/src/test/java/com/lmax/disruptor/alternatives/RingBufferArray.java
+++ b/src/test/java/com/lmax/disruptor/alternatives/RingBufferArray.java
@@ -459,6 +459,7 @@ public long getCursor()
      *
      * @return size of buffer
      */
+    @Override
     public int getBufferSize()
     {
         return bufferSize;
@@ -474,6 +475,7 @@ public int getBufferSize()
      * @return <code>true</code> If the specified <code>requiredCapacity</code> is available
      * <code>false</code> if not.
      */
+    @Override
     public boolean hasAvailableCapacity(final int requiredCapacity)
     {
         return sequencer.hasAvailableCapacity(requiredCapacity);
@@ -917,6 +919,7 @@ public void publish(final long lo, final long hi)
      *
      * @return The number of slots remaining.
      */
+    @Override
     public long remainingCapacity()
     {
         return sequencer.remainingCapacity();
diff --git a/src/test/java/com/lmax/disruptor/alternatives/RingBufferUnsafe.java b/src/test/java/com/lmax/disruptor/alternatives/RingBufferUnsafe.java
index 8a77cbb25..022ba75fa 100644
--- a/src/test/java/com/lmax/disruptor/alternatives/RingBufferUnsafe.java
+++ b/src/test/java/com/lmax/disruptor/alternatives/RingBufferUnsafe.java
@@ -472,6 +472,7 @@ public long getCursor()
      *
      * @return size of buffer
      */
+    @Override
     public int getBufferSize()
     {
         return bufferSize;
@@ -487,6 +488,7 @@ public int getBufferSize()
      * @return <code>true</code> If the specified <code>requiredCapacity</code> is available
      * <code>false</code> if not.
      */
+    @Override
     public boolean hasAvailableCapacity(final int requiredCapacity)
     {
         return sequencer.hasAvailableCapacity(requiredCapacity);
@@ -930,6 +932,7 @@ public void publish(final long lo, final long hi)
      *
      * @return The number of slots remaining.
      */
+    @Override
     public long remainingCapacity()
     {
         return sequencer.remainingCapacity();
diff --git a/src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java b/src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java
index c8f626420..d21e22bf8 100644
--- a/src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java
+++ b/src/test/java/com/lmax/disruptor/dsl/stubs/StubExceptionHandler.java
@@ -28,6 +28,7 @@ public StubExceptionHandler(final AtomicReference<Throwable> exceptionHandled)
         this.exceptionHandled = exceptionHandled;
     }
 
+    @Override
     public void handleEventException(final Throwable ex, final long sequence, final Object event)
     {
         exceptionHandled.set(ex);