Smartcraft-Media-Tech/TikTokLiveJava
1
0
Fork 0
mirror of https://github.com/jwdeveloper/TikTokLiveJava.git synced 2026-02-27 08:49:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from Naimadx123/master

Browse Source 
Refactor protobuf import from GeneratedMessageV3 to GeneratedMessage
This commit is contained in:
David Kohler
2024-11-09 12:02:51 -05:00
committed by GitHub
parent 2550a462f9 f85f24a5c8
commit 354c072833
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java
View File

@@ -22,7 +22,7 @@
*/ */
package io.github.jwdeveloper.tiktok.mappers; package io.github.jwdeveloper.tiktok.mappers;
import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.GeneratedMessage;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
import io.github.jwdeveloper.tiktok.mappers.data.MappingAction; import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
@@ -44,13 +44,13 @@ public interface LiveMapper {
* @param mapperName protocol buffer class type * @param mapperName protocol buffer class type
* @return * @return
*/ */
TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName); TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName);
TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping); TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping);
TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping); TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, MappingAction<MappingResult> onMapping);
TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping); TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, Function<byte[], TikTokEvent> onMapping);
TikTokMapperModel forAnyMessage(); TikTokMapperModel forAnyMessage();
@@ -58,5 +58,5 @@ public interface LiveMapper {
boolean isRegistered(String mapperName); boolean isRegistered(String mapperName);
<T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName); <T extends GeneratedMessage> boolean isRegistered(Class<T> mapperName);
} }

4
API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java
View File

@@ -22,7 +22,7 @@
*/ */
package io.github.jwdeveloper.tiktok.mappers; package io.github.jwdeveloper.tiktok.mappers;
import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.GeneratedMessage;
import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject; import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
@@ -34,7 +34,7 @@ public interface LiveMapperHelper {
* @param <T> @messageClass must be class that is made by protocol buffer * @param <T> @messageClass must be class that is made by protocol buffer
* @return object of type @messageClass * @return object of type @messageClass
*/ */
<T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass); <T extends GeneratedMessage> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass);
/** /**
* @param bytes protocol buffer data bytes * @param bytes protocol buffer data bytes

10
Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
View File

@@ -22,7 +22,7 @@
*/ */
package io.github.jwdeveloper.tiktok.mappers; package io.github.jwdeveloper.tiktok.mappers;
import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.GeneratedMessage;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
import io.github.jwdeveloper.tiktok.mappers.data.*; import io.github.jwdeveloper.tiktok.mappers.data.*;
@@ -48,7 +48,7 @@ public class TikTokLiveMapper implements LiveMapper {
} }
@Override @Override
public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName) { public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName) {
return forMessage(mapperName.getSimpleName()); return forMessage(mapperName.getSimpleName());
} }
@@ -60,14 +60,14 @@ public class TikTokLiveMapper implements LiveMapper {
} }
@Override @Override
public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping) { public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, MappingAction<MappingResult> onMapping) {
var model = forMessage(mapperName); var model = forMessage(mapperName);
model.onMapping(onMapping); model.onMapping(onMapping);
return model; return model;
} }
@Override @Override
public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping) { public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, Function<byte[], TikTokEvent> onMapping) {
return forMessage(mapperName, (inputBytes, messageName, mapperHelper) -> MappingResult.of(inputBytes, onMapping.apply(inputBytes))); return forMessage(mapperName, (inputBytes, messageName, mapperHelper) -> MappingResult.of(inputBytes, onMapping.apply(inputBytes)));
} }
@@ -80,7 +80,7 @@ public class TikTokLiveMapper implements LiveMapper {
return mappers.containsKey(mapperName); return mappers.containsKey(mapperName);
} }
public <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName) { public <T extends GeneratedMessage> boolean isRegistered(Class<T> mapperName) {
return mappers.containsKey(mapperName.getSimpleName()); return mappers.containsKey(mapperName.getSimpleName());
} }

6
Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
View File

@@ -22,7 +22,7 @@
*/ */
package io.github.jwdeveloper.tiktok.mappers; package io.github.jwdeveloper.tiktok.mappers;
import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.GeneratedMessage;
import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
import io.github.jwdeveloper.tiktok.utils.JsonUtil; import io.github.jwdeveloper.tiktok.utils.JsonUtil;
import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject; import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
@@ -39,7 +39,7 @@ public class TikTokLiveMapperHelper implements LiveMapperHelper {
} }
@Override @Override
public <T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass) { public <T extends GeneratedMessage> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass) {
try { try {
var parsingMethod = genericMapper.getParsingMethod(messageClass); var parsingMethod = genericMapper.getParsingMethod(messageClass);
//NULL is passed, since Parsing method is Static //NULL is passed, since Parsing method is Static
@@ -55,7 +55,7 @@ public class TikTokLiveMapperHelper implements LiveMapperHelper {
try { try {
var packageName = PACKAGE_PREFIX + messageName; var packageName = PACKAGE_PREFIX + messageName;
var clazz = Class.forName(packageName); var clazz = Class.forName(packageName);
return bytesToWebcastObject(bytes, (Class<? extends GeneratedMessageV3>) clazz); return bytesToWebcastObject(bytes, (Class<? extends GeneratedMessage>) clazz);
} catch (Exception e) { } catch (Exception e) {
throw new TikTokMessageMappingException(messageName, e); throw new TikTokMessageMappingException(messageName, e);
} }