From 612956b5948e86bb3d4c6c8898b056f763ae181a Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 3 Feb 2021 12:13:32 +0800 Subject: [PATCH] =?UTF-8?q?[Delete]=20Core,=20Framework-API=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=20BotCode=20=E7=9A=84=20'getPlatform'=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Delete] BotCode 移除目前尚未使用的 'getPlatform' 方法, 该方法在开发 BotCode 具体实现时带来了一些麻烦; [Delete] BasicBotCode, BasicBotCodeTest, AbstractBotCode, AbstractBotCodeTest, MessageChainTest 适配修改; --- .../lamgc/cgj/bot/framework/base/BasicBotCode.java | 5 ----- .../cgj/bot/framework/base/BasicBotCodeTest.java | 14 -------------- .../cgj/bot/framework/message/AbstractBotCode.java | 1 - .../lamgc/cgj/bot/framework/message/BotCode.java | 8 -------- .../bot/framework/message/AbstractBotCodeTest.java | 10 ++-------- .../bot/framework/message/MessageChainTest.java | 5 ----- 6 files changed, 2 insertions(+), 41 deletions(-) diff --git a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/framework/base/BasicBotCode.java b/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/framework/base/BasicBotCode.java index 53feff1..4522112 100644 --- a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/framework/base/BasicBotCode.java +++ b/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/framework/base/BasicBotCode.java @@ -47,11 +47,6 @@ public class BasicBotCode extends AbstractBotCode { super(function, functionProperties); } - @Override - public Platform getPlatform() { - return PLATFORM; - } - @Override public String contentToString() { StringBuilder builder = new StringBuilder('[' + getFunction().getFunctionName()); diff --git a/ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/framework/base/BasicBotCodeTest.java b/ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/framework/base/BasicBotCodeTest.java index 999f870..575bb4e 100644 --- a/ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/framework/base/BasicBotCodeTest.java +++ b/ContentGrabbingJi-core/src/test/java/net/lamgc/cgj/bot/framework/base/BasicBotCodeTest.java @@ -17,7 +17,6 @@ package net.lamgc.cgj.bot.framework.base; -import net.lamgc.cgj.bot.framework.Platform; import net.lamgc.cgj.bot.framework.message.AbstractBotCode; import net.lamgc.cgj.bot.framework.message.BotCode; import net.lamgc.cgj.bot.framework.message.BotCodeFunction; @@ -33,14 +32,6 @@ import java.util.Map; */ public class BasicBotCodeTest { - @Test - public void getPlatform() { - BotCode botCode = new BasicBotCode(StandardBotCodeFunction.AT); - - Assert.assertEquals("ContentGrabbingJi", botCode.getPlatform().getPlatformName()); - Assert.assertEquals("CGJ", botCode.getPlatform().getPlatformIdentify()); - } - @Test public void contentToStringWithoutParameter() { BotCode botCode = new BasicBotCode(StandardBotCodeFunction.FILE); @@ -67,11 +58,6 @@ public class BasicBotCodeTest { super(function, functionProperties); } - @Override - public Platform getPlatform() { - return null; - } - @Override public String contentToString() { return null; diff --git a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractBotCode.java b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractBotCode.java index 1ee86c9..15dd833 100644 --- a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractBotCode.java +++ b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractBotCode.java @@ -72,7 +72,6 @@ public abstract class AbstractBotCode implements BotCode { mapString.delete(mapString.length() - 2, mapString.length()); } return this.getClass().getSimpleName() + '@' + Integer.toHexString(this.hashCode()) + '{' + - "Platform=" + getPlatform() + ", " + "functionName='" + function.getFunctionName() + '\'' + ", functionProperties={" + mapString.toString() + '}' + '}'; diff --git a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/BotCode.java b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/BotCode.java index 6f3ab17..5efb347 100644 --- a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/BotCode.java +++ b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/BotCode.java @@ -17,8 +17,6 @@ package net.lamgc.cgj.bot.framework.message; -import net.lamgc.cgj.bot.framework.Platform; - import java.util.Set; /** @@ -28,12 +26,6 @@ import java.util.Set; @SuppressWarnings("AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc") public interface BotCode extends Message { - /** - * 获取 BotCode 实现所属平台. - * @return 返回所属平台. - */ - Platform getPlatform(); - /** * 取功能函数名. * @return 返回功能函数名. diff --git a/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/AbstractBotCodeTest.java b/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/AbstractBotCodeTest.java index 964b450..feda56d 100644 --- a/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/AbstractBotCodeTest.java +++ b/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/AbstractBotCodeTest.java @@ -17,7 +17,6 @@ package net.lamgc.cgj.bot.framework.message; -import net.lamgc.cgj.bot.framework.Platform; import org.junit.Assert; import org.junit.Test; @@ -125,13 +124,13 @@ public class AbstractBotCodeTest { public void toStringTest() { BotCode botCode = new TestBotCode("function"); String objectStr = botCode.getClass().getSimpleName() + '@' + Integer.toHexString(botCode.hashCode()); - Assert.assertEquals(objectStr + "{Platform=null, functionName='function', " + + Assert.assertEquals(objectStr + "{functionName='function', " + "functionProperties={Hashtable}}", botCode.toString()); botCode.setProperty("arg1", "value1"); botCode.setProperty("arg2", "测试"); botCode.setProperty("arg3", "Hello World."); - Assert.assertEquals(objectStr + "{Platform=null, functionName='function', " + + Assert.assertEquals(objectStr + "{functionName='function', " + "functionProperties={Hashtable{\"arg1\"='value1', \"arg2\"='测试', \"arg3\"='Hello World.'}}", botCode.toString()); } @@ -154,11 +153,6 @@ public class AbstractBotCodeTest { super(function, functionProperties); } - @Override - public Platform getPlatform() { - return null; - } - @Override public String contentToString() { return null; diff --git a/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/MessageChainTest.java b/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/MessageChainTest.java index 98d0349..c1b1e43 100644 --- a/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/MessageChainTest.java +++ b/ContentGrabbingJi-framework-api/src/test/java/net/lamgc/cgj/bot/framework/message/MessageChainTest.java @@ -76,11 +76,6 @@ public class MessageChainTest { public void plusBotCodeTest() { MessageChain chain = new MessageChain("BotCode: "); chain.plus(new AbstractBotCode(StandardBotCodeFunction.AT) { - @Override - public Platform getPlatform() { - return null; - } - @Override public String contentToString() { return "[at:arg=value]";