Core code refactoring (#528)

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java

@@ -105,7 +105,6 @@ public enum QueueTypeEnum {
                                     if (capacity == null || capacity <= 0) {
                                         temCapacity = 1024;
                                     }
-
                                     return new LinkedBlockingQueue(temCapacity);
                                 }));
         return blockingQueue;

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedPolicies.java

@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cn.hippo4j.core.executor.support;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * Rejected policies.
- */
-@Slf4j
-public class RejectedPolicies {
-
-    public static class RunsOldestTaskPolicy implements RejectedExecutionHandler {
-
-        @Override
-        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
-            if (executor.isShutdown()) {
-                return;
-            }
-            BlockingQueue<Runnable> workQueue = executor.getQueue();
-            Runnable firstWork = workQueue.poll();
-            boolean newTaskAdd = workQueue.offer(r);
-            if (firstWork != null) {
-                firstWork.run();
-            }
-            if (!newTaskAdd) {
-                executor.execute(r);
-            }
-        }
-    }
-
-    public static class SyncPutQueuePolicy implements RejectedExecutionHandler {
-
-        @Override
-        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
-            if (executor.isShutdown()) {
-                return;
-            }
-            try {
-                executor.getQueue().put(r);
-            } catch (InterruptedException e) {
-                log.error("Adding Queue task to thread pool failed.", e);
-            }
-        }
-    }
-}

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java

@@ -40,9 +40,9 @@ public enum RejectedTypeEnum {
 
     DISCARD_OLDEST_POLICY(4, "DiscardOldestPolicy", new ThreadPoolExecutor.DiscardOldestPolicy()),
 
-    RUNS_OLDEST_TASK_POLICY(5, "RunsOldestTaskPolicy", new RejectedPolicies.RunsOldestTaskPolicy()),
+    RUNS_OLDEST_TASK_POLICY(5, "RunsOldestTaskPolicy", new RunsOldestTaskPolicy()),
 
-    SYNC_PUT_QUEUE_POLICY(6, "SyncPutQueuePolicy", new RejectedPolicies.SyncPutQueuePolicy());
+    SYNC_PUT_QUEUE_POLICY(6, "SyncPutQueuePolicy", new SyncPutQueuePolicy());
 
     public Integer type;
 

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RunsOldestTaskPolicy.java

@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.hippo4j.core.executor.support;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * Run the oldest task policy.
+ */
+public class RunsOldestTaskPolicy implements RejectedExecutionHandler {
+
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
+        if (executor.isShutdown()) {
+            return;
+        }
+        BlockingQueue<Runnable> workQueue = executor.getQueue();
+        Runnable firstWork = workQueue.poll();
+        boolean newTaskAdd = workQueue.offer(r);
+        if (firstWork != null) {
+            firstWork.run();
+        }
+        if (!newTaskAdd) {
+            executor.execute(r);
+        }
+    }
+}

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/SyncPutQueuePolicy.java

@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.hippo4j.core.executor.support;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * Synchronous put queue policy.
+ */
+@Slf4j
+public class SyncPutQueuePolicy implements RejectedExecutionHandler {
+
+    @Override
+    public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
+        if (executor.isShutdown()) {
+            return;
+        }
+        try {
+            executor.getQueue().put(r);
+        } catch (InterruptedException e) {
+            log.error("Adding Queue task to thread pool failed.", e);
+        }
+    }
+}