tdlight-team/TDLightTelegramBots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #569 from Chase22/FIX/annotation-for-bot-session

Browse Source 
Use stream to scan for annotations and to execute the methods
This commit is contained in:
Ruben Bermudez 2019-01-27 22:57:34 +00:00 committed by GitHub
commit 390808c804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotInitializer.java
View File

@ -51,46 +51,44 @@ public class TelegramBotInitializer implements InitializingBean {
} }
} }
private void handleAnnotatedMethod(Object bot, Method method, BotSession session) throws InvocationTargetException, IllegalAccessException { private void handleAnnotatedMethod(Object bot, Method method, BotSession session) {
if (method.getParameterCount() > 1) { try {
if (method.getParameterCount() > 1) {
BotLogger.warn(this.getClass().getSimpleName(),
format("Method %s of Type %s has too many parameters",
method.getName(),
method.getDeclaringClass().getCanonicalName()
)
);
return;
}
if (method.getParameterCount() == 0) {
method.invoke(bot);
return;
}
if (method.getParameterTypes()[0].equals(BotSession.class)) {
method.invoke(bot, session);
return;
}
BotLogger.warn(this.getClass().getSimpleName(), BotLogger.warn(this.getClass().getSimpleName(),
format("Method %s of Type %s has too many parameters", format("Method %s of Type %s has invalid parameter type",
method.getName(), method.getName(),
method.getDeclaringClass().getCanonicalName() method.getDeclaringClass().getCanonicalName()
) )
); );
return; } catch (InvocationTargetException | IllegalAccessException e) {
BotLogger.error(this.getClass().getSimpleName(),
format("Couldn't invoke Method %s of Type %s",
method.getName(), method.getDeclaringClass().getCanonicalName()
)
);
} }
if (method.getParameterCount() == 0) {
method.invoke(bot);
return;
}
if (method.getParameterTypes()[0].equals(BotSession.class)) {
method.invoke(bot, session);
return;
}
BotLogger.warn(this.getClass().getSimpleName(),
format("Method %s of Type %s has invalid parameter type",
method.getName(),
method.getDeclaringClass().getCanonicalName()
)
);
} }
private void handleAfterRegistrationHook(Object bot, BotSession botSession) { private void handleAfterRegistrationHook(Object bot, BotSession botSession) {
for (Method m : bot.getClass().getMethods()) { Stream.of(bot.getClass().getMethods())
Stream.of(m.getAnnotations()).forEach(annotation -> System.out.println(annotation.annotationType().getName())); .filter(method -> method.getAnnotation(AfterBotRegistration.class) != null)
if (m.getAnnotation(AfterBotRegistration.class) != null) { .forEach(method -> handleAnnotatedMethod(bot, method, botSession));
try {
handleAnnotatedMethod(bot, m, botSession);
} catch (InvocationTargetException | IllegalAccessException e) {
BotLogger.error(this.getClass().getSimpleName(),
format("Couldn't invoke Method %s of Type %s",
m.getName(), m.getDeclaringClass().getCanonicalName()
)
);
}
}
}
} }
} }