rename some classes remove this Impl we know that is Impl of something as the interface name is here
git-svn-id: https://svn.apache.org/repos/asf/directmemory/trunk@1494835 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
index df3fd19..fad7de7 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
@@ -29,7 +29,7 @@
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.allocator.Allocator;
-import org.apache.directmemory.memory.allocator.MergingByteBufferAllocatorImpl;
+import org.apache.directmemory.memory.allocator.MergingByteBufferAllocator;
import org.apache.directmemory.memory.buffer.MemoryBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +94,7 @@
protected Allocator instanciateByteBufferAllocator( final int allocatorNumber, final int size )
{
- final MergingByteBufferAllocatorImpl allocator = new MergingByteBufferAllocatorImpl( allocatorNumber, size );
+ final MergingByteBufferAllocator allocator = new MergingByteBufferAllocator( allocatorNumber, size );
// Hack to ensure the pointers are always split to keep backward compatibility.
allocator.setMinSizeThreshold( 0 );
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/UnsafeMemoryManagerServiceImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/UnsafeMemoryManagerServiceImpl.java
index c2348e8..1bc8f34 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/UnsafeMemoryManagerServiceImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/UnsafeMemoryManagerServiceImpl.java
@@ -22,12 +22,11 @@
import java.io.IOException;
import java.nio.BufferOverflowException;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.directmemory.memory.allocator.Allocator;
-import org.apache.directmemory.memory.allocator.LazyUnsafeAllocatorImpl;
+import org.apache.directmemory.memory.allocator.LazyUnsafeAllocator;
import org.apache.directmemory.memory.buffer.MemoryBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +50,7 @@
public void init( int numberOfBuffers, int size )
{
this.capacity = numberOfBuffers * size;
- this.allocator = new LazyUnsafeAllocatorImpl( numberOfBuffers, capacity );
+ this.allocator = new LazyUnsafeAllocator( numberOfBuffers, capacity );
}
@Override
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocatorImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocator.java
similarity index 98%
rename from directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocatorImpl.java
rename to directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocator.java
index f529e92..6aed6ce 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocatorImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/FixedSizeUnsafeAllocator.java
@@ -30,7 +30,7 @@
import org.apache.directmemory.memory.buffer.AbstractMemoryBuffer;
import org.apache.directmemory.memory.buffer.MemoryBuffer;
-public class FixedSizeUnsafeAllocatorImpl
+public class FixedSizeUnsafeAllocator
implements Allocator
{
@@ -46,7 +46,7 @@
// the slices
private final boolean returnNullWhenOversizingSliceSize = true;
- public FixedSizeUnsafeAllocatorImpl( int number, int size )
+ public FixedSizeUnsafeAllocator( int number, int size )
{
this.number = number;
this.size = size;
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocatorImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocator.java
similarity index 98%
rename from directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocatorImpl.java
rename to directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocator.java
index 3f8a4f4..3647c99 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocatorImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/LazyUnsafeAllocator.java
@@ -32,7 +32,7 @@
import org.apache.directmemory.memory.buffer.AbstractMemoryBuffer;
import org.apache.directmemory.memory.buffer.MemoryBuffer;
-public class LazyUnsafeAllocatorImpl
+public class LazyUnsafeAllocator
implements Allocator
{
@@ -51,7 +51,7 @@
// the slices
private final boolean returnNullWhenOversizingSliceSize = true;
- public LazyUnsafeAllocatorImpl( int number, long capacity )
+ public LazyUnsafeAllocator( int number, long capacity )
{
this.number = number;
this.capacity = capacity;
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocator.java
similarity index 98%
rename from directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImpl.java
rename to directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocator.java
index 25a17e6..b988061 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocator.java
@@ -52,7 +52,7 @@
*
* @since 0.6
*/
-public class MergingByteBufferAllocatorImpl
+public class MergingByteBufferAllocator
extends AbstractByteBufferAllocator
{
@@ -88,7 +88,7 @@
* @param number : the internal buffer identifier
* @param totalSize : total size of the parent buffer.
*/
- public MergingByteBufferAllocatorImpl( final int number, final int totalSize )
+ public MergingByteBufferAllocator( final int number, final int totalSize )
{
super( number );
diff --git a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImpl.java b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocator.java
similarity index 95%
rename from directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImpl.java
rename to directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocator.java
index 6b8f146..1caf9ca 100644
--- a/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImpl.java
+++ b/directmemory-cache/src/main/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocator.java
@@ -31,12 +31,12 @@
/**
- * {@link Allocator} implementation that uses {@link FixedSizeByteBufferAllocatorImpl}
+ * {@link Allocator} implementation that uses {@link FixedSizeByteBufferAllocator}
* of different size to allocate best matching's size {@link ByteBuffer}
*
* @since 0.6
*/
-public class SlabByteBufferAllocatorImpl
+public class SlabByteBufferAllocator
extends AbstractByteBufferAllocator
{
@@ -57,8 +57,8 @@
* @param slabs : {@link FixedSizeByteBufferAllocatorImpl} to use for allocation
* @param allowAllocationToBiggerSlab : tells if it is allowed to look in a bigger slab to perform the request.
*/
- public SlabByteBufferAllocatorImpl( final int number, final Collection<FixedSizeByteBufferAllocatorImpl> slabs,
- final boolean allowAllocationToBiggerSlab )
+ public SlabByteBufferAllocator( final int number, final Collection<FixedSizeByteBufferAllocatorImpl> slabs,
+ final boolean allowAllocationToBiggerSlab )
{
super( number );
diff --git a/directmemory-cache/src/test/java/org/apache/directmemory/memory/SlabMemoryManagerServiceTest.java b/directmemory-cache/src/test/java/org/apache/directmemory/memory/SlabMemoryManagerServiceTest.java
index 0b4328c..075c80c 100644
--- a/directmemory-cache/src/test/java/org/apache/directmemory/memory/SlabMemoryManagerServiceTest.java
+++ b/directmemory-cache/src/test/java/org/apache/directmemory/memory/SlabMemoryManagerServiceTest.java
@@ -24,7 +24,7 @@
import org.apache.directmemory.memory.allocator.Allocator;
import org.apache.directmemory.memory.allocator.FixedSizeByteBufferAllocatorImpl;
-import org.apache.directmemory.memory.allocator.SlabByteBufferAllocatorImpl;
+import org.apache.directmemory.memory.allocator.SlabByteBufferAllocator;
import org.junit.Test;
public class SlabMemoryManagerServiceTest
@@ -46,8 +46,8 @@
slabs.add( new FixedSizeByteBufferAllocatorImpl( 1, size, SMALL_PAYLOAD_LENGTH, 1 ) );
slabs.add( new FixedSizeByteBufferAllocatorImpl( 2, size, SMALL_PAYLOAD_LENGTH * 2, 1 ) );
- final SlabByteBufferAllocatorImpl allocator =
- new SlabByteBufferAllocatorImpl( allocatorNumber, slabs, false );
+ final SlabByteBufferAllocator allocator =
+ new SlabByteBufferAllocator( allocatorNumber, slabs, false );
return allocator;
}
diff --git a/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java b/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java
index 9dd3fc2..2cd4555 100644
--- a/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java
+++ b/directmemory-cache/src/test/java/org/apache/directmemory/memory/Starter.java
@@ -20,9 +20,8 @@
*/
import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.allocator.Allocator;
-import org.apache.directmemory.memory.allocator.MergingByteBufferAllocatorImpl;
+import org.apache.directmemory.memory.allocator.MergingByteBufferAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,7 +81,7 @@
public void rawInsert( int megabytes, int howMany )
{
- Allocator allocator = new MergingByteBufferAllocatorImpl( 1, megabytes * 1024 * 1024 );
+ Allocator allocator = new MergingByteBufferAllocator( 1, megabytes * 1024 * 1024 );
assertNotNull( allocator );
int size = allocator.getCapacity() / ( howMany );
size -= size / 100 * 1;
diff --git a/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImplTest.java b/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorTest.java
similarity index 91%
rename from directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImplTest.java
rename to directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorTest.java
index 5ecbf54..8f004b0 100644
--- a/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorImplTest.java
+++ b/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/MergingByteBufferAllocatorTest.java
@@ -32,14 +32,14 @@
import org.apache.directmemory.memory.buffer.MemoryBuffer;
import org.junit.Test;
-public class MergingByteBufferAllocatorImplTest
+public class MergingByteBufferAllocatorTest
{
@Test
public void allocationTest()
throws IOException
{
- Allocator allocator = new MergingByteBufferAllocatorImpl( 0, 5000 );
+ Allocator allocator = new MergingByteBufferAllocator( 0, 5000 );
MemoryBuffer bf1 = allocator.allocate( 250 );
Assert.assertEquals( 250, bf1.maxCapacity() );
@@ -76,7 +76,7 @@
throws IOException
{
- Allocator allocator = new MergingByteBufferAllocatorImpl( 0, 1000 );
+ Allocator allocator = new MergingByteBufferAllocator( 0, 1000 );
MemoryBuffer bf1 = allocator.allocate( 250 );
Assert.assertEquals( 250, bf1.maxCapacity() );
@@ -108,7 +108,7 @@
throws IOException
{
- Allocator allocator = new MergingByteBufferAllocatorImpl( 0, 1000 );
+ Allocator allocator = new MergingByteBufferAllocator( 0, 1000 );
for ( int i = 0; i < 1000; i++ )
{
@@ -131,7 +131,7 @@
throws IOException
{
- Allocator allocator = new MergingByteBufferAllocatorImpl( 0, 200 );
+ Allocator allocator = new MergingByteBufferAllocator( 0, 200 );
MemoryBuffer bf1 = allocator.allocate( 180 );
Assert.assertEquals( 200, bf1.maxCapacity() );
@@ -169,7 +169,7 @@
throws IOException
{
- MergingByteBufferAllocatorImpl allocator = new MergingByteBufferAllocatorImpl( 0, 200 );
+ MergingByteBufferAllocator allocator = new MergingByteBufferAllocator( 0, 200 );
allocator.setSizeRatioThreshold( 0.95 );
allocator.setSizeRatioThreshold( 10 );
@@ -190,7 +190,7 @@
throws IOException
{
- MergingByteBufferAllocatorImpl allocator = new MergingByteBufferAllocatorImpl( 0, 200 );
+ MergingByteBufferAllocator allocator = new MergingByteBufferAllocator( 0, 200 );
allocator.setReturnNullWhenBufferIsFull( false );
try
diff --git a/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImplTest.java b/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorTest.java
similarity index 95%
rename from directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImplTest.java
rename to directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorTest.java
index 3433730..bc39b5f 100644
--- a/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorImplTest.java
+++ b/directmemory-cache/src/test/java/org/apache/directmemory/memory/allocator/SlabByteBufferAllocatorTest.java
@@ -28,7 +28,7 @@
import org.apache.directmemory.memory.buffer.MemoryBuffer;
import org.junit.Test;
-public class SlabByteBufferAllocatorImplTest
+public class SlabByteBufferAllocatorTest
{
@Test
public void allocationTest()
@@ -42,7 +42,7 @@
slabs.add( new FixedSizeByteBufferAllocatorImpl( 3, 1024, 1024, 1 ) );
- Allocator allocator = new SlabByteBufferAllocatorImpl( 0, slabs, false );
+ Allocator allocator = new SlabByteBufferAllocator( 0, slabs, false );
MemoryBuffer bf1 = allocator.allocate( 250 );
Assert.assertEquals( 256, bf1.maxCapacity() );
diff --git a/directmemory-cache/src/test/java/org/apache/directmemory/memory/buffer/IntLongCompressionTestCase.java b/directmemory-cache/src/test/java/org/apache/directmemory/memory/buffer/IntLongCompressionTestCase.java
index 820f4c4..778bbf6 100644
--- a/directmemory-cache/src/test/java/org/apache/directmemory/memory/buffer/IntLongCompressionTestCase.java
+++ b/directmemory-cache/src/test/java/org/apache/directmemory/memory/buffer/IntLongCompressionTestCase.java
@@ -45,7 +45,7 @@
import java.util.Random;
-import org.apache.directmemory.memory.allocator.FixedSizeUnsafeAllocatorImpl;
+import org.apache.directmemory.memory.allocator.FixedSizeUnsafeAllocator;
import org.junit.Test;
public class IntLongCompressionTestCase
@@ -57,7 +57,7 @@
public void testInt32Compression()
throws Exception
{
- FixedSizeUnsafeAllocatorImpl allocator = new FixedSizeUnsafeAllocatorImpl( 1, 5 );
+ FixedSizeUnsafeAllocator allocator = new FixedSizeUnsafeAllocator( 1, 5 );
try
{
for ( int i = 0; i < 4; i++ )
@@ -98,7 +98,7 @@
throws Exception
{
- FixedSizeUnsafeAllocatorImpl allocator = new FixedSizeUnsafeAllocatorImpl( 1, 9 );
+ FixedSizeUnsafeAllocator allocator = new FixedSizeUnsafeAllocator( 1, 9 );
try
{
for ( int i = 0; i < 8; i++ )
