优化ttbuilder

HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDLoaderUtil.java

@@ -15,16 +15,27 @@
  */
 package com.arialyy.aria.http.download;
 
+import com.arialyy.aria.core.TaskRecord;
+import com.arialyy.aria.core.common.SubThreadConfig;
 import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.listener.IEventListener;
 import com.arialyy.aria.core.loader.AbsNormalLoader;
 import com.arialyy.aria.core.loader.AbsNormalLoaderUtil;
+import com.arialyy.aria.core.loader.AbsNormalTTBuilderAdapter;
+import com.arialyy.aria.core.loader.IRecordHandler;
 import com.arialyy.aria.core.loader.LoaderStructure;
 import com.arialyy.aria.core.loader.NormalLoader;
+import com.arialyy.aria.core.loader.NormalTTBuilder;
 import com.arialyy.aria.core.loader.NormalThreadStateManager;
+import com.arialyy.aria.core.task.IThreadTaskAdapter;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.http.HttpRecordHandler;
 import com.arialyy.aria.http.HttpTaskOption;
+import com.arialyy.aria.util.ALog;
+import com.arialyy.aria.util.BufferedRandomAccessFile;
+import com.arialyy.aria.util.FileUtil;
+import java.io.File;
+import java.io.IOException;
 
 /**
  * @Author lyy
@@ -45,8 +56,10 @@ public final class HttpDLoaderUtil extends AbsNormalLoaderUtil {
     structure.addComponent(new HttpRecordHandler(getTaskWrapper()))
         .addComponent(new NormalThreadStateManager(getListener()))
         .addComponent(new HttpDFileInfoTask((DTaskWrapper) getTaskWrapper()))
-        .addComponent(new HttpDTTBuilder(getTaskWrapper()));
+        .addComponent(new NormalTTBuilder(getTaskWrapper(), new HttpDTTBuilderAdapter()));
     structure.accept(getLoader());
     return structure;
   }
+
+
 }

HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDTTBuilderAdapter.java

@@ -2,20 +2,16 @@ package com.arialyy.aria.http.download;
 
 import com.arialyy.aria.core.TaskRecord;
 import com.arialyy.aria.core.common.SubThreadConfig;
-import com.arialyy.aria.core.loader.AbsNormalTTBuilder;
+import com.arialyy.aria.core.loader.AbsNormalTTBuilderAdapter;
 import com.arialyy.aria.core.loader.IRecordHandler;
 import com.arialyy.aria.core.task.IThreadTaskAdapter;
-import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.BufferedRandomAccessFile;
 import com.arialyy.aria.util.FileUtil;
 import java.io.File;
 import java.io.IOException;
 
-final class HttpDTTBuilder extends AbsNormalTTBuilder {
-  HttpDTTBuilder(AbsTaskWrapper wrapper) {
-    super(wrapper);
-  }
+final class HttpDTTBuilderAdapter extends AbsNormalTTBuilderAdapter {
 
   @Override public IThreadTaskAdapter getAdapter(SubThreadConfig config) {
     return new HttpDThreadTaskAdapter(config);
@@ -59,4 +55,4 @@ final class HttpDTTBuilder extends AbsNormalTTBuilder {
     }
     return false;
   }
-}
+}

HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpSubDLoaderUtil.java

@@ -20,6 +20,7 @@ import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.group.AbsSubDLoadUtil;
 import com.arialyy.aria.core.group.SubRecordHandler;
 import com.arialyy.aria.core.loader.LoaderStructure;
+import com.arialyy.aria.core.loader.NormalTTBuilder;
 import com.arialyy.aria.core.loader.SubLoader;
 
 /**
@@ -48,7 +49,7 @@ final class HttpSubDLoaderUtil extends AbsSubDLoadUtil {
   @Override protected LoaderStructure buildLoaderStructure() {
     LoaderStructure structure = new LoaderStructure();
     structure.addComponent(new SubRecordHandler(getWrapper()))
-        .addComponent(new HttpDTTBuilder(getWrapper()))
+        .addComponent(new NormalTTBuilder(getWrapper(), new HttpDTTBuilderAdapter()))
         .addComponent(new HttpDFileInfoTask(getWrapper()));
     structure.accept(getLoader());
     return structure;

HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpULoaderUtil.java

@@ -15,11 +15,16 @@
  */
 package com.arialyy.aria.http.upload;
 
+import com.arialyy.aria.core.TaskRecord;
+import com.arialyy.aria.core.common.SubThreadConfig;
 import com.arialyy.aria.core.listener.IEventListener;
 import com.arialyy.aria.core.loader.AbsNormalLoader;
 import com.arialyy.aria.core.loader.AbsNormalLoaderUtil;
+import com.arialyy.aria.core.loader.AbsNormalTTBuilderAdapter;
 import com.arialyy.aria.core.loader.LoaderStructure;
+import com.arialyy.aria.core.loader.NormalTTBuilder;
 import com.arialyy.aria.core.loader.NormalThreadStateManager;
+import com.arialyy.aria.core.task.IThreadTaskAdapter;
 import com.arialyy.aria.core.upload.UTaskWrapper;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.http.HttpRecordHandler;
@@ -44,7 +49,15 @@ public final class HttpULoaderUtil extends AbsNormalLoaderUtil {
     LoaderStructure structure = new LoaderStructure();
     structure.addComponent(new HttpRecordHandler(getTaskWrapper()))
         .addComponent(new NormalThreadStateManager(getListener()))
-        .addComponent(new HttpUTTBuilder(getTaskWrapper()));
+        .addComponent(new NormalTTBuilder(getTaskWrapper(), new AbsNormalTTBuilderAdapter() {
+          @Override public IThreadTaskAdapter getAdapter(SubThreadConfig config) {
+            return new HttpUThreadTaskAdapter(config);
+          }
+
+          @Override public boolean handleNewTask(TaskRecord record, int totalThreadNum) {
+            return true;
+          }
+        }));
     structure.accept(getLoader());
     return structure;
   }

HttpComponent/src/main/java/com/arialyy/aria/http/upload/HttpUTTBuilder.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
- *
- * Licensed 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 com.arialyy.aria.http.upload;
-
-import com.arialyy.aria.core.TaskRecord;
-import com.arialyy.aria.core.common.SubThreadConfig;
-import com.arialyy.aria.core.loader.AbsNormalTTBuilder;
-import com.arialyy.aria.core.task.IThreadTaskAdapter;
-import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
-
-/**
- * @Author lyy
- * @Date 2019-09-19
- */
-final class HttpUTTBuilder extends AbsNormalTTBuilder {
-
-  HttpUTTBuilder(AbsTaskWrapper wrapper) {
-    super(wrapper);
-  }
-
-  @Override public IThreadTaskAdapter getAdapter(SubThreadConfig config) {
-    return new HttpUThreadTaskAdapter(config);
-  }
-
-  @Override public boolean handleNewTask(TaskRecord record, int totalThreadNum) {
-    return true;
-  }
-}