Skip to content

Commit 9a46514

Browse files
Review developed classes to replace JVMBridgeBase where not needed
1 parent 92b4ad4 commit 9a46514

12 files changed

Lines changed: 22 additions & 23 deletions

File tree

src/net/KNet/Developed/Org/Apache/Kafka/Clients/Consumer/InvalidOffsetException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ public partial class InvalidOffsetException
2828
/// <summary>
2929
/// <see href="https://www.javadoc.io/doc/org.apache.kafka/kafka-clients/latest/org/apache/kafka/clients/consumer/InvalidOffsetException.html#partitions()"/>
3030
/// </summary>
31-
public Set<TopicPartition> Partitions => JVMBridgeBase.WrapsDirect<Set<TopicPartition>>(BridgeInstance.Invoke("partitions") as IJavaObject);
31+
public Set<TopicPartition> Partitions => JVMBridgeCore.WrapsDirect<Set<TopicPartition>>(BridgeInstance.Invoke("partitions") as IJavaObject);
3232
}
3333
}

src/net/KNet/Developed/Org/Apache/Kafka/Clients/Consumer/LogTruncationException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
using MASES.JCOBridge.C2JBridge.JVMInterop;
2121
using Org.Apache.Kafka.Common;
2222
using Java.Util;
23-
using static System.Net.WebRequestMethods;
2423

2524
namespace Org.Apache.Kafka.Clients.Consumer
2625
{
@@ -29,6 +28,6 @@ public partial class LogTruncationException
2928
/// <summary>
3029
/// <see href="https://www.javadoc.io/doc/org.apache.kafka/kafka-clients/latest/org/apache/kafka/clients/consumer/LogTruncationException.html#divergentOffsets()"/>
3130
/// </summary>
32-
public Map<TopicPartition, OffsetAndMetadata> DivergentOffsets => JVMBridgeBase.WrapsDirect<Map<TopicPartition, OffsetAndMetadata>>(BridgeInstance.Invoke("divergentOffsets") as IJavaObject);
31+
public Map<TopicPartition, OffsetAndMetadata> DivergentOffsets => JVMBridgeCore.WrapsDirect<Map<TopicPartition, OffsetAndMetadata>>(BridgeInstance.Invoke("divergentOffsets") as IJavaObject);
3332
}
3433
}

src/net/KNet/Developed/Org/Apache/Kafka/Clients/Consumer/OffsetOutOfRangeException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ public partial class OffsetOutOfRangeException
2929
/// <summary>
3030
/// <see href="https://www.javadoc.io/doc/org.apache.kafka/kafka-clients/latest/org/apache/kafka/clients/consumer/OffsetOutOfRangeException.html#offsetOutOfRangePartitions()"/>
3131
/// </summary>
32-
public Map<TopicPartition, long> OffsetOutOfRangePartitions => JVMBridgeBase.WrapsDirect<Map<TopicPartition, long>>(BridgeInstance.Invoke("offsetOutOfRangePartitions") as IJavaObject);
32+
public Map<TopicPartition, long> OffsetOutOfRangePartitions => JVMBridgeCore.WrapsDirect<Map<TopicPartition, long>>(BridgeInstance.Invoke("offsetOutOfRangePartitions") as IJavaObject);
3333
}
3434
}

src/net/KNet/Developed/Org/Apache/Kafka/Common/Errors/InvalidTopicException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public partial class InvalidTopicException
3030
/// </summary>
3131
public Set<string> InvalidTopics()
3232
{
33-
return JVMBridgeBase.WrapsDirect<Set<string>>(BridgeInstance.Invoke("invalidTopics") as IJavaObject);
33+
return JVMBridgeCore.WrapsDirect<Set<string>>(BridgeInstance.Invoke("invalidTopics") as IJavaObject);
3434
}
3535
}
3636
}

src/net/KNet/Developed/Org/Apache/Kafka/Common/Serialization/VoidSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Org.Apache.Kafka.Common.Serialization
2323
/// <summary>
2424
/// <see href="https://www.javadoc.io/doc/org.apache.kafka/kafka-clients/4.2.0/org/apache/kafka/common/serialization/VoidSerializer.html"/>
2525
/// </summary>
26-
public class VoidSerializer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<VoidSerializer>
26+
public class VoidSerializer : MASES.JCOBridge.C2JBridge.JVMBridgeCore<VoidSerializer>
2727
{
2828
/// <inheritdoc/>
2929
public override string BridgeClassName => "org.apache.kafka.common.serialization.VoidSerializer";

src/net/KNet/Developed/Org/Apache/Kafka/Connect/Connector/ConnectRecord.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public partial class ConnectRecord<R>
3737
/// <typeparam name="R">The class extending <see cref="ConnectRecord{R, TKey, TValue}"/></typeparam>
3838
/// <typeparam name="TKey">The type of the key to be inserted in Kafka</typeparam>
3939
/// <typeparam name="TValue">The type of value to be inserted in Kafka</typeparam>
40-
public class ConnectRecord<R, TKey, TValue> : JVMBridgeBase<ConnectRecord<R, TKey, TValue>> where R : ConnectRecord<R, TKey, TValue>
40+
public class ConnectRecord<R, TKey, TValue> : JVMBridgeCore<ConnectRecord<R, TKey, TValue>> where R : ConnectRecord<R, TKey, TValue>
4141
{
4242
/// <inheritdoc/>
4343
public override bool IsBridgeAbstract => true;
@@ -74,7 +74,7 @@ public ConnectRecord(string topic, int kafkaPartition,
7474
{
7575
}
7676
/// <summary>
77-
/// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
77+
/// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest <see cref="JVMBridgeCore"/> class
7878
/// </summary>
7979
protected ConnectRecord(params object[] args) : base(args)
8080
{

src/net/KNet/Developed/Org/Apache/Kafka/Streams/State/KNetRocksDBConfigSetter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public KNetRocksDBConfigSetter(IJVMBridgeBaseInitializer initializer) : base(ini
354354
public KNetRocksDBConfigSetter(params object[] args) : base(args) { }
355355

356356
private static readonly global::System.Exception _LocalBridgeClazzException = null;
357-
private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = JVMBridgeBase.ClazzOf(_bridgeClassName, out _LocalBridgeClazzException, false);
357+
private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = JVMBridgeCore.ClazzOf(_bridgeClassName, out _LocalBridgeClazzException, false);
358358
private static MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw _LocalBridgeClazzException ?? new global::System.InvalidOperationException($"Class {_bridgeClassName} was not found.");
359359

360360
/// <inheritdoc/>

src/net/KNet/Developed/Org/Apache/Kafka/Streams/State/KNetRocksDBConfigSetterCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public KNetRocksDBConfigSetterCallback(IJVMBridgeBaseInitializer initializer) :
4242
public KNetRocksDBConfigSetterCallback(params object[] args) : base(args) { InitializeHandlers(); }
4343
const string _bridgeClassName = "org.mases.knet.developed.streams.state.KNetRocksDBConfigSetterCallback";
4444
private static readonly global::System.Exception _LocalBridgeClazzException = null;
45-
private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = JVMBridgeBase.ClazzOf(_bridgeClassName, out _LocalBridgeClazzException, false);
45+
private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = JVMBridgeCore.ClazzOf(_bridgeClassName, out _LocalBridgeClazzException, false);
4646
private static MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw _LocalBridgeClazzException ?? new global::System.InvalidOperationException($"Class {_bridgeClassName} was not found.");
4747

4848
/// <inheritdoc />

src/net/KNet/Specific/Consumer/ConsumerRecordsPrefetchableEnumerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected override object ConvertObject(object input)
4040
{
4141
if (input is IJavaObject obj)
4242
{
43-
return new ConsumerRecord<K, V, TJVMK, TJVMV>(JVMBridgeBase.WrapsDirect<Org.Apache.Kafka.Clients.Consumer.ConsumerRecord<TJVMK, TJVMV>>(obj), keySerDes, valueSerDes, true);
43+
return new ConsumerRecord<K, V, TJVMK, TJVMV>(JVMBridgeCore.WrapsDirect<Org.Apache.Kafka.Clients.Consumer.ConsumerRecord<TJVMK, TJVMV>>(obj), keySerDes, valueSerDes, true);
4444
}
4545
throw new InvalidCastException($"input is not a valid IJavaObject");
4646
}

src/net/KNet/Specific/KNetConfigurationFromMap.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public System.Collections.Generic.List<string> GetList(string key)
247247

248248
if (result is IJavaObject obj)
249249
{
250-
var lst = JVMBridgeBase.WrapsDirect<Java.Util.List<Java.Lang.String>>(obj);
250+
var lst = JVMBridgeCore.WrapsDirect<Java.Util.List<Java.Lang.String>>(obj);
251251
System.Collections.Generic.List<string> newLst = new System.Collections.Generic.List<string>();
252252
foreach (var item in lst)
253253
{
@@ -323,7 +323,7 @@ public Password GetPassword(string key)
323323
}
324324
else if (result is IJavaObject obj)
325325
{
326-
return JVMBridgeBase.WrapsDirect<Password>(obj);
326+
return JVMBridgeCore.WrapsDirect<Password>(obj);
327327
}
328328
else throw new InvalidCastException($"Key \"{key}\" returns a value {(result ?? "null")} cannot be converted in Password");
329329
}
@@ -343,7 +343,7 @@ public Java.Lang.Class GetClass(string key)
343343
}
344344
else if (result is IJavaObject obj)
345345
{
346-
return JVMBridgeBase.WrapsDirect<Java.Lang.Class>(obj);
346+
return JVMBridgeCore.WrapsDirect<Java.Lang.Class>(obj);
347347
}
348348
else throw new InvalidCastException($"Key \"{key}\" returns a value {(result ?? "null")} cannot be converted in Class");
349349
}

0 commit comments

Comments
 (0)