You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2019/06/26 11:21:52 UTC

[johnzon] branch master updated: remove unused StringBuilder BufferProvider

This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b71b34  remove unused StringBuilder BufferProvider
9b71b34 is described below

commit 9b71b34e200079262f90a568ca0523dc1e2c3e4a
Author: Mark Struberg <st...@apache.org>
AuthorDate: Wed Jun 26 13:21:28 2019 +0200

    remove unused StringBuilder BufferProvider
---
 .../org/apache/johnzon/core/BufferStrategy.java    |   1 -
 .../apache/johnzon/core/BufferStrategyFactory.java | 119 +--------------------
 .../johnzon/core/BufferStrategyFactoryTest.java    |   6 --
 3 files changed, 4 insertions(+), 122 deletions(-)

diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
index 89d7ce4..432d781 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
@@ -25,7 +25,6 @@ import java.io.Serializable;
  */
 public interface BufferStrategy {
     BufferProvider<char[]> newCharProvider(int size);
-    BufferProvider<StringBuilder> newStringBuilderProvider(int size);
 
     interface BufferProvider<T> extends Serializable {
         T newBuffer();
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
index 03ebf4f..62556a5 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
@@ -28,52 +28,10 @@ public class BufferStrategyFactory {
     static {
         DEFAULT_STRATEGIES = new HashMap<>();
 
-        DEFAULT_STRATEGIES.put("BY_INSTANCE", new BufferStrategy() {
-            @Override
-            public BufferProvider<char[]> newCharProvider(final int size) {
-                return new CharBufferByInstanceProvider(size);
-            }
-
-            @Override
-            public BufferProvider<StringBuilder> newStringBuilderProvider(final int size) {
-                return new StringBuilderByInstanceProvider(size);
-            }
-        });
-
-        DEFAULT_STRATEGIES.put("THREAD_LOCAL", new BufferStrategy() {
-            @Override
-            public BufferProvider<char[]> newCharProvider(final int size) {
-                return new CharBufferThreadLocalProvider(size);
-            }
-
-            @Override
-            public BufferProvider<StringBuilder> newStringBuilderProvider(final int size) {
-                return new StringBuilderThreadLocalProvider(size);
-            }
-        });
-
-        DEFAULT_STRATEGIES.put("QUEUE", new BufferStrategy() {
-            @Override
-            public BufferProvider<char[]> newCharProvider(final int size) {
-                return new CharBufferQueueProvider(size);
-            }
-
-            @Override
-            public BufferProvider<StringBuilder> newStringBuilderProvider(final int size) {
-                return new StringBuilderQueueProvider(size);
-            }
-        });
-        DEFAULT_STRATEGIES.put("SINGLETON", new BufferStrategy() {
-            @Override
-            public BufferProvider<char[]> newCharProvider(final int size) {
-                return new CharBufferSingletonProvider(size);
-            }
-
-            @Override
-            public BufferProvider<StringBuilder> newStringBuilderProvider(final int size) {
-                return new StringBuilderSingletonProvider(size);
-            }
-        });
+        DEFAULT_STRATEGIES.put("BY_INSTANCE", CharBufferByInstanceProvider::new);
+        DEFAULT_STRATEGIES.put("THREAD_LOCAL", CharBufferThreadLocalProvider::new);
+        DEFAULT_STRATEGIES.put("QUEUE", CharBufferQueueProvider::new);
+        DEFAULT_STRATEGIES.put("SINGLETON", CharBufferSingletonProvider::new);
     }
 
     private BufferStrategyFactory() {
@@ -132,22 +90,6 @@ public class BufferStrategyFactory {
         }
     }
 
-    private static class StringBuilderSingletonProvider extends SingletonProvider<StringBuilder> {
-        public StringBuilderSingletonProvider(final int size) {
-            super(size);
-        }
-
-        @Override
-        protected StringBuilder newInstance(final int size) {
-            return new StringBuilder(size);
-        }
-
-        @Override
-        public void release(final StringBuilder value) {
-            value.setLength(0);
-        }
-    }
-
     private static abstract class SingletonProvider<T> implements BufferStrategy.BufferProvider<T> {
         protected final T buffer;
 
@@ -204,23 +146,6 @@ public class BufferStrategyFactory {
         }
     }
 
-    private static class StringBuilderThreadLocalProvider extends ThreadLocalProvider<StringBuilder> {
-        public StringBuilderThreadLocalProvider(int size) {
-            super(size);
-        }
-
-        @Override
-        protected StringBuilder newInstance(final int size) {
-            return new StringBuilder(size);
-        }
-
-        @Override
-        public void release(final StringBuilder value) {
-            value.setLength(0);
-            super.release(value);
-        }
-    }
-
     private static class CharBufferByInstanceProvider implements BufferStrategy.BufferProvider<char[]> {
         private final int size;
 
@@ -239,24 +164,6 @@ public class BufferStrategyFactory {
         }
     }
 
-    private static class StringBuilderByInstanceProvider implements BufferStrategy.BufferProvider<StringBuilder> {
-        private final int size;
-
-        public StringBuilderByInstanceProvider(final int size) {
-            this.size = size;
-        }
-
-        @Override
-        public StringBuilder newBuffer() {
-            return new StringBuilder(size);
-        }
-
-        @Override
-        public void release(final StringBuilder value) {
-            // no-op
-        }
-    }
-
     private static abstract class QueueProvider<T> implements BufferStrategy.BufferProvider<T> {
         private final int size;
         private final ConcurrentLinkedQueue<T> queue = new ConcurrentLinkedQueue<T>();
@@ -292,22 +199,4 @@ public class BufferStrategyFactory {
             return new char[size];
         }
     }
-
-    private static class StringBuilderQueueProvider extends QueueProvider<StringBuilder> {
-        public StringBuilderQueueProvider(final int size) {
-            super(size);
-        }
-
-        @Override
-        protected StringBuilder newInstance(int size) {
-            return new StringBuilder(size);
-        }
-
-        @Override
-        public void release(final StringBuilder value) {
-            value.setLength(0);
-            super.release(value);
-        }
-    }
-
 }
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/BufferStrategyFactoryTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/BufferStrategyFactoryTest.java
index 70024c9..895eb83 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/BufferStrategyFactoryTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/BufferStrategyFactoryTest.java
@@ -85,11 +85,5 @@ public class BufferStrategyFactoryTest {
             counter.incrementAndGet();
             return delegate.newCharProvider(size);
         }
-
-        @Override
-        public BufferProvider<StringBuilder> newStringBuilderProvider(int size) {
-            counter.incrementAndGet();
-            return delegate.newStringBuilderProvider(size);
-        }
     }
 }