From 5aa0c0e6ea3daaa03161e78af90c43ddb44a0f89 Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sat, 30 Apr 2022 17:26:42 +0300 Subject: [PATCH 01/10] adds compiled proto java files for network storage --- src/main/java/network/p2p/proto/GetReply.java | 625 +++++++++++++ .../network/p2p/proto/GetReplyOrBuilder.java | 27 + .../java/network/p2p/proto/GetRequest.java | 487 ++++++++++ .../p2p/proto/GetRequestOrBuilder.java | 15 + .../java/network/p2p/proto/PutMessage.java | 831 ++++++++++++++++++ .../p2p/proto/PutMessageOrBuilder.java | 45 + .../java/network/p2p/proto/StorageGrpc.java | 318 +++++++ .../network/p2p/proto/StorageOuterClass.java | 79 ++ 8 files changed, 2427 insertions(+) create mode 100644 src/main/java/network/p2p/proto/GetReply.java create mode 100644 src/main/java/network/p2p/proto/GetReplyOrBuilder.java create mode 100644 src/main/java/network/p2p/proto/GetRequest.java create mode 100644 src/main/java/network/p2p/proto/GetRequestOrBuilder.java create mode 100644 src/main/java/network/p2p/proto/PutMessage.java create mode 100644 src/main/java/network/p2p/proto/PutMessageOrBuilder.java create mode 100644 src/main/java/network/p2p/proto/StorageGrpc.java create mode 100644 src/main/java/network/p2p/proto/StorageOuterClass.java diff --git a/src/main/java/network/p2p/proto/GetReply.java b/src/main/java/network/p2p/proto/GetReply.java new file mode 100644 index 00000000..11e69597 --- /dev/null +++ b/src/main/java/network/p2p/proto/GetReply.java @@ -0,0 +1,625 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +/** + * Protobuf type {@code network.p2p.proto.GetReply} + */ +public final class GetReply extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:network.p2p.proto.GetReply) + GetReplyOrBuilder { +private static final long serialVersionUID = 0L; + // Use GetReply.newBuilder() to construct. + private GetReply(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetReply() { + payload_ = com.google.protobuf.ByteString.EMPTY; + type_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new GetReply(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GetReply( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + + payload_ = input.readBytes(); + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + type_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); + } + + public static final int PAYLOAD_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString payload_; + /** + * bytes Payload = 1; + * @return The payload. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + + public static final int TYPE_FIELD_NUMBER = 2; + private volatile java.lang.Object type_; + /** + * string Type = 2; + * @return The type. + */ + @java.lang.Override + public java.lang.String getType() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + type_ = s; + return s; + } + } + /** + * string Type = 2; + * @return The bytes for type. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTypeBytes() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + type_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!payload_.isEmpty()) { + output.writeBytes(1, payload_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, type_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!payload_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, payload_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, type_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof network.p2p.proto.GetReply)) { + return super.equals(obj); + } + network.p2p.proto.GetReply other = (network.p2p.proto.GetReply) obj; + + if (!getPayload() + .equals(other.getPayload())) return false; + if (!getType() + .equals(other.getType())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PAYLOAD_FIELD_NUMBER; + hash = (53 * hash) + getPayload().hashCode(); + hash = (37 * hash) + TYPE_FIELD_NUMBER; + hash = (53 * hash) + getType().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static network.p2p.proto.GetReply parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetReply parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetReply parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetReply parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetReply parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.GetReply parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.GetReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static network.p2p.proto.GetReply parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.GetReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.GetReply parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(network.p2p.proto.GetReply prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code network.p2p.proto.GetReply} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetReply) + network.p2p.proto.GetReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); + } + + // Construct using network.p2p.proto.GetReply.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + payload_ = com.google.protobuf.ByteString.EMPTY; + + type_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + } + + @java.lang.Override + public network.p2p.proto.GetReply getDefaultInstanceForType() { + return network.p2p.proto.GetReply.getDefaultInstance(); + } + + @java.lang.Override + public network.p2p.proto.GetReply build() { + network.p2p.proto.GetReply result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public network.p2p.proto.GetReply buildPartial() { + network.p2p.proto.GetReply result = new network.p2p.proto.GetReply(this); + result.payload_ = payload_; + result.type_ = type_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof network.p2p.proto.GetReply) { + return mergeFrom((network.p2p.proto.GetReply)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(network.p2p.proto.GetReply other) { + if (other == network.p2p.proto.GetReply.getDefaultInstance()) return this; + if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) { + setPayload(other.getPayload()); + } + if (!other.getType().isEmpty()) { + type_ = other.type_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + network.p2p.proto.GetReply parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (network.p2p.proto.GetReply) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes Payload = 1; + * @return The payload. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + /** + * bytes Payload = 1; + * @param value The payload to set. + * @return This builder for chaining. + */ + public Builder setPayload(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + payload_ = value; + onChanged(); + return this; + } + /** + * bytes Payload = 1; + * @return This builder for chaining. + */ + public Builder clearPayload() { + + payload_ = getDefaultInstance().getPayload(); + onChanged(); + return this; + } + + private java.lang.Object type_ = ""; + /** + * string Type = 2; + * @return The type. + */ + public java.lang.String getType() { + java.lang.Object ref = type_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + type_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string Type = 2; + * @return The bytes for type. + */ + public com.google.protobuf.ByteString + getTypeBytes() { + java.lang.Object ref = type_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + type_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string Type = 2; + * @param value The type to set. + * @return This builder for chaining. + */ + public Builder setType( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + type_ = value; + onChanged(); + return this; + } + /** + * string Type = 2; + * @return This builder for chaining. + */ + public Builder clearType() { + + type_ = getDefaultInstance().getType(); + onChanged(); + return this; + } + /** + * string Type = 2; + * @param value The bytes for type to set. + * @return This builder for chaining. + */ + public Builder setTypeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + type_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:network.p2p.proto.GetReply) + } + + // @@protoc_insertion_point(class_scope:network.p2p.proto.GetReply) + private static final network.p2p.proto.GetReply DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new network.p2p.proto.GetReply(); + } + + public static network.p2p.proto.GetReply getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetReply(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public network.p2p.proto.GetReply getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/src/main/java/network/p2p/proto/GetReplyOrBuilder.java b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java new file mode 100644 index 00000000..0b3bfbb1 --- /dev/null +++ b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java @@ -0,0 +1,27 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +public interface GetReplyOrBuilder extends + // @@protoc_insertion_point(interface_extends:network.p2p.proto.GetReply) + com.google.protobuf.MessageOrBuilder { + + /** + * bytes Payload = 1; + * @return The payload. + */ + com.google.protobuf.ByteString getPayload(); + + /** + * string Type = 2; + * @return The type. + */ + java.lang.String getType(); + /** + * string Type = 2; + * @return The bytes for type. + */ + com.google.protobuf.ByteString + getTypeBytes(); +} diff --git a/src/main/java/network/p2p/proto/GetRequest.java b/src/main/java/network/p2p/proto/GetRequest.java new file mode 100644 index 00000000..a526d4e0 --- /dev/null +++ b/src/main/java/network/p2p/proto/GetRequest.java @@ -0,0 +1,487 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +/** + * Protobuf type {@code network.p2p.proto.GetRequest} + */ +public final class GetRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:network.p2p.proto.GetRequest) + GetRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use GetRequest.newBuilder() to construct. + private GetRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetRequest() { + identifier_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new GetRequest(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GetRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + + identifier_ = input.readBytes(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); + } + + public static final int IDENTIFIER_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString identifier_; + /** + * bytes Identifier = 1; + * @return The identifier. + */ + @java.lang.Override + public com.google.protobuf.ByteString getIdentifier() { + return identifier_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!identifier_.isEmpty()) { + output.writeBytes(1, identifier_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!identifier_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, identifier_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof network.p2p.proto.GetRequest)) { + return super.equals(obj); + } + network.p2p.proto.GetRequest other = (network.p2p.proto.GetRequest) obj; + + if (!getIdentifier() + .equals(other.getIdentifier())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + IDENTIFIER_FIELD_NUMBER; + hash = (53 * hash) + getIdentifier().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static network.p2p.proto.GetRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.GetRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.GetRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.GetRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.GetRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static network.p2p.proto.GetRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.GetRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.GetRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(network.p2p.proto.GetRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code network.p2p.proto.GetRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetRequest) + network.p2p.proto.GetRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); + } + + // Construct using network.p2p.proto.GetRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + identifier_ = com.google.protobuf.ByteString.EMPTY; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + } + + @java.lang.Override + public network.p2p.proto.GetRequest getDefaultInstanceForType() { + return network.p2p.proto.GetRequest.getDefaultInstance(); + } + + @java.lang.Override + public network.p2p.proto.GetRequest build() { + network.p2p.proto.GetRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public network.p2p.proto.GetRequest buildPartial() { + network.p2p.proto.GetRequest result = new network.p2p.proto.GetRequest(this); + result.identifier_ = identifier_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof network.p2p.proto.GetRequest) { + return mergeFrom((network.p2p.proto.GetRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(network.p2p.proto.GetRequest other) { + if (other == network.p2p.proto.GetRequest.getDefaultInstance()) return this; + if (other.getIdentifier() != com.google.protobuf.ByteString.EMPTY) { + setIdentifier(other.getIdentifier()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + network.p2p.proto.GetRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (network.p2p.proto.GetRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.protobuf.ByteString identifier_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes Identifier = 1; + * @return The identifier. + */ + @java.lang.Override + public com.google.protobuf.ByteString getIdentifier() { + return identifier_; + } + /** + * bytes Identifier = 1; + * @param value The identifier to set. + * @return This builder for chaining. + */ + public Builder setIdentifier(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + identifier_ = value; + onChanged(); + return this; + } + /** + * bytes Identifier = 1; + * @return This builder for chaining. + */ + public Builder clearIdentifier() { + + identifier_ = getDefaultInstance().getIdentifier(); + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:network.p2p.proto.GetRequest) + } + + // @@protoc_insertion_point(class_scope:network.p2p.proto.GetRequest) + private static final network.p2p.proto.GetRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new network.p2p.proto.GetRequest(); + } + + public static network.p2p.proto.GetRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public network.p2p.proto.GetRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/src/main/java/network/p2p/proto/GetRequestOrBuilder.java b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java new file mode 100644 index 00000000..b8478063 --- /dev/null +++ b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java @@ -0,0 +1,15 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +public interface GetRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:network.p2p.proto.GetRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * bytes Identifier = 1; + * @return The identifier. + */ + com.google.protobuf.ByteString getIdentifier(); +} diff --git a/src/main/java/network/p2p/proto/PutMessage.java b/src/main/java/network/p2p/proto/PutMessage.java new file mode 100644 index 00000000..0e58a792 --- /dev/null +++ b/src/main/java/network/p2p/proto/PutMessage.java @@ -0,0 +1,831 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +/** + * Protobuf type {@code network.p2p.proto.PutMessage} + */ +public final class PutMessage extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:network.p2p.proto.PutMessage) + PutMessageOrBuilder { +private static final long serialVersionUID = 0L; + // Use PutMessage.newBuilder() to construct. + private PutMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PutMessage() { + originId_ = com.google.protobuf.ByteString.EMPTY; + channel_ = ""; + payload_ = com.google.protobuf.ByteString.EMPTY; + type_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PutMessage(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PutMessage( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + + originId_ = input.readBytes(); + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + channel_ = s; + break; + } + case 26: { + + payload_ = input.readBytes(); + break; + } + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + type_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); + } + + public static final int ORIGINID_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString originId_; + /** + * bytes OriginId = 1; + * @return The originId. + */ + @java.lang.Override + public com.google.protobuf.ByteString getOriginId() { + return originId_; + } + + public static final int CHANNEL_FIELD_NUMBER = 2; + private volatile java.lang.Object channel_; + /** + * string Channel = 2; + * @return The channel. + */ + @java.lang.Override + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + channel_ = s; + return s; + } + } + /** + * string Channel = 2; + * @return The bytes for channel. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getChannelBytes() { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + channel_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PAYLOAD_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString payload_; + /** + * bytes Payload = 3; + * @return The payload. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + + public static final int TYPE_FIELD_NUMBER = 4; + private volatile java.lang.Object type_; + /** + * string Type = 4; + * @return The type. + */ + @java.lang.Override + public java.lang.String getType() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + type_ = s; + return s; + } + } + /** + * string Type = 4; + * @return The bytes for type. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTypeBytes() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + type_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!originId_.isEmpty()) { + output.writeBytes(1, originId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(channel_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, channel_); + } + if (!payload_.isEmpty()) { + output.writeBytes(3, payload_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, type_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!originId_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, originId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(channel_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, channel_); + } + if (!payload_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, payload_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(type_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, type_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof network.p2p.proto.PutMessage)) { + return super.equals(obj); + } + network.p2p.proto.PutMessage other = (network.p2p.proto.PutMessage) obj; + + if (!getOriginId() + .equals(other.getOriginId())) return false; + if (!getChannel() + .equals(other.getChannel())) return false; + if (!getPayload() + .equals(other.getPayload())) return false; + if (!getType() + .equals(other.getType())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ORIGINID_FIELD_NUMBER; + hash = (53 * hash) + getOriginId().hashCode(); + hash = (37 * hash) + CHANNEL_FIELD_NUMBER; + hash = (53 * hash) + getChannel().hashCode(); + hash = (37 * hash) + PAYLOAD_FIELD_NUMBER; + hash = (53 * hash) + getPayload().hashCode(); + hash = (37 * hash) + TYPE_FIELD_NUMBER; + hash = (53 * hash) + getType().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static network.p2p.proto.PutMessage parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.PutMessage parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.PutMessage parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.PutMessage parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.PutMessage parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static network.p2p.proto.PutMessage parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static network.p2p.proto.PutMessage parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.PutMessage parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.PutMessage parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static network.p2p.proto.PutMessage parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static network.p2p.proto.PutMessage parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static network.p2p.proto.PutMessage parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(network.p2p.proto.PutMessage prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code network.p2p.proto.PutMessage} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:network.p2p.proto.PutMessage) + network.p2p.proto.PutMessageOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + .ensureFieldAccessorsInitialized( + network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); + } + + // Construct using network.p2p.proto.PutMessage.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + originId_ = com.google.protobuf.ByteString.EMPTY; + + channel_ = ""; + + payload_ = com.google.protobuf.ByteString.EMPTY; + + type_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + } + + @java.lang.Override + public network.p2p.proto.PutMessage getDefaultInstanceForType() { + return network.p2p.proto.PutMessage.getDefaultInstance(); + } + + @java.lang.Override + public network.p2p.proto.PutMessage build() { + network.p2p.proto.PutMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public network.p2p.proto.PutMessage buildPartial() { + network.p2p.proto.PutMessage result = new network.p2p.proto.PutMessage(this); + result.originId_ = originId_; + result.channel_ = channel_; + result.payload_ = payload_; + result.type_ = type_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof network.p2p.proto.PutMessage) { + return mergeFrom((network.p2p.proto.PutMessage)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(network.p2p.proto.PutMessage other) { + if (other == network.p2p.proto.PutMessage.getDefaultInstance()) return this; + if (other.getOriginId() != com.google.protobuf.ByteString.EMPTY) { + setOriginId(other.getOriginId()); + } + if (!other.getChannel().isEmpty()) { + channel_ = other.channel_; + onChanged(); + } + if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) { + setPayload(other.getPayload()); + } + if (!other.getType().isEmpty()) { + type_ = other.type_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + network.p2p.proto.PutMessage parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (network.p2p.proto.PutMessage) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private com.google.protobuf.ByteString originId_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes OriginId = 1; + * @return The originId. + */ + @java.lang.Override + public com.google.protobuf.ByteString getOriginId() { + return originId_; + } + /** + * bytes OriginId = 1; + * @param value The originId to set. + * @return This builder for chaining. + */ + public Builder setOriginId(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + originId_ = value; + onChanged(); + return this; + } + /** + * bytes OriginId = 1; + * @return This builder for chaining. + */ + public Builder clearOriginId() { + + originId_ = getDefaultInstance().getOriginId(); + onChanged(); + return this; + } + + private java.lang.Object channel_ = ""; + /** + * string Channel = 2; + * @return The channel. + */ + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + channel_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string Channel = 2; + * @return The bytes for channel. + */ + public com.google.protobuf.ByteString + getChannelBytes() { + java.lang.Object ref = channel_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + channel_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string Channel = 2; + * @param value The channel to set. + * @return This builder for chaining. + */ + public Builder setChannel( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + channel_ = value; + onChanged(); + return this; + } + /** + * string Channel = 2; + * @return This builder for chaining. + */ + public Builder clearChannel() { + + channel_ = getDefaultInstance().getChannel(); + onChanged(); + return this; + } + /** + * string Channel = 2; + * @param value The bytes for channel to set. + * @return This builder for chaining. + */ + public Builder setChannelBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + channel_ = value; + onChanged(); + return this; + } + + private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes Payload = 3; + * @return The payload. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPayload() { + return payload_; + } + /** + * bytes Payload = 3; + * @param value The payload to set. + * @return This builder for chaining. + */ + public Builder setPayload(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + payload_ = value; + onChanged(); + return this; + } + /** + * bytes Payload = 3; + * @return This builder for chaining. + */ + public Builder clearPayload() { + + payload_ = getDefaultInstance().getPayload(); + onChanged(); + return this; + } + + private java.lang.Object type_ = ""; + /** + * string Type = 4; + * @return The type. + */ + public java.lang.String getType() { + java.lang.Object ref = type_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + type_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string Type = 4; + * @return The bytes for type. + */ + public com.google.protobuf.ByteString + getTypeBytes() { + java.lang.Object ref = type_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + type_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string Type = 4; + * @param value The type to set. + * @return This builder for chaining. + */ + public Builder setType( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + type_ = value; + onChanged(); + return this; + } + /** + * string Type = 4; + * @return This builder for chaining. + */ + public Builder clearType() { + + type_ = getDefaultInstance().getType(); + onChanged(); + return this; + } + /** + * string Type = 4; + * @param value The bytes for type to set. + * @return This builder for chaining. + */ + public Builder setTypeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + type_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:network.p2p.proto.PutMessage) + } + + // @@protoc_insertion_point(class_scope:network.p2p.proto.PutMessage) + private static final network.p2p.proto.PutMessage DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new network.p2p.proto.PutMessage(); + } + + public static network.p2p.proto.PutMessage getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PutMessage parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PutMessage(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public network.p2p.proto.PutMessage getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/src/main/java/network/p2p/proto/PutMessageOrBuilder.java b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java new file mode 100644 index 00000000..df63fd3f --- /dev/null +++ b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java @@ -0,0 +1,45 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +public interface PutMessageOrBuilder extends + // @@protoc_insertion_point(interface_extends:network.p2p.proto.PutMessage) + com.google.protobuf.MessageOrBuilder { + + /** + * bytes OriginId = 1; + * @return The originId. + */ + com.google.protobuf.ByteString getOriginId(); + + /** + * string Channel = 2; + * @return The channel. + */ + java.lang.String getChannel(); + /** + * string Channel = 2; + * @return The bytes for channel. + */ + com.google.protobuf.ByteString + getChannelBytes(); + + /** + * bytes Payload = 3; + * @return The payload. + */ + com.google.protobuf.ByteString getPayload(); + + /** + * string Type = 4; + * @return The type. + */ + java.lang.String getType(); + /** + * string Type = 4; + * @return The bytes for type. + */ + com.google.protobuf.ByteString + getTypeBytes(); +} diff --git a/src/main/java/network/p2p/proto/StorageGrpc.java b/src/main/java/network/p2p/proto/StorageGrpc.java new file mode 100644 index 00000000..1a746397 --- /dev/null +++ b/src/main/java/network/p2p/proto/StorageGrpc.java @@ -0,0 +1,318 @@ +package network.p2p.proto; + +import static io.grpc.MethodDescriptor.generateFullMethodName; + +/** + */ +@javax.annotation.Generated( + value = "by gRPC proto compiler (version 1.45.1)", + comments = "Source: storage.proto") +@io.grpc.stub.annotations.GrpcGenerated +public final class StorageGrpc { + + private StorageGrpc() {} + + public static final String SERVICE_NAME = "network.p2p.proto.Storage"; + + // Static method descriptors that strictly reflect the proto. + private static volatile io.grpc.MethodDescriptor getPutMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Put", + requestType = PutMessage.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) + public static io.grpc.MethodDescriptor getPutMethod() { + io.grpc.MethodDescriptor getPutMethod; + if ((getPutMethod = StorageGrpc.getPutMethod) == null) { + synchronized (StorageGrpc.class) { + if ((getPutMethod = StorageGrpc.getPutMethod) == null) { + StorageGrpc.getPutMethod = getPutMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Put")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + PutMessage.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + com.google.protobuf.Empty.getDefaultInstance())) + .setSchemaDescriptor(new StorageMethodDescriptorSupplier("Put")) + .build(); + } + } + } + return getPutMethod; + } + + private static volatile io.grpc.MethodDescriptor getGetMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Get", + requestType = GetRequest.class, + responseType = GetReply.class, + methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) + public static io.grpc.MethodDescriptor getGetMethod() { + io.grpc.MethodDescriptor getGetMethod; + if ((getGetMethod = StorageGrpc.getGetMethod) == null) { + synchronized (StorageGrpc.class) { + if ((getGetMethod = StorageGrpc.getGetMethod) == null) { + StorageGrpc.getGetMethod = getGetMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Get")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + GetRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + GetReply.getDefaultInstance())) + .setSchemaDescriptor(new StorageMethodDescriptorSupplier("Get")) + .build(); + } + } + } + return getGetMethod; + } + + /** + * Creates a new async stub that supports all call types for the service + */ + public static StorageStub newStub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @Override + public StorageStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageStub(channel, callOptions); + } + }; + return StorageStub.newStub(factory, channel); + } + + /** + * Creates a new blocking-style stub that supports unary and streaming output calls on the service + */ + public static StorageBlockingStub newBlockingStub( + io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @Override + public StorageBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageBlockingStub(channel, callOptions); + } + }; + return StorageBlockingStub.newStub(factory, channel); + } + + /** + * Creates a new ListenableFuture-style stub that supports unary calls on the service + */ + public static StorageFutureStub newFutureStub( + io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @Override + public StorageFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageFutureStub(channel, callOptions); + } + }; + return StorageFutureStub.newStub(factory, channel); + } + + /** + */ + public static abstract class StorageImplBase implements io.grpc.BindableService { + + /** + */ + public io.grpc.stub.StreamObserver put( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getPutMethod(), responseObserver); + } + + /** + */ + public io.grpc.stub.StreamObserver get( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getGetMethod(), responseObserver); + } + + @Override public final io.grpc.ServerServiceDefinition bindService() { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getPutMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + PutMessage, + com.google.protobuf.Empty>( + this, METHODID_PUT))) + .addMethod( + getGetMethod(), + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( + new MethodHandlers< + GetRequest, + GetReply>( + this, METHODID_GET))) + .build(); + } + } + + /** + */ + public static final class StorageStub extends io.grpc.stub.AbstractAsyncStub { + private StorageStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @Override + protected StorageStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageStub(channel, callOptions); + } + + /** + */ + public io.grpc.stub.StreamObserver put( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ClientCalls.asyncClientStreamingCall( + getChannel().newCall(getPutMethod(), getCallOptions()), responseObserver); + } + + /** + */ + public io.grpc.stub.StreamObserver get( + io.grpc.stub.StreamObserver responseObserver) { + return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( + getChannel().newCall(getGetMethod(), getCallOptions()), responseObserver); + } + } + + /** + */ + public static final class StorageBlockingStub extends io.grpc.stub.AbstractBlockingStub { + private StorageBlockingStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @Override + protected StorageBlockingStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageBlockingStub(channel, callOptions); + } + } + + /** + */ + public static final class StorageFutureStub extends io.grpc.stub.AbstractFutureStub { + private StorageFutureStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @Override + protected StorageFutureStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new StorageFutureStub(channel, callOptions); + } + } + + private static final int METHODID_PUT = 0; + private static final int METHODID_GET = 1; + + private static final class MethodHandlers implements + io.grpc.stub.ServerCalls.UnaryMethod, + io.grpc.stub.ServerCalls.ServerStreamingMethod, + io.grpc.stub.ServerCalls.ClientStreamingMethod, + io.grpc.stub.ServerCalls.BidiStreamingMethod { + private final StorageImplBase serviceImpl; + private final int methodId; + + MethodHandlers(StorageImplBase serviceImpl, int methodId) { + this.serviceImpl = serviceImpl; + this.methodId = methodId; + } + + @Override + @SuppressWarnings("unchecked") + public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + default: + throw new AssertionError(); + } + } + + @Override + @SuppressWarnings("unchecked") + public io.grpc.stub.StreamObserver invoke( + io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + case METHODID_PUT: + return (io.grpc.stub.StreamObserver) serviceImpl.put( + (io.grpc.stub.StreamObserver) responseObserver); + case METHODID_GET: + return (io.grpc.stub.StreamObserver) serviceImpl.get( + (io.grpc.stub.StreamObserver) responseObserver); + default: + throw new AssertionError(); + } + } + } + + private static abstract class StorageBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { + StorageBaseDescriptorSupplier() {} + + @Override + public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { + return StorageOuterClass.getDescriptor(); + } + + @Override + public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() { + return getFileDescriptor().findServiceByName("Storage"); + } + } + + private static final class StorageFileDescriptorSupplier + extends StorageBaseDescriptorSupplier { + StorageFileDescriptorSupplier() {} + } + + private static final class StorageMethodDescriptorSupplier + extends StorageBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoMethodDescriptorSupplier { + private final String methodName; + + StorageMethodDescriptorSupplier(String methodName) { + this.methodName = methodName; + } + + @Override + public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() { + return getServiceDescriptor().findMethodByName(methodName); + } + } + + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; + + public static io.grpc.ServiceDescriptor getServiceDescriptor() { + io.grpc.ServiceDescriptor result = serviceDescriptor; + if (result == null) { + synchronized (StorageGrpc.class) { + result = serviceDescriptor; + if (result == null) { + serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) + .setSchemaDescriptor(new StorageFileDescriptorSupplier()) + .addMethod(getPutMethod()) + .addMethod(getGetMethod()) + .build(); + } + } + } + return result; + } +} diff --git a/src/main/java/network/p2p/proto/StorageOuterClass.java b/src/main/java/network/p2p/proto/StorageOuterClass.java new file mode 100644 index 00000000..3e58c075 --- /dev/null +++ b/src/main/java/network/p2p/proto/StorageOuterClass.java @@ -0,0 +1,79 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: storage.proto + +package network.p2p.proto; + +public final class StorageOuterClass { + private StorageOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_network_p2p_proto_PutMessage_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_network_p2p_proto_PutMessage_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_network_p2p_proto_GetRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_network_p2p_proto_GetRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_network_p2p_proto_GetReply_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_network_p2p_proto_GetReply_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\rstorage.proto\022\021network.p2p.proto\032\033goog" + + "le/protobuf/empty.proto\"N\n\nPutMessage\022\020\n" + + "\010OriginId\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\022\017\n\007Payl" + + "oad\030\003 \001(\014\022\014\n\004Type\030\004 \001(\t\" \n\nGetRequest\022\022\n" + + "\nIdentifier\030\001 \001(\014\")\n\010GetReply\022\017\n\007Payload" + + "\030\001 \001(\014\022\014\n\004Type\030\002 \001(\t2\224\001\n\007Storage\022@\n\003Put\022" + + "\035.network.p2p.proto.PutMessage\032\026.google." + + "protobuf.Empty\"\000(\001\022G\n\003Get\022\035.network.p2p." + + "proto.GetRequest\032\033.network.p2p.proto.Get" + + "Reply\"\000(\0010\001B\002P\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.protobuf.EmptyProto.getDescriptor(), + }); + internal_static_network_p2p_proto_PutMessage_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_network_p2p_proto_PutMessage_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_network_p2p_proto_PutMessage_descriptor, + new java.lang.String[] { "OriginId", "Channel", "Payload", "Type", }); + internal_static_network_p2p_proto_GetRequest_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_network_p2p_proto_GetRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_network_p2p_proto_GetRequest_descriptor, + new java.lang.String[] { "Identifier", }); + internal_static_network_p2p_proto_GetReply_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_network_p2p_proto_GetReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_network_p2p_proto_GetReply_descriptor, + new java.lang.String[] { "Payload", "Type", }); + com.google.protobuf.EmptyProto.getDescriptor(); + } + + // @@protoc_insertion_point(outer_class_scope) +} From 3f96e07f63eabec8a905f03293d7d2e9190d746a Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sat, 30 Apr 2022 19:52:22 +0300 Subject: [PATCH 02/10] wip --- src/main/java/network/p2p/P2pConduit.java | 14 +++- src/main/java/network/p2p/P2pNetwork.java | 85 ++++++++++++++++++++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/src/main/java/network/p2p/P2pConduit.java b/src/main/java/network/p2p/P2pConduit.java index 6f5fb7a9..ca9e3547 100644 --- a/src/main/java/network/p2p/P2pConduit.java +++ b/src/main/java/network/p2p/P2pConduit.java @@ -47,6 +47,12 @@ public void unicast(Entity e, Identifier target) throws LightChainNetworkingExce @Override public void put(Entity e) throws LightChainDistributedStorageException { + try { + network.putEntity(e); + } catch (IllegalArgumentException ex) { + throw new LightChainDistributedStorageException(); + } + } /** @@ -59,7 +65,13 @@ public void put(Entity e) throws LightChainDistributedStorageException { */ @Override public Entity get(Identifier identifier) throws LightChainDistributedStorageException { - return null; + + try { + return network.getEntity(identifier); + } catch (IllegalArgumentException ex) { + throw new LightChainDistributedStorageException(); + } + } @Override diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index 7e7d5927..24bf7bba 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -1,6 +1,7 @@ package network.p2p; import java.io.IOException; +import java.util.Arrays; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -26,6 +27,8 @@ public class P2pNetwork implements network.Network { */ private ConcurrentMap idToAddressMap; + private ConcurrentMap distributedStorageComponent; + /** * Creates P2P network for lightchain node. * @@ -102,7 +105,7 @@ public String getAddress() { * @throws IllegalArgumentException if target identifier does not correspond to a valid address. */ public void sendUnicast(Entity e, Identifier target, String channel) throws InterruptedException, - IOException, IllegalArgumentException { + IOException, IllegalArgumentException { String targetAddress = this.idToAddressMap.get(target); if (targetAddress == null) { @@ -117,4 +120,84 @@ public void sendUnicast(Entity e, Identifier target, String channel) throws Inte } } + public void putEntity(Entity e) { + + Identifier currentID = e.id(); + Identifier smallestID = (Identifier) idToAddressMap.keySet().toArray()[0]; + Identifier targetID; + + for (Identifier id : idToAddressMap.keySet()) { + + if (currentID.comparedTo(id) == -1 && e.id().comparedTo(id) == 1) { + currentID = id; + } + + if (smallestID.comparedTo(id) == 1) { + smallestID = id; + } + + } + + if (currentID.comparedTo(e.id()) == 0) { + targetID = smallestID; + } else { + targetID = currentID; + } + + String targetAddress = this.idToAddressMap.get(targetID); + if (targetAddress == null) { + throw new IllegalArgumentException("target identifier does not exist: " + targetID.toString()); + } + ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); + try { + MessageClient client = new MessageClient(managedChannel); + client.put(e); + } finally { + managedChannel.shutdownNow(); + } + + } + + public Entity getEntity(Identifier identifier) { + + Entity e = null; + + Identifier currentID = identifier; + Identifier smallestID = (Identifier) idToAddressMap.keySet().toArray()[0]; + Identifier targetID; + + for (Identifier id : idToAddressMap.keySet()) { + + if (currentID.comparedTo(id) == -1 && identifier.comparedTo(id) == 1) { + currentID = id; + } + + if (smallestID.comparedTo(id) == 1) { + smallestID = id; + } + + } + + if (currentID.comparedTo(identifier) == 0) { + targetID = smallestID; + } else { + targetID = currentID; + } + + String targetAddress = this.idToAddressMap.get(targetID); + if (targetAddress == null) { + throw new IllegalArgumentException("target identifier does not exist: " + targetID.toString()); + } + ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); + try { + MessageClient client = new MessageClient(managedChannel); + e = client.get(identifier); + } finally { + managedChannel.shutdownNow(); + } + + return e; + + } + } From df5d6d2a75e19cfabd2943c5cfe9cb36cf20510d Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sun, 1 May 2022 13:11:49 +0300 Subject: [PATCH 03/10] implements P2p storage functionality --- src/main/java/network/p2p/MessageClient.java | 138 ++++++++++++++++++- src/main/java/network/p2p/MessageServer.java | 104 +++++++++++++- src/main/java/network/p2p/P2pConduit.java | 6 +- src/main/java/network/p2p/P2pNetwork.java | 9 +- 4 files changed, 241 insertions(+), 16 deletions(-) diff --git a/src/main/java/network/p2p/MessageClient.java b/src/main/java/network/p2p/MessageClient.java index 14f22360..044e932c 100644 --- a/src/main/java/network/p2p/MessageClient.java +++ b/src/main/java/network/p2p/MessageClient.java @@ -30,18 +30,27 @@ import modules.codec.JsonEncoder; import network.p2p.proto.Message; import network.p2p.proto.MessengerGrpc; +import network.p2p.proto.GetReply; +import network.p2p.proto.GetRequest; +import network.p2p.proto.PutMessage; +import network.p2p.proto.StorageGrpc; /** * Client side of gRPC that is responsible for sending messages from this node. */ public class MessageClient { private final MessengerGrpc.MessengerStub asyncStub; + private final StorageGrpc.StorageStub storageAsyncStub; + /** * Constructor. */ public MessageClient(Channel channel) { + asyncStub = MessengerGrpc.newStub(channel); + storageAsyncStub = StorageGrpc.newStub(channel); + } /** @@ -73,11 +82,11 @@ public void onCompleted() { EncodedEntity encodedEntity = encoder.encode(entity); Message message = Message.newBuilder() - .setChannel(channel) - .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) - .setType(encodedEntity.getType()) - .addTargetIds(ByteString.copyFrom(target.getBytes())) - .build(); + .setChannel(channel) + .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) + .setType(encodedEntity.getType()) + .addTargetIds(ByteString.copyFrom(target.getBytes())) + .build(); requestObserver.onNext(message); if (finishLatch.getCount() == 0) { @@ -100,4 +109,123 @@ public void onCompleted() { System.err.println("deliver can not finish within 1 minutes"); } } + + /** + * Implements logic to asynchronously put entity to the target. + */ + public void put(Entity entity, String channel) throws InterruptedException { + final CountDownLatch finishLatch = new CountDownLatch(1); + StreamObserver responseObserver = new StreamObserver() { + @Override + public void onNext(Empty value) { + + } + + @Override + public void onError(Throwable t) { + System.err.println("put failed: " + Status.fromThrowable(t)); + finishLatch.countDown(); + } + + @Override + public void onCompleted() { + finishLatch.countDown(); + } + }; + + StreamObserver requestObserver = storageAsyncStub.put(responseObserver); + + try { + JsonEncoder encoder = new JsonEncoder(); + + EncodedEntity encodedEntity = encoder.encode(entity); + PutMessage putMessage = PutMessage.newBuilder() + .setChannel(channel) + .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) + .setType(encodedEntity.getType()) + .build(); + requestObserver.onNext(putMessage); + + if (finishLatch.getCount() == 0) { + // RPC completed or errored before we finished sending. + // Sending further requests won't error, but they will just be thrown away. + return; + } + + } catch (RuntimeException e) { + // Cancel RPC + requestObserver.onError(e); + throw e; + } + + // Mark the end of requests + requestObserver.onCompleted(); + + // Receiving happens asynchronously + if (!finishLatch.await(1, TimeUnit.MINUTES)) { + System.err.println("put can not finish within 1 minutes"); + } + } + + public Entity get(Identifier identifier) throws InterruptedException { + + final CountDownLatch finishLatch = new CountDownLatch(1); + final Entity[] entity = {null}; + StreamObserver requestObserver = + storageAsyncStub.get(new StreamObserver() { + + @Override + public void onNext(GetReply response) { + + JsonEncoder encoder = new JsonEncoder(); + EncodedEntity e = new EncodedEntity(response.getPayload().toByteArray(), response.getType()); + try { + // puts the incoming entity onto the distributedStorageComponent + entity[0] = encoder.decode(e); + } catch (ClassNotFoundException ex) { + // TODO: replace with fatal log + System.err.println("could not decode incoming GetReply response"); + ex.printStackTrace(); + System.exit(1); + } + + } + + @Override + public void onError(Throwable t) { + finishLatch.countDown(); + } + + @Override + public void onCompleted() { + finishLatch.countDown(); + } + + }); + + try { + + GetRequest request = GetRequest + .newBuilder() + .setIdentifier(ByteString.copyFrom(identifier.getBytes())) + .build(); + + requestObserver.onNext(request); + + } catch (RuntimeException e) { + // Cancel RPC + requestObserver.onError(e); + throw e; + } + // Mark the end of requests + requestObserver.onCompleted(); + + // Receiving happens asynchronously + finishLatch.await(1, TimeUnit.MINUTES); + + return entity[0]; + + } + + } diff --git a/src/main/java/network/p2p/MessageServer.java b/src/main/java/network/p2p/MessageServer.java index 279a94a2..74db833c 100644 --- a/src/main/java/network/p2p/MessageServer.java +++ b/src/main/java/network/p2p/MessageServer.java @@ -18,17 +18,26 @@ import java.io.IOException; import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; +import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; +import model.Entity; import model.codec.EncodedEntity; +import model.lightchain.Identifier; import modules.codec.JsonEncoder; import network.p2p.proto.Message; import network.p2p.proto.MessengerGrpc; +import network.p2p.proto.GetReply; +import network.p2p.proto.GetRequest; +import network.p2p.proto.PutMessage; +import network.p2p.proto.StorageGrpc; import protocol.Engine; /** @@ -37,6 +46,7 @@ public class MessageServer { private final Server server; private final HashMap engineChannelTable; + public ConcurrentMap distributedStorageComponent; /** * Create a MessageServer using ServerBuilder as a base. @@ -45,10 +55,12 @@ public class MessageServer { */ public MessageServer(int port) { server = ServerBuilder.forPort(port) - .addService(new MessengerImpl()) - .build(); + .addService(new MessengerImpl()) + .addService(new StorageImpl()) + .build(); this.engineChannelTable = new HashMap<>(); + this.distributedStorageComponent = new ConcurrentHashMap<>(); } /** @@ -149,4 +161,92 @@ public void onCompleted() { } } + public class StorageImpl extends StorageGrpc.StorageImplBase { + + @Override + public StreamObserver put(StreamObserver responseObserver) { + return new StreamObserver() { + @Override + @SuppressFBWarnings(value = "DM_EXIT", justification = "meant to fail VM safely upon error") + public void onNext(PutMessage putMessage) { + + JsonEncoder encoder = new JsonEncoder(); + EncodedEntity e = new EncodedEntity(putMessage.getPayload().toByteArray(), putMessage.getType()); + + if (engineChannelTable.containsKey(putMessage.getChannel())) { + try { + + // TODO: replace with info log + System.out.println("Putting Entity"); + System.out.println("ID: " + encoder.decode(e).id()); + System.out.println("Channel: " + putMessage.getChannel()); + System.out.println("Type: " + putMessage.getType()); + + // puts the incoming entity onto the distributedStorageComponent + distributedStorageComponent.put(encoder.decode(e).id(),encoder.decode(e)); + } catch (ClassNotFoundException ex) { + // TODO: replace with fatal log + System.err.println("could not decode incoming put message"); + ex.printStackTrace(); + System.exit(1); + } + } else { + // TODO: replace with error log + System.err.println("no channel found for incoming put message: " + putMessage.getChannel()); + } + } + + @Override + public void onError(Throwable t) { + // TODO: replace with error log + System.err.println("encountered error in deliver: " + t); + } + + @Override + public void onCompleted() { + responseObserver.onNext(com.google.protobuf.Empty.newBuilder().build()); + responseObserver.onCompleted(); + } + }; + } + + @Override + public StreamObserver get(StreamObserver responseObserver){ + return new StreamObserver() { + @Override + public void onNext(GetRequest request) { + + Identifier id = new Identifier(request.getIdentifier().toByteArray()); + JsonEncoder encoder = new JsonEncoder(); + + System.out.println("Getting Entity"); + System.out.println("ID: " + id); + + if (!distributedStorageComponent.containsKey(id)) System.out.println("ENTITY NOT FOUND"); + + EncodedEntity encodedEntity = encoder.encode(distributedStorageComponent.get(id)); + + GetReply reply = GetReply + .newBuilder() + .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) + .setType(encodedEntity.getType()) + .build(); + + responseObserver.onNext(reply); + + } + + @Override + public void onError(Throwable t) { + } + + @Override + public void onCompleted() { + responseObserver.onCompleted(); + } + }; + } + + } + } diff --git a/src/main/java/network/p2p/P2pConduit.java b/src/main/java/network/p2p/P2pConduit.java index ca9e3547..9f117607 100644 --- a/src/main/java/network/p2p/P2pConduit.java +++ b/src/main/java/network/p2p/P2pConduit.java @@ -48,8 +48,8 @@ public void unicast(Entity e, Identifier target) throws LightChainNetworkingExce public void put(Entity e) throws LightChainDistributedStorageException { try { - network.putEntity(e); - } catch (IllegalArgumentException ex) { + network.putEntity(e, this.channel); + } catch (InterruptedException | IllegalArgumentException ex) { throw new LightChainDistributedStorageException(); } @@ -68,7 +68,7 @@ public Entity get(Identifier identifier) throws LightChainDistributedStorageExce try { return network.getEntity(identifier); - } catch (IllegalArgumentException ex) { + } catch (InterruptedException | IllegalArgumentException ex) { throw new LightChainDistributedStorageException(); } diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index 24bf7bba..22f51a8b 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -1,7 +1,6 @@ package network.p2p; import java.io.IOException; -import java.util.Arrays; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -27,8 +26,6 @@ public class P2pNetwork implements network.Network { */ private ConcurrentMap idToAddressMap; - private ConcurrentMap distributedStorageComponent; - /** * Creates P2P network for lightchain node. * @@ -120,7 +117,7 @@ public void sendUnicast(Entity e, Identifier target, String channel) throws Inte } } - public void putEntity(Entity e) { + public void putEntity(Entity e, String channel) throws InterruptedException { Identifier currentID = e.id(); Identifier smallestID = (Identifier) idToAddressMap.keySet().toArray()[0]; @@ -151,14 +148,14 @@ public void putEntity(Entity e) { ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); try { MessageClient client = new MessageClient(managedChannel); - client.put(e); + client.put(e, channel); } finally { managedChannel.shutdownNow(); } } - public Entity getEntity(Identifier identifier) { + public Entity getEntity(Identifier identifier) throws InterruptedException { Entity e = null; From ae0b9923d802ccf7b272003456ec6777ea14d103 Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sun, 1 May 2022 18:11:40 +0300 Subject: [PATCH 04/10] alters the GetRequest Proto definition --- src/main/java/network/p2p/proto/GetReply.java | 206 ++++++------ .../network/p2p/proto/GetReplyOrBuilder.java | 2 +- .../java/network/p2p/proto/GetRequest.java | 302 +++++++++++++----- .../p2p/proto/GetRequestOrBuilder.java | 12 + src/main/java/network/p2p/proto/Message.java | 256 +++++++-------- .../network/p2p/proto/MessageOrBuilder.java | 4 +- .../network/p2p/proto/MessageOuterClass.java | 4 +- .../java/network/p2p/proto/MessengerGrpc.java | 48 +-- .../java/network/p2p/proto/PutMessage.java | 252 +++++++-------- .../p2p/proto/PutMessageOrBuilder.java | 4 +- .../network/p2p/proto/StorageOuterClass.java | 22 +- src/main/proto/storage.proto | 1 + 12 files changed, 632 insertions(+), 481 deletions(-) diff --git a/src/main/java/network/p2p/proto/GetReply.java b/src/main/java/network/p2p/proto/GetReply.java index 11e69597..7f17a18f 100644 --- a/src/main/java/network/p2p/proto/GetReply.java +++ b/src/main/java/network/p2p/proto/GetReply.java @@ -20,14 +20,14 @@ private GetReply() { type_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new GetReply(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -38,7 +38,7 @@ private GetReply( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -56,7 +56,7 @@ private GetReply( break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); type_ = s; break; @@ -82,15 +82,15 @@ private GetReply( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); + GetReply.class, Builder.class); } public static final int PAYLOAD_FIELD_NUMBER = 1; @@ -99,26 +99,26 @@ private GetReply( * bytes Payload = 1; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 2; - private volatile java.lang.Object type_; + private volatile Object type_; /** * string Type = 2; * @return The type. */ - @java.lang.Override - public java.lang.String getType() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getType() { + Object ref = type_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } @@ -127,14 +127,14 @@ public java.lang.String getType() { * string Type = 2; * @return The bytes for type. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { + Object ref = type_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -143,7 +143,7 @@ public java.lang.String getType() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -153,7 +153,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!payload_.isEmpty()) { @@ -165,7 +165,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -183,15 +183,15 @@ public int getSerializedSize() { return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof network.p2p.proto.GetReply)) { + if (!(obj instanceof GetReply)) { return super.equals(obj); } - network.p2p.proto.GetReply other = (network.p2p.proto.GetReply) obj; + GetReply other = (GetReply) obj; if (!getPayload() .equals(other.getPayload())) return false; @@ -201,7 +201,7 @@ public boolean equals(final java.lang.Object obj) { return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -217,69 +217,69 @@ public int hashCode() { return hash; } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetReply parseFrom(byte[] data) + public static GetReply parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetReply parseFrom(java.io.InputStream input) + public static GetReply parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.GetReply parseDelimitedFrom(java.io.InputStream input) + public static GetReply parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static network.p2p.proto.GetReply parseDelimitedFrom( + public static GetReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.GetReply parseFrom( + public static GetReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -287,23 +287,23 @@ public static network.p2p.proto.GetReply parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(network.p2p.proto.GetReply prototype) { + public static Builder newBuilder(GetReply prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -313,18 +313,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetReply) - network.p2p.proto.GetReplyOrBuilder { + GetReplyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); + GetReply.class, Builder.class); } // Construct using network.p2p.proto.GetReply.newBuilder() @@ -333,7 +333,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -342,7 +342,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override + @Override public Builder clear() { super.clear(); payload_ = com.google.protobuf.ByteString.EMPTY; @@ -352,79 +352,79 @@ public Builder clear() { return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @java.lang.Override - public network.p2p.proto.GetReply getDefaultInstanceForType() { - return network.p2p.proto.GetReply.getDefaultInstance(); + @Override + public GetReply getDefaultInstanceForType() { + return GetReply.getDefaultInstance(); } - @java.lang.Override - public network.p2p.proto.GetReply build() { - network.p2p.proto.GetReply result = buildPartial(); + @Override + public GetReply build() { + GetReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public network.p2p.proto.GetReply buildPartial() { - network.p2p.proto.GetReply result = new network.p2p.proto.GetReply(this); + @Override + public GetReply buildPartial() { + GetReply result = new GetReply(this); result.payload_ = payload_; result.type_ = type_; onBuilt(); return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof network.p2p.proto.GetReply) { - return mergeFrom((network.p2p.proto.GetReply)other); + if (other instanceof GetReply) { + return mergeFrom((GetReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(network.p2p.proto.GetReply other) { - if (other == network.p2p.proto.GetReply.getDefaultInstance()) return this; + public Builder mergeFrom(GetReply other) { + if (other == GetReply.getDefaultInstance()) return this; if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) { setPayload(other.getPayload()); } @@ -437,21 +437,21 @@ public Builder mergeFrom(network.p2p.proto.GetReply other) { return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - network.p2p.proto.GetReply parsedMessage = null; + GetReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (network.p2p.proto.GetReply) e.getUnfinishedMessage(); + parsedMessage = (GetReply) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -466,7 +466,7 @@ public Builder mergeFrom( * bytes Payload = 1; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -495,21 +495,21 @@ public Builder clearPayload() { return this; } - private java.lang.Object type_ = ""; + private Object type_ = ""; /** * string Type = 2; * @return The type. */ - public java.lang.String getType() { - java.lang.Object ref = type_; - if (!(ref instanceof java.lang.String)) { + public String getType() { + Object ref = type_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -518,11 +518,11 @@ public java.lang.String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; + Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -535,7 +535,7 @@ public java.lang.String getType() { * @return This builder for chaining. */ public Builder setType( - java.lang.String value) { + String value) { if (value == null) { throw new NullPointerException(); } @@ -570,13 +570,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -587,18 +587,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.GetReply) - private static final network.p2p.proto.GetReply DEFAULT_INSTANCE; + private static final GetReply DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new network.p2p.proto.GetReply(); + DEFAULT_INSTANCE = new GetReply(); } - public static network.p2p.proto.GetReply getDefaultInstance() { + public static GetReply getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public GetReply parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -611,13 +611,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public network.p2p.proto.GetReply getDefaultInstanceForType() { + @Override + public GetReply getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/GetReplyOrBuilder.java b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java index 0b3bfbb1..59cce1cd 100644 --- a/src/main/java/network/p2p/proto/GetReplyOrBuilder.java +++ b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java @@ -17,7 +17,7 @@ public interface GetReplyOrBuilder extends * string Type = 2; * @return The type. */ - java.lang.String getType(); + String getType(); /** * string Type = 2; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/GetRequest.java b/src/main/java/network/p2p/proto/GetRequest.java index a526d4e0..44383dd3 100644 --- a/src/main/java/network/p2p/proto/GetRequest.java +++ b/src/main/java/network/p2p/proto/GetRequest.java @@ -17,16 +17,17 @@ private GetRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private GetRequest() { identifier_ = com.google.protobuf.ByteString.EMPTY; + channel_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new GetRequest(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -37,7 +38,7 @@ private GetRequest( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -54,6 +55,12 @@ private GetRequest( identifier_ = input.readBytes(); break; } + case 18: { + String s = input.readStringRequireUtf8(); + + channel_ = s; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -75,15 +82,15 @@ private GetRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); + GetRequest.class, Builder.class); } public static final int IDENTIFIER_FIELD_NUMBER = 1; @@ -92,13 +99,51 @@ private GetRequest( * bytes Identifier = 1; * @return The identifier. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIdentifier() { return identifier_; } + public static final int CHANNEL_FIELD_NUMBER = 2; + private volatile Object channel_; + /** + * string Channel = 2; + * @return The channel. + */ + @Override + public String getChannel() { + Object ref = channel_; + if (ref instanceof String) { + return (String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + String s = bs.toStringUtf8(); + channel_ = s; + return s; + } + } + /** + * string Channel = 2; + * @return The bytes for channel. + */ + @Override + public com.google.protobuf.ByteString + getChannelBytes() { + Object ref = channel_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (String) ref); + channel_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -108,16 +153,19 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!identifier_.isEmpty()) { output.writeBytes(1, identifier_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(channel_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, channel_); + } unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -127,28 +175,33 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(1, identifier_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(channel_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, channel_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof network.p2p.proto.GetRequest)) { + if (!(obj instanceof GetRequest)) { return super.equals(obj); } - network.p2p.proto.GetRequest other = (network.p2p.proto.GetRequest) obj; + GetRequest other = (GetRequest) obj; if (!getIdentifier() .equals(other.getIdentifier())) return false; + if (!getChannel() + .equals(other.getChannel())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -157,74 +210,76 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + IDENTIFIER_FIELD_NUMBER; hash = (53 * hash) + getIdentifier().hashCode(); + hash = (37 * hash) + CHANNEL_FIELD_NUMBER; + hash = (53 * hash) + getChannel().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetRequest parseFrom(byte[] data) + public static GetRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.GetRequest parseFrom(java.io.InputStream input) + public static GetRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.GetRequest parseDelimitedFrom(java.io.InputStream input) + public static GetRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static network.p2p.proto.GetRequest parseDelimitedFrom( + public static GetRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.GetRequest parseFrom( + public static GetRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -232,23 +287,23 @@ public static network.p2p.proto.GetRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(network.p2p.proto.GetRequest prototype) { + public static Builder newBuilder(GetRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -258,18 +313,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetRequest) - network.p2p.proto.GetRequestOrBuilder { + GetRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); + GetRequest.class, Builder.class); } // Construct using network.p2p.proto.GetRequest.newBuilder() @@ -278,7 +333,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -287,109 +342,116 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override + @Override public Builder clear() { super.clear(); identifier_ = com.google.protobuf.ByteString.EMPTY; + channel_ = ""; + return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @java.lang.Override - public network.p2p.proto.GetRequest getDefaultInstanceForType() { - return network.p2p.proto.GetRequest.getDefaultInstance(); + @Override + public GetRequest getDefaultInstanceForType() { + return GetRequest.getDefaultInstance(); } - @java.lang.Override - public network.p2p.proto.GetRequest build() { - network.p2p.proto.GetRequest result = buildPartial(); + @Override + public GetRequest build() { + GetRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public network.p2p.proto.GetRequest buildPartial() { - network.p2p.proto.GetRequest result = new network.p2p.proto.GetRequest(this); + @Override + public GetRequest buildPartial() { + GetRequest result = new GetRequest(this); result.identifier_ = identifier_; + result.channel_ = channel_; onBuilt(); return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof network.p2p.proto.GetRequest) { - return mergeFrom((network.p2p.proto.GetRequest)other); + if (other instanceof GetRequest) { + return mergeFrom((GetRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(network.p2p.proto.GetRequest other) { - if (other == network.p2p.proto.GetRequest.getDefaultInstance()) return this; + public Builder mergeFrom(GetRequest other) { + if (other == GetRequest.getDefaultInstance()) return this; if (other.getIdentifier() != com.google.protobuf.ByteString.EMPTY) { setIdentifier(other.getIdentifier()); } + if (!other.getChannel().isEmpty()) { + channel_ = other.channel_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - network.p2p.proto.GetRequest parsedMessage = null; + GetRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (network.p2p.proto.GetRequest) e.getUnfinishedMessage(); + parsedMessage = (GetRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -404,7 +466,7 @@ public Builder mergeFrom( * bytes Identifier = 1; * @return The identifier. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIdentifier() { return identifier_; } @@ -432,13 +494,89 @@ public Builder clearIdentifier() { onChanged(); return this; } - @java.lang.Override + + private Object channel_ = ""; + /** + * string Channel = 2; + * @return The channel. + */ + public String getChannel() { + Object ref = channel_; + if (!(ref instanceof String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + String s = bs.toStringUtf8(); + channel_ = s; + return s; + } else { + return (String) ref; + } + } + /** + * string Channel = 2; + * @return The bytes for channel. + */ + public com.google.protobuf.ByteString + getChannelBytes() { + Object ref = channel_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (String) ref); + channel_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string Channel = 2; + * @param value The channel to set. + * @return This builder for chaining. + */ + public Builder setChannel( + String value) { + if (value == null) { + throw new NullPointerException(); + } + + channel_ = value; + onChanged(); + return this; + } + /** + * string Channel = 2; + * @return This builder for chaining. + */ + public Builder clearChannel() { + + channel_ = getDefaultInstance().getChannel(); + onChanged(); + return this; + } + /** + * string Channel = 2; + * @param value The bytes for channel to set. + * @return This builder for chaining. + */ + public Builder setChannelBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + channel_ = value; + onChanged(); + return this; + } + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -449,18 +587,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.GetRequest) - private static final network.p2p.proto.GetRequest DEFAULT_INSTANCE; + private static final GetRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new network.p2p.proto.GetRequest(); + DEFAULT_INSTANCE = new GetRequest(); } - public static network.p2p.proto.GetRequest getDefaultInstance() { + public static GetRequest getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public GetRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -473,13 +611,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public network.p2p.proto.GetRequest getDefaultInstanceForType() { + @Override + public GetRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/GetRequestOrBuilder.java b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java index b8478063..58cbf84a 100644 --- a/src/main/java/network/p2p/proto/GetRequestOrBuilder.java +++ b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java @@ -12,4 +12,16 @@ public interface GetRequestOrBuilder extends * @return The identifier. */ com.google.protobuf.ByteString getIdentifier(); + + /** + * string Channel = 2; + * @return The channel. + */ + String getChannel(); + /** + * string Channel = 2; + * @return The bytes for channel. + */ + com.google.protobuf.ByteString + getChannelBytes(); } diff --git a/src/main/java/network/p2p/proto/Message.java b/src/main/java/network/p2p/proto/Message.java index 353b1f54..766b3a2b 100644 --- a/src/main/java/network/p2p/proto/Message.java +++ b/src/main/java/network/p2p/proto/Message.java @@ -23,14 +23,14 @@ private Message() { type_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Message(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -41,7 +41,7 @@ private Message( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = @@ -60,7 +60,7 @@ private Message( break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); channel_ = s; break; @@ -79,7 +79,7 @@ private Message( break; } case 42: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); type_ = s; break; @@ -108,15 +108,15 @@ private Message( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable + return MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.Message.class, network.p2p.proto.Message.Builder.class); + Message.class, Builder.class); } public static final int ORIGINID_FIELD_NUMBER = 1; @@ -125,26 +125,26 @@ private Message( * bytes OriginId = 1; * @return The originId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getOriginId() { return originId_; } public static final int CHANNEL_FIELD_NUMBER = 2; - private volatile java.lang.Object channel_; + private volatile Object channel_; /** * string Channel = 2; * @return The channel. */ - @java.lang.Override - public java.lang.String getChannel() { - java.lang.Object ref = channel_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getChannel() { + Object ref = channel_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); channel_ = s; return s; } @@ -153,14 +153,14 @@ public java.lang.String getChannel() { * string Channel = 2; * @return The bytes for channel. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChannelBytes() { - java.lang.Object ref = channel_; - if (ref instanceof java.lang.String) { + Object ref = channel_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); channel_ = b; return b; } else { @@ -174,7 +174,7 @@ public java.lang.String getChannel() { * repeated bytes TargetIds = 3; * @return A list containing the targetIds. */ - @java.lang.Override + @Override public java.util.List getTargetIdsList() { return targetIds_; @@ -201,26 +201,26 @@ public com.google.protobuf.ByteString getTargetIds(int index) { * bytes Payload = 4; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 5; - private volatile java.lang.Object type_; + private volatile Object type_; /** * string Type = 5; * @return The type. */ - @java.lang.Override - public java.lang.String getType() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getType() { + Object ref = type_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } @@ -229,14 +229,14 @@ public java.lang.String getType() { * string Type = 5; * @return The bytes for type. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { + Object ref = type_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -245,7 +245,7 @@ public java.lang.String getType() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -255,7 +255,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!originId_.isEmpty()) { @@ -276,7 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -310,15 +310,15 @@ public int getSerializedSize() { return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof network.p2p.proto.Message)) { + if (!(obj instanceof Message)) { return super.equals(obj); } - network.p2p.proto.Message other = (network.p2p.proto.Message) obj; + Message other = (Message) obj; if (!getOriginId() .equals(other.getOriginId())) return false; @@ -334,7 +334,7 @@ public boolean equals(final java.lang.Object obj) { return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -358,69 +358,69 @@ public int hashCode() { return hash; } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.Message parseFrom(byte[] data) + public static Message parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.Message parseFrom(java.io.InputStream input) + public static Message parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.Message parseDelimitedFrom(java.io.InputStream input) + public static Message parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static network.p2p.proto.Message parseDelimitedFrom( + public static Message parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.Message parseFrom( + public static Message parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -428,23 +428,23 @@ public static network.p2p.proto.Message parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(network.p2p.proto.Message prototype) { + public static Builder newBuilder(Message prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -454,18 +454,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.Message) - network.p2p.proto.MessageOrBuilder { + MessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable + return MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.Message.class, network.p2p.proto.Message.Builder.class); + Message.class, Builder.class); } // Construct using network.p2p.proto.Message.newBuilder() @@ -474,7 +474,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -483,7 +483,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override + @Override public Builder clear() { super.clear(); originId_ = com.google.protobuf.ByteString.EMPTY; @@ -499,29 +499,29 @@ public Builder clear() { return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @java.lang.Override - public network.p2p.proto.Message getDefaultInstanceForType() { - return network.p2p.proto.Message.getDefaultInstance(); + @Override + public Message getDefaultInstanceForType() { + return Message.getDefaultInstance(); } - @java.lang.Override - public network.p2p.proto.Message build() { - network.p2p.proto.Message result = buildPartial(); + @Override + public Message build() { + Message result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public network.p2p.proto.Message buildPartial() { - network.p2p.proto.Message result = new network.p2p.proto.Message(this); + @Override + public Message buildPartial() { + Message result = new Message(this); int from_bitField0_ = bitField0_; result.originId_ = originId_; result.channel_ = channel_; @@ -536,50 +536,50 @@ public network.p2p.proto.Message buildPartial() { return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof network.p2p.proto.Message) { - return mergeFrom((network.p2p.proto.Message)other); + if (other instanceof Message) { + return mergeFrom((Message)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(network.p2p.proto.Message other) { - if (other == network.p2p.proto.Message.getDefaultInstance()) return this; + public Builder mergeFrom(Message other) { + if (other == Message.getDefaultInstance()) return this; if (other.getOriginId() != com.google.protobuf.ByteString.EMPTY) { setOriginId(other.getOriginId()); } @@ -609,21 +609,21 @@ public Builder mergeFrom(network.p2p.proto.Message other) { return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - network.p2p.proto.Message parsedMessage = null; + Message parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (network.p2p.proto.Message) e.getUnfinishedMessage(); + parsedMessage = (Message) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -639,7 +639,7 @@ public Builder mergeFrom( * bytes OriginId = 1; * @return The originId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getOriginId() { return originId_; } @@ -668,21 +668,21 @@ public Builder clearOriginId() { return this; } - private java.lang.Object channel_ = ""; + private Object channel_ = ""; /** * string Channel = 2; * @return The channel. */ - public java.lang.String getChannel() { - java.lang.Object ref = channel_; - if (!(ref instanceof java.lang.String)) { + public String getChannel() { + Object ref = channel_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); channel_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -691,11 +691,11 @@ public java.lang.String getChannel() { */ public com.google.protobuf.ByteString getChannelBytes() { - java.lang.Object ref = channel_; + Object ref = channel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); channel_ = b; return b; } else { @@ -708,7 +708,7 @@ public java.lang.String getChannel() { * @return This builder for chaining. */ public Builder setChannel( - java.lang.String value) { + String value) { if (value == null) { throw new NullPointerException(); } @@ -811,7 +811,7 @@ public Builder addTargetIds(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder addAllTargetIds( - java.lang.Iterable values) { + Iterable values) { ensureTargetIdsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, targetIds_); @@ -834,7 +834,7 @@ public Builder clearTargetIds() { * bytes Payload = 4; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -863,21 +863,21 @@ public Builder clearPayload() { return this; } - private java.lang.Object type_ = ""; + private Object type_ = ""; /** * string Type = 5; * @return The type. */ - public java.lang.String getType() { - java.lang.Object ref = type_; - if (!(ref instanceof java.lang.String)) { + public String getType() { + Object ref = type_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -886,11 +886,11 @@ public java.lang.String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; + Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -903,7 +903,7 @@ public java.lang.String getType() { * @return This builder for chaining. */ public Builder setType( - java.lang.String value) { + String value) { if (value == null) { throw new NullPointerException(); } @@ -938,13 +938,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -955,18 +955,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.Message) - private static final network.p2p.proto.Message DEFAULT_INSTANCE; + private static final Message DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new network.p2p.proto.Message(); + DEFAULT_INSTANCE = new Message(); } - public static network.p2p.proto.Message getDefaultInstance() { + public static Message getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Message parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -979,13 +979,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public network.p2p.proto.Message getDefaultInstanceForType() { + @Override + public Message getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/MessageOrBuilder.java b/src/main/java/network/p2p/proto/MessageOrBuilder.java index 3d95ec14..8afbcb14 100644 --- a/src/main/java/network/p2p/proto/MessageOrBuilder.java +++ b/src/main/java/network/p2p/proto/MessageOrBuilder.java @@ -17,7 +17,7 @@ public interface MessageOrBuilder extends * string Channel = 2; * @return The channel. */ - java.lang.String getChannel(); + String getChannel(); /** * string Channel = 2; * @return The bytes for channel. @@ -52,7 +52,7 @@ public interface MessageOrBuilder extends * string Type = 5; * @return The type. */ - java.lang.String getType(); + String getType(); /** * string Type = 5; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/MessageOuterClass.java b/src/main/java/network/p2p/proto/MessageOuterClass.java index 71aab2bd..11283033 100644 --- a/src/main/java/network/p2p/proto/MessageOuterClass.java +++ b/src/main/java/network/p2p/proto/MessageOuterClass.java @@ -27,7 +27,7 @@ public static void registerAllExtensions( private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\rmessage.proto\022\021network.p2p.proto\032\033goog" + "le/protobuf/empty.proto\"^\n\007Message\022\020\n\010Or" + "iginId\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\022\021\n\tTargetI" + @@ -46,7 +46,7 @@ public static void registerAllExtensions( internal_static_network_p2p_proto_Message_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_Message_descriptor, - new java.lang.String[] { "OriginId", "Channel", "TargetIds", "Payload", "Type", }); + new String[] { "OriginId", "Channel", "TargetIds", "Payload", "Type", }); com.google.protobuf.EmptyProto.getDescriptor(); } diff --git a/src/main/java/network/p2p/proto/MessengerGrpc.java b/src/main/java/network/p2p/proto/MessengerGrpc.java index 48623e1d..b9f2d545 100644 --- a/src/main/java/network/p2p/proto/MessengerGrpc.java +++ b/src/main/java/network/p2p/proto/MessengerGrpc.java @@ -15,27 +15,27 @@ private MessengerGrpc() {} public static final String SERVICE_NAME = "network.p2p.proto.Messenger"; // Static method descriptors that strictly reflect the proto. - private static volatile io.grpc.MethodDescriptor getDeliverMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "Deliver", - requestType = network.p2p.proto.Message.class, + requestType = Message.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - public static io.grpc.MethodDescriptor getDeliverMethod() { - io.grpc.MethodDescriptor getDeliverMethod; + io.grpc.MethodDescriptor getDeliverMethod; if ((getDeliverMethod = MessengerGrpc.getDeliverMethod) == null) { synchronized (MessengerGrpc.class) { if ((getDeliverMethod = MessengerGrpc.getDeliverMethod) == null) { MessengerGrpc.getDeliverMethod = getDeliverMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Deliver")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - network.p2p.proto.Message.getDefaultInstance())) + Message.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new MessengerMethodDescriptorSupplier("Deliver")) @@ -52,7 +52,7 @@ com.google.protobuf.Empty> getDeliverMethod() { public static MessengerStub newStub(io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @java.lang.Override + @Override public MessengerStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerStub(channel, callOptions); } @@ -67,7 +67,7 @@ public static MessengerBlockingStub newBlockingStub( io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @java.lang.Override + @Override public MessengerBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerBlockingStub(channel, callOptions); } @@ -82,7 +82,7 @@ public static MessengerFutureStub newFutureStub( io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @java.lang.Override + @Override public MessengerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerFutureStub(channel, callOptions); } @@ -96,18 +96,18 @@ public static abstract class MessengerImplBase implements io.grpc.BindableServic /** */ - public io.grpc.stub.StreamObserver deliver( + public io.grpc.stub.StreamObserver deliver( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeliverMethod(), responseObserver); } - @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { + @Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getDeliverMethod(), io.grpc.stub.ServerCalls.asyncClientStreamingCall( new MethodHandlers< - network.p2p.proto.Message, + Message, com.google.protobuf.Empty>( this, METHODID_DELIVER))) .build(); @@ -122,7 +122,7 @@ private MessengerStub( super(channel, callOptions); } - @java.lang.Override + @Override protected MessengerStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerStub(channel, callOptions); @@ -130,7 +130,7 @@ protected MessengerStub build( /** */ - public io.grpc.stub.StreamObserver deliver( + public io.grpc.stub.StreamObserver deliver( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( getChannel().newCall(getDeliverMethod(), getCallOptions()), responseObserver); @@ -145,7 +145,7 @@ private MessengerBlockingStub( super(channel, callOptions); } - @java.lang.Override + @Override protected MessengerBlockingStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerBlockingStub(channel, callOptions); @@ -160,7 +160,7 @@ private MessengerFutureStub( super(channel, callOptions); } - @java.lang.Override + @Override protected MessengerFutureStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerFutureStub(channel, callOptions); @@ -182,8 +182,8 @@ private static final class MethodHandlers implements this.methodId = methodId; } - @java.lang.Override - @java.lang.SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { default: @@ -191,8 +191,8 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv } } - @java.lang.Override - @java.lang.SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public io.grpc.stub.StreamObserver invoke( io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { @@ -209,12 +209,12 @@ private static abstract class MessengerBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { MessengerBaseDescriptorSupplier() {} - @java.lang.Override + @Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return network.p2p.proto.MessageOuterClass.getDescriptor(); + return MessageOuterClass.getDescriptor(); } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() { return getFileDescriptor().findServiceByName("Messenger"); } @@ -234,7 +234,7 @@ private static final class MessengerMethodDescriptorSupplier this.methodName = methodName; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() { return getServiceDescriptor().findMethodByName(methodName); } diff --git a/src/main/java/network/p2p/proto/PutMessage.java b/src/main/java/network/p2p/proto/PutMessage.java index 0e58a792..84d02e0d 100644 --- a/src/main/java/network/p2p/proto/PutMessage.java +++ b/src/main/java/network/p2p/proto/PutMessage.java @@ -22,14 +22,14 @@ private PutMessage() { type_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new PutMessage(); } - @java.lang.Override + @Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -40,7 +40,7 @@ private PutMessage( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -58,7 +58,7 @@ private PutMessage( break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); channel_ = s; break; @@ -69,7 +69,7 @@ private PutMessage( break; } case 34: { - java.lang.String s = input.readStringRequireUtf8(); + String s = input.readStringRequireUtf8(); type_ = s; break; @@ -95,15 +95,15 @@ private PutMessage( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); + PutMessage.class, Builder.class); } public static final int ORIGINID_FIELD_NUMBER = 1; @@ -112,26 +112,26 @@ private PutMessage( * bytes OriginId = 1; * @return The originId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getOriginId() { return originId_; } public static final int CHANNEL_FIELD_NUMBER = 2; - private volatile java.lang.Object channel_; + private volatile Object channel_; /** * string Channel = 2; * @return The channel. */ - @java.lang.Override - public java.lang.String getChannel() { - java.lang.Object ref = channel_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getChannel() { + Object ref = channel_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); channel_ = s; return s; } @@ -140,14 +140,14 @@ public java.lang.String getChannel() { * string Channel = 2; * @return The bytes for channel. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChannelBytes() { - java.lang.Object ref = channel_; - if (ref instanceof java.lang.String) { + Object ref = channel_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); channel_ = b; return b; } else { @@ -161,26 +161,26 @@ public java.lang.String getChannel() { * bytes Payload = 3; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 4; - private volatile java.lang.Object type_; + private volatile Object type_; /** * string Type = 4; * @return The type. */ - @java.lang.Override - public java.lang.String getType() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getType() { + Object ref = type_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } @@ -189,14 +189,14 @@ public java.lang.String getType() { * string Type = 4; * @return The bytes for type. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; - if (ref instanceof java.lang.String) { + Object ref = type_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -205,7 +205,7 @@ public java.lang.String getType() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -215,7 +215,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!originId_.isEmpty()) { @@ -233,7 +233,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -258,15 +258,15 @@ public int getSerializedSize() { return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof network.p2p.proto.PutMessage)) { + if (!(obj instanceof PutMessage)) { return super.equals(obj); } - network.p2p.proto.PutMessage other = (network.p2p.proto.PutMessage) obj; + PutMessage other = (PutMessage) obj; if (!getOriginId() .equals(other.getOriginId())) return false; @@ -280,7 +280,7 @@ public boolean equals(final java.lang.Object obj) { return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -300,69 +300,69 @@ public int hashCode() { return hash; } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.PutMessage parseFrom(byte[] data) + public static PutMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static network.p2p.proto.PutMessage parseFrom(java.io.InputStream input) + public static PutMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.PutMessage parseDelimitedFrom(java.io.InputStream input) + public static PutMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static network.p2p.proto.PutMessage parseDelimitedFrom( + public static PutMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static network.p2p.proto.PutMessage parseFrom( + public static PutMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -370,23 +370,23 @@ public static network.p2p.proto.PutMessage parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(network.p2p.proto.PutMessage prototype) { + public static Builder newBuilder(PutMessage prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -396,18 +396,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.PutMessage) - network.p2p.proto.PutMessageOrBuilder { + PutMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); + PutMessage.class, Builder.class); } // Construct using network.p2p.proto.PutMessage.newBuilder() @@ -416,7 +416,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -425,7 +425,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override + @Override public Builder clear() { super.clear(); originId_ = com.google.protobuf.ByteString.EMPTY; @@ -439,29 +439,29 @@ public Builder clear() { return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @java.lang.Override - public network.p2p.proto.PutMessage getDefaultInstanceForType() { - return network.p2p.proto.PutMessage.getDefaultInstance(); + @Override + public PutMessage getDefaultInstanceForType() { + return PutMessage.getDefaultInstance(); } - @java.lang.Override - public network.p2p.proto.PutMessage build() { - network.p2p.proto.PutMessage result = buildPartial(); + @Override + public PutMessage build() { + PutMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public network.p2p.proto.PutMessage buildPartial() { - network.p2p.proto.PutMessage result = new network.p2p.proto.PutMessage(this); + @Override + public PutMessage buildPartial() { + PutMessage result = new PutMessage(this); result.originId_ = originId_; result.channel_ = channel_; result.payload_ = payload_; @@ -470,50 +470,50 @@ public network.p2p.proto.PutMessage buildPartial() { return result; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof network.p2p.proto.PutMessage) { - return mergeFrom((network.p2p.proto.PutMessage)other); + if (other instanceof PutMessage) { + return mergeFrom((PutMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(network.p2p.proto.PutMessage other) { - if (other == network.p2p.proto.PutMessage.getDefaultInstance()) return this; + public Builder mergeFrom(PutMessage other) { + if (other == PutMessage.getDefaultInstance()) return this; if (other.getOriginId() != com.google.protobuf.ByteString.EMPTY) { setOriginId(other.getOriginId()); } @@ -533,21 +533,21 @@ public Builder mergeFrom(network.p2p.proto.PutMessage other) { return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - network.p2p.proto.PutMessage parsedMessage = null; + PutMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (network.p2p.proto.PutMessage) e.getUnfinishedMessage(); + parsedMessage = (PutMessage) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -562,7 +562,7 @@ public Builder mergeFrom( * bytes OriginId = 1; * @return The originId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getOriginId() { return originId_; } @@ -591,21 +591,21 @@ public Builder clearOriginId() { return this; } - private java.lang.Object channel_ = ""; + private Object channel_ = ""; /** * string Channel = 2; * @return The channel. */ - public java.lang.String getChannel() { - java.lang.Object ref = channel_; - if (!(ref instanceof java.lang.String)) { + public String getChannel() { + Object ref = channel_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); channel_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -614,11 +614,11 @@ public java.lang.String getChannel() { */ public com.google.protobuf.ByteString getChannelBytes() { - java.lang.Object ref = channel_; + Object ref = channel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); channel_ = b; return b; } else { @@ -631,7 +631,7 @@ public java.lang.String getChannel() { * @return This builder for chaining. */ public Builder setChannel( - java.lang.String value) { + String value) { if (value == null) { throw new NullPointerException(); } @@ -672,7 +672,7 @@ public Builder setChannelBytes( * bytes Payload = 3; * @return The payload. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -701,21 +701,21 @@ public Builder clearPayload() { return this; } - private java.lang.Object type_ = ""; + private Object type_ = ""; /** * string Type = 4; * @return The type. */ - public java.lang.String getType() { - java.lang.Object ref = type_; - if (!(ref instanceof java.lang.String)) { + public String getType() { + Object ref = type_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -724,11 +724,11 @@ public java.lang.String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - java.lang.Object ref = type_; + Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); type_ = b; return b; } else { @@ -741,7 +741,7 @@ public java.lang.String getType() { * @return This builder for chaining. */ public Builder setType( - java.lang.String value) { + String value) { if (value == null) { throw new NullPointerException(); } @@ -776,13 +776,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -793,18 +793,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.PutMessage) - private static final network.p2p.proto.PutMessage DEFAULT_INSTANCE; + private static final PutMessage DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new network.p2p.proto.PutMessage(); + DEFAULT_INSTANCE = new PutMessage(); } - public static network.p2p.proto.PutMessage getDefaultInstance() { + public static PutMessage getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public PutMessage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -817,13 +817,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public network.p2p.proto.PutMessage getDefaultInstanceForType() { + @Override + public PutMessage getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/PutMessageOrBuilder.java b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java index df63fd3f..645c6e6d 100644 --- a/src/main/java/network/p2p/proto/PutMessageOrBuilder.java +++ b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java @@ -17,7 +17,7 @@ public interface PutMessageOrBuilder extends * string Channel = 2; * @return The channel. */ - java.lang.String getChannel(); + String getChannel(); /** * string Channel = 2; * @return The bytes for channel. @@ -35,7 +35,7 @@ public interface PutMessageOrBuilder extends * string Type = 4; * @return The type. */ - java.lang.String getType(); + String getType(); /** * string Type = 4; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/StorageOuterClass.java b/src/main/java/network/p2p/proto/StorageOuterClass.java index 3e58c075..239ed126 100644 --- a/src/main/java/network/p2p/proto/StorageOuterClass.java +++ b/src/main/java/network/p2p/proto/StorageOuterClass.java @@ -37,17 +37,17 @@ public static void registerAllExtensions( private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\rstorage.proto\022\021network.p2p.proto\032\033goog" + "le/protobuf/empty.proto\"N\n\nPutMessage\022\020\n" + "\010OriginId\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\022\017\n\007Payl" + - "oad\030\003 \001(\014\022\014\n\004Type\030\004 \001(\t\" \n\nGetRequest\022\022\n" + - "\nIdentifier\030\001 \001(\014\")\n\010GetReply\022\017\n\007Payload" + - "\030\001 \001(\014\022\014\n\004Type\030\002 \001(\t2\224\001\n\007Storage\022@\n\003Put\022" + - "\035.network.p2p.proto.PutMessage\032\026.google." + - "protobuf.Empty\"\000(\001\022G\n\003Get\022\035.network.p2p." + - "proto.GetRequest\032\033.network.p2p.proto.Get" + - "Reply\"\000(\0010\001B\002P\001b\006proto3" + "oad\030\003 \001(\014\022\014\n\004Type\030\004 \001(\t\"1\n\nGetRequest\022\022\n" + + "\nIdentifier\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\")\n\010Ge" + + "tReply\022\017\n\007Payload\030\001 \001(\014\022\014\n\004Type\030\002 \001(\t2\224\001" + + "\n\007Storage\022@\n\003Put\022\035.network.p2p.proto.Put" + + "Message\032\026.google.protobuf.Empty\"\000(\001\022G\n\003G" + + "et\022\035.network.p2p.proto.GetRequest\032\033.netw" + + "ork.p2p.proto.GetReply\"\000(\0010\001B\002P\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -59,19 +59,19 @@ public static void registerAllExtensions( internal_static_network_p2p_proto_PutMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_PutMessage_descriptor, - new java.lang.String[] { "OriginId", "Channel", "Payload", "Type", }); + new String[] { "OriginId", "Channel", "Payload", "Type", }); internal_static_network_p2p_proto_GetRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_network_p2p_proto_GetRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_GetRequest_descriptor, - new java.lang.String[] { "Identifier", }); + new String[] { "Identifier", "Channel", }); internal_static_network_p2p_proto_GetReply_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_network_p2p_proto_GetReply_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_GetReply_descriptor, - new java.lang.String[] { "Payload", "Type", }); + new String[] { "Payload", "Type", }); com.google.protobuf.EmptyProto.getDescriptor(); } diff --git a/src/main/proto/storage.proto b/src/main/proto/storage.proto index 003a8b4f..97e7dbad 100644 --- a/src/main/proto/storage.proto +++ b/src/main/proto/storage.proto @@ -14,6 +14,7 @@ message PutMessage { message GetRequest { bytes Identifier = 1; + string Channel = 2; } message GetReply { From 57e158c3e168feb3684d47e3cbafdc569ee2c79b Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sun, 1 May 2022 19:31:37 +0300 Subject: [PATCH 05/10] adds channel based P2P network storage capability --- src/main/java/network/p2p/MessageClient.java | 3 +- src/main/java/network/p2p/MessageServer.java | 45 +++-- src/main/java/network/p2p/P2pConduit.java | 2 +- src/main/java/network/p2p/P2pNetwork.java | 4 +- src/test/java/networking/p2p/StorageTest.java | 168 ++++++++++++++++++ 5 files changed, 207 insertions(+), 15 deletions(-) diff --git a/src/main/java/network/p2p/MessageClient.java b/src/main/java/network/p2p/MessageClient.java index 044e932c..9ad1fd60 100644 --- a/src/main/java/network/p2p/MessageClient.java +++ b/src/main/java/network/p2p/MessageClient.java @@ -167,7 +167,7 @@ public void onCompleted() { } } - public Entity get(Identifier identifier) throws InterruptedException { + public Entity get(Identifier identifier, String channel) throws InterruptedException { final CountDownLatch finishLatch = new CountDownLatch(1); final Entity[] entity = {null}; @@ -208,6 +208,7 @@ public void onCompleted() { GetRequest request = GetRequest .newBuilder() .setIdentifier(ByteString.copyFrom(identifier.getBytes())) + .setChannel(channel) .build(); requestObserver.onNext(request); diff --git a/src/main/java/network/p2p/MessageServer.java b/src/main/java/network/p2p/MessageServer.java index 74db833c..f6c93d4f 100644 --- a/src/main/java/network/p2p/MessageServer.java +++ b/src/main/java/network/p2p/MessageServer.java @@ -18,6 +18,9 @@ import java.io.IOException; import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -46,7 +49,7 @@ public class MessageServer { private final Server server; private final HashMap engineChannelTable; - public ConcurrentMap distributedStorageComponent; + public ConcurrentMap> distributedStorageComponent; /** * Create a MessageServer using ServerBuilder as a base. @@ -183,7 +186,15 @@ public void onNext(PutMessage putMessage) { System.out.println("Type: " + putMessage.getType()); // puts the incoming entity onto the distributedStorageComponent - distributedStorageComponent.put(encoder.decode(e).id(),encoder.decode(e)); + + if(distributedStorageComponent.containsKey(putMessage.getChannel())){ + distributedStorageComponent.get(putMessage.getChannel()).add(encoder.decode(e)); + } else { + HashSet s = new HashSet<>(); + s.add(encoder.decode(e)); + distributedStorageComponent.put(putMessage.getChannel(),s); + } + } catch (ClassNotFoundException ex) { // TODO: replace with fatal log System.err.println("could not decode incoming put message"); @@ -211,7 +222,7 @@ public void onCompleted() { } @Override - public StreamObserver get(StreamObserver responseObserver){ + public StreamObserver get(StreamObserver responseObserver) { return new StreamObserver() { @Override public void onNext(GetRequest request) { @@ -222,17 +233,29 @@ public void onNext(GetRequest request) { System.out.println("Getting Entity"); System.out.println("ID: " + id); - if (!distributedStorageComponent.containsKey(id)) System.out.println("ENTITY NOT FOUND"); + Entity entity = null; + + if(distributedStorageComponent.containsKey(request.getChannel())){ + + for (Entity e : distributedStorageComponent.get(request.getChannel()) ) { + if(e.id().comparedTo(id)==0){ + entity = e; + EncodedEntity encodedEntity = encoder.encode(entity); - EncodedEntity encodedEntity = encoder.encode(distributedStorageComponent.get(id)); + GetReply reply = GetReply + .newBuilder() + .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) + .setType(encodedEntity.getType()) + .build(); + + responseObserver.onNext(reply); + } + } - GetReply reply = GetReply - .newBuilder() - .setPayload(ByteString.copyFrom(encodedEntity.getBytes())) - .setType(encodedEntity.getType()) - .build(); - responseObserver.onNext(reply); + } else { + System.out.println("CHANNEL NOT FOUND"); + } } diff --git a/src/main/java/network/p2p/P2pConduit.java b/src/main/java/network/p2p/P2pConduit.java index 9f117607..f959df9f 100644 --- a/src/main/java/network/p2p/P2pConduit.java +++ b/src/main/java/network/p2p/P2pConduit.java @@ -67,7 +67,7 @@ public void put(Entity e) throws LightChainDistributedStorageException { public Entity get(Identifier identifier) throws LightChainDistributedStorageException { try { - return network.getEntity(identifier); + return network.getEntity(identifier, this.channel); } catch (InterruptedException | IllegalArgumentException ex) { throw new LightChainDistributedStorageException(); } diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index 22f51a8b..f85cb54f 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -155,7 +155,7 @@ public void putEntity(Entity e, String channel) throws InterruptedException { } - public Entity getEntity(Identifier identifier) throws InterruptedException { + public Entity getEntity(Identifier identifier, String channel) throws InterruptedException { Entity e = null; @@ -188,7 +188,7 @@ public Entity getEntity(Identifier identifier) throws InterruptedException { ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); try { MessageClient client = new MessageClient(managedChannel); - e = client.get(identifier); + e = client.get(identifier, channel); } finally { managedChannel.shutdownNow(); } diff --git a/src/test/java/networking/p2p/StorageTest.java b/src/test/java/networking/p2p/StorageTest.java index 1178df3b..f825d1c2 100644 --- a/src/test/java/networking/p2p/StorageTest.java +++ b/src/test/java/networking/p2p/StorageTest.java @@ -1,5 +1,26 @@ package networking.p2p; +import model.Entity; +import model.exceptions.LightChainDistributedStorageException; +import model.lightchain.Identifier; +import network.Conduit; +import network.p2p.P2pConduit; +import network.p2p.P2pNetwork; +import networking.MockEngine; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import unittest.fixtures.EntityFixture; +import unittest.fixtures.IdentifierFixture; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + /** * Encapsulates tests for p2p storage. */ @@ -26,4 +47,151 @@ public class StorageTest { // So a total of 10 unique entities are stored. // Then check the union of all stored entities across all storage components // should be exactly the 10 unique original entities that are stored. + + private static final int PORT_ZERO = 0; + private final String channel1 = "test-network-channel-1"; + private final String channel2 = "test-network-channel-2"; + + /** + * Creates 10 Networks each with 2 Engines on 2 different channels. Each Engine on each Network puts 100 Entities + * on their Channels, totaling 1000 Entities on each Channel. Tests that each Engine on each Channel can get all + * Entities on that Channel but none from the other Channel. + */ + @Test + void testOne() { + + P2pNetwork[] networks = new P2pNetwork[10]; + Conduit[] conduits1 = new P2pConduit[10]; + Conduit[] conduits2 = new P2pConduit[10]; + + Entity[] entitiesForChannel1 = new Entity[100]; + Entity[] entitiesForChannel2 = new Entity[100]; + + int entityCounter1 = 0; + int entityCounter2 = 0; + + for (int i = 0; i < networks.length; i++) { + + networks[i] = new P2pNetwork(IdentifierFixture.newIdentifier(), PORT_ZERO); + + MockEngine engineA1 = new MockEngine(); + conduits1[i] = networks[i].register(engineA1, channel1); + + MockEngine engineA2 = new MockEngine(); + conduits2[i] = networks[i].register(engineA2, channel2); + + } + + for (int i = 0; i < networks.length; i++) { + for (int j = 0; j < 10; j++) { + entitiesForChannel1[entityCounter1++] = new EntityFixture(); + entitiesForChannel2[entityCounter2++] = new EntityFixture(); + } + } + + AtomicInteger threadErrorCount = new AtomicInteger(); + + startNetworks(networks); + + try { + Assertions.assertEquals(threadErrorCount.get(), 0); + + entityCounter1 = 0; + entityCounter2 = 0; + + for (int i = 0; i < networks.length; i++) { + for (int j = 0; j < 10; j++) { + conduits1[i].put(entitiesForChannel1[entityCounter1++]); + conduits2[i].put(entitiesForChannel2[entityCounter2++]); + } + } + + Set set1; + Set set2; + + for (int i = 0; i < networks.length; i++) { + + set1 = new HashSet(); + set2 = new HashSet(); + + entityCounter1 = 0; + entityCounter2 = 0; + + for (int j = 0; j < 100; j++) { + set1.add(conduits1[i].get(entitiesForChannel1[entityCounter1++].id())); + set2.add(conduits2[i].get(entitiesForChannel2[entityCounter2++].id())); + } + + // Tests that every Entity for each Channel was retrieved by every Engine on that Channel + Assertions.assertEquals(100, set1.size()); + Assertions.assertEquals(100, set2.size()); + + } + + for (int i = 0; i < networks.length; i++) { + + set1 = new HashSet(); + set2 = new HashSet(); + + entityCounter1 = 0; + entityCounter2 = 0; + + for (int j = 0; j < 100; j++) { + set1.add(conduits2[i].get(entitiesForChannel1[entityCounter1++].id())); + set2.add(conduits1[i].get(entitiesForChannel2[entityCounter2++].id())); + } + + // Tests that none of the Entities for specific Channels were accessible by Engines on other Channels + Assertions.assertTrue(set1.contains(null)); + Assertions.assertTrue(set2.contains(null)); + Assertions.assertEquals(set1.size(), 1); + Assertions.assertEquals(set2.size(), 1); + + } + + + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + + } + + + private void startNetworks(P2pNetwork[] networks) { + Thread[] networkThreads = new Thread[networks.length]; + AtomicInteger threadErrorCount = new AtomicInteger(); + CountDownLatch done = new CountDownLatch(networks.length); + + for (int i = 0; i < networks.length; i++) { + int finalI = i; + networkThreads[i] = new Thread(() -> { + try { + networks[finalI].start(); + } catch (IOException e) { + threadErrorCount.incrementAndGet(); + } + done.countDown(); + }); + } + + for (int i = 0; i < networks.length; i++) { + networkThreads[i].start(); + } + try { + boolean doneOneTime = done.await(10, TimeUnit.SECONDS); + Assertions.assertTrue(doneOneTime); + } catch (InterruptedException e) { + Assertions.fail(); + } + + ConcurrentMap idToAddressMap = new ConcurrentHashMap<>(); + for (P2pNetwork network : networks) { + idToAddressMap.put(network.getId(), network.getAddress()); + } + + for (P2pNetwork network : networks) { + network.setIdToAddressMap(idToAddressMap); + } + } + } From 6f0f03bc52bcc92ea393564e733430bc3df556a8 Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Sun, 1 May 2022 20:46:10 +0300 Subject: [PATCH 06/10] adds concurrency to tests --- src/test/java/networking/p2p/StorageTest.java | 133 +++++++++++------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/src/test/java/networking/p2p/StorageTest.java b/src/test/java/networking/p2p/StorageTest.java index f825d1c2..ae5c3dd0 100644 --- a/src/test/java/networking/p2p/StorageTest.java +++ b/src/test/java/networking/p2p/StorageTest.java @@ -2,6 +2,7 @@ import model.Entity; import model.exceptions.LightChainDistributedStorageException; +import model.exceptions.LightChainNetworkingException; import model.lightchain.Identifier; import network.Conduit; import network.p2p.P2pConduit; @@ -58,14 +59,16 @@ public class StorageTest { * Entities on that Channel but none from the other Channel. */ @Test - void testOne() { + void testOne() throws InterruptedException { + + int concurrencyDegree = 10; P2pNetwork[] networks = new P2pNetwork[10]; - Conduit[] conduits1 = new P2pConduit[10]; - Conduit[] conduits2 = new P2pConduit[10]; + Conduit[] conduits1 = new P2pConduit[100]; + Conduit[] conduits2 = new P2pConduit[100]; - Entity[] entitiesForChannel1 = new Entity[100]; - Entity[] entitiesForChannel2 = new Entity[100]; + Entity[] entitiesForChannel1 = new Entity[1000]; + Entity[] entitiesForChannel2 = new Entity[1000]; int entityCounter1 = 0; int entityCounter2 = 0; @@ -82,63 +85,95 @@ void testOne() { } - for (int i = 0; i < networks.length; i++) { - for (int j = 0; j < 10; j++) { - entitiesForChannel1[entityCounter1++] = new EntityFixture(); - entitiesForChannel2[entityCounter2++] = new EntityFixture(); - } - } - - AtomicInteger threadErrorCount = new AtomicInteger(); - startNetworks(networks); - try { - Assertions.assertEquals(threadErrorCount.get(), 0); - - entityCounter1 = 0; - entityCounter2 = 0; + Thread[] threads = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads[i] = new Thread(() -> { - for (int i = 0; i < networks.length; i++) { - for (int j = 0; j < 10; j++) { - conduits1[i].put(entitiesForChannel1[entityCounter1++]); - conduits2[i].put(entitiesForChannel2[entityCounter2++]); + for (int j = 0; j < 100; j++) { + entitiesForChannel1[finalI * 100 + j] = new EntityFixture(); + entitiesForChannel2[finalI * 100 + j] = new EntityFixture(); } - } - Set set1; - Set set2; + }); + } - for (int i = 0; i < networks.length; i++) { + for (Thread t : threads) { + t.start(); + t.join(); + } - set1 = new HashSet(); - set2 = new HashSet(); - entityCounter1 = 0; - entityCounter2 = 0; + Thread[] threads2 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads2[i] = new Thread(() -> { for (int j = 0; j < 100; j++) { - set1.add(conduits1[i].get(entitiesForChannel1[entityCounter1++].id())); - set2.add(conduits2[i].get(entitiesForChannel2[entityCounter2++].id())); + entitiesForChannel1[finalI * 100 + j] = new EntityFixture(); + entitiesForChannel2[finalI * 100 + j] = new EntityFixture(); + try { + conduits1[finalI].put(entitiesForChannel1[finalI * 10 + j]); + conduits2[finalI].put(entitiesForChannel2[finalI * 10 + j]); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } } - // Tests that every Entity for each Channel was retrieved by every Engine on that Channel - Assertions.assertEquals(100, set1.size()); - Assertions.assertEquals(100, set2.size()); + }); + } - } + for (Thread t : threads2) { + t.start(); + t.join(); + } - for (int i = 0; i < networks.length; i++) { - set1 = new HashSet(); - set2 = new HashSet(); + Thread[] threads3 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads3[i] = new Thread(() -> { + + Set set1 = new HashSet(); + Set set2 = new HashSet(); + + for (int j = 0; j < 1000; j++) { + try { + set1.add(conduits1[finalI].get(entitiesForChannel1[j].id())); + set2.add(conduits2[finalI].get(entitiesForChannel2[j].id())); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + } - entityCounter1 = 0; - entityCounter2 = 0; + // Tests that every Entity for each Channel was retrieved by every Engine on that Channel + Assertions.assertEquals(1000, set1.size()); + Assertions.assertEquals(1000, set2.size()); - for (int j = 0; j < 100; j++) { - set1.add(conduits2[i].get(entitiesForChannel1[entityCounter1++].id())); - set2.add(conduits1[i].get(entitiesForChannel2[entityCounter2++].id())); + }); + } + + for (Thread t : threads3) { + t.start(); + } + + Thread[] threads4 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads4[i] = new Thread(() -> { + + Set set1 = new HashSet(); + Set set2 = new HashSet(); + + for (int j = 0; j < 1000; j++) { + try { + set1.add(conduits2[finalI].get(entitiesForChannel1[j].id())); + set2.add(conduits1[finalI].get(entitiesForChannel2[j].id())); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } } // Tests that none of the Entities for specific Channels were accessible by Engines on other Channels @@ -147,11 +182,11 @@ void testOne() { Assertions.assertEquals(set1.size(), 1); Assertions.assertEquals(set2.size(), 1); - } - + }); + } - } catch (LightChainDistributedStorageException e) { - Assertions.fail(); + for (Thread t : threads4) { + t.start(); } } From 7b7e25a55b805f52dac8d909e5dc30c3e14bbf7c Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Mon, 2 May 2022 18:33:13 +0300 Subject: [PATCH 07/10] implements further tests and improves data retrieval methods --- src/main/java/network/p2p/P2pConduit.java | 4 +- src/main/java/network/p2p/P2pNetwork.java | 15 ++++ src/test/java/networking/p2p/StorageTest.java | 77 ++++++++++++++++++- 3 files changed, 92 insertions(+), 4 deletions(-) diff --git a/src/main/java/network/p2p/P2pConduit.java b/src/main/java/network/p2p/P2pConduit.java index f959df9f..93af9843 100644 --- a/src/main/java/network/p2p/P2pConduit.java +++ b/src/main/java/network/p2p/P2pConduit.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.List; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import model.Entity; @@ -76,6 +77,7 @@ public Entity get(Identifier identifier) throws LightChainDistributedStorageExce @Override public ArrayList allEntities() throws LightChainDistributedStorageException { - return null; + return network.getAllEntities(channel); } + } diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index f85cb54f..b7a6742a 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -1,6 +1,7 @@ package network.p2p; import java.io.IOException; +import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -197,4 +198,18 @@ public Entity getEntity(Identifier identifier, String channel) throws Interrupte } + public ArrayList getAllEntities(String channel) { + + ArrayList entities = new ArrayList<>(); + + if (!(server.distributedStorageComponent.get(channel) == null)) { + for (Entity e : server.distributedStorageComponent.get(channel)) { + entities.add(e); + } + } + + return entities; + + } + } diff --git a/src/test/java/networking/p2p/StorageTest.java b/src/test/java/networking/p2p/StorageTest.java index ae5c3dd0..bbbbcc7e 100644 --- a/src/test/java/networking/p2p/StorageTest.java +++ b/src/test/java/networking/p2p/StorageTest.java @@ -70,9 +70,6 @@ void testOne() throws InterruptedException { Entity[] entitiesForChannel1 = new Entity[1000]; Entity[] entitiesForChannel2 = new Entity[1000]; - int entityCounter1 = 0; - int entityCounter2 = 0; - for (int i = 0; i < networks.length; i++) { networks[i] = new P2pNetwork(IdentifierFixture.newIdentifier(), PORT_ZERO); @@ -191,6 +188,80 @@ void testOne() throws InterruptedException { } + @Test + void testThree() throws InterruptedException { + + int concurrencyDegree = 10; + + P2pNetwork[] networks = new P2pNetwork[10]; + Conduit[] conduits1 = new P2pConduit[100]; + Conduit[] conduits2 = new P2pConduit[100]; + + Entity[] entitiesForChannel1 = new Entity[1000]; + Entity[] entitiesForChannel2 = new Entity[1000]; + + for (int i = 0; i < networks.length; i++) { + + networks[i] = new P2pNetwork(IdentifierFixture.newIdentifier(), PORT_ZERO); + + MockEngine engineA1 = new MockEngine(); + conduits1[i] = networks[i].register(engineA1, channel1); + + MockEngine engineA2 = new MockEngine(); + conduits2[i] = networks[i].register(engineA2, channel2); + + } + + startNetworks(networks); + + + Thread[] threads2 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads2[i] = new Thread(() -> { + + Entity entityForChannel1 = new EntityFixture(); + Entity entityForChannel2 = new EntityFixture(); + + for (int j = 0; j < 100; j++) { + try { + conduits1[finalI].put(entityForChannel1); + conduits2[finalI].put(entityForChannel2); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + } + + }); + } + + for (Thread t : threads2) { + t.start(); + t.join(); + } + + Set set1 = new HashSet(); + Set set2 = new HashSet(); + + Thread[] threads3 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + + try { + set1.addAll(conduits1[i].allEntities()); + set2.addAll(conduits2[i].allEntities()); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + + } + + // Tests that when every Engine on 10 different Nodes registers a single unique Entity, the entire data across + // all Nodes for that Channel contains 10 unique Entities in total + Assertions.assertEquals(10, set1.size()); + Assertions.assertEquals(10, set2.size()); + + } + private void startNetworks(P2pNetwork[] networks) { Thread[] networkThreads = new Thread[networks.length]; From 54dc9a5f2f1629f75d7153afafce5f24c0e856ab Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Mon, 2 May 2022 21:40:36 +0300 Subject: [PATCH 08/10] compliance improvements --- src/main/java/network/p2p/MessageClient.java | 6 +- src/main/java/network/p2p/MessageServer.java | 16 +- src/main/java/network/p2p/P2pConduit.java | 1 - src/main/java/network/p2p/P2pNetwork.java | 48 ++--- src/test/java/networking/p2p/StorageTest.java | 179 ++++++++++++++++-- 5 files changed, 198 insertions(+), 52 deletions(-) diff --git a/src/main/java/network/p2p/MessageClient.java b/src/main/java/network/p2p/MessageClient.java index 9ad1fd60..8775a261 100644 --- a/src/main/java/network/p2p/MessageClient.java +++ b/src/main/java/network/p2p/MessageClient.java @@ -28,10 +28,10 @@ import model.codec.EncodedEntity; import model.lightchain.Identifier; import modules.codec.JsonEncoder; -import network.p2p.proto.Message; -import network.p2p.proto.MessengerGrpc; import network.p2p.proto.GetReply; import network.p2p.proto.GetRequest; +import network.p2p.proto.Message; +import network.p2p.proto.MessengerGrpc; import network.p2p.proto.PutMessage; import network.p2p.proto.StorageGrpc; @@ -42,7 +42,6 @@ public class MessageClient { private final MessengerGrpc.MessengerStub asyncStub; private final StorageGrpc.StorageStub storageAsyncStub; - /** * Constructor. */ @@ -228,5 +227,4 @@ public void onCompleted() { } - } diff --git a/src/main/java/network/p2p/MessageServer.java b/src/main/java/network/p2p/MessageServer.java index f6c93d4f..b377dcea 100644 --- a/src/main/java/network/p2p/MessageServer.java +++ b/src/main/java/network/p2p/MessageServer.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -35,10 +34,10 @@ import model.codec.EncodedEntity; import model.lightchain.Identifier; import modules.codec.JsonEncoder; -import network.p2p.proto.Message; -import network.p2p.proto.MessengerGrpc; import network.p2p.proto.GetReply; import network.p2p.proto.GetRequest; +import network.p2p.proto.Message; +import network.p2p.proto.MessengerGrpc; import network.p2p.proto.PutMessage; import network.p2p.proto.StorageGrpc; import protocol.Engine; @@ -187,12 +186,12 @@ public void onNext(PutMessage putMessage) { // puts the incoming entity onto the distributedStorageComponent - if(distributedStorageComponent.containsKey(putMessage.getChannel())){ + if (distributedStorageComponent.containsKey(putMessage.getChannel())) { distributedStorageComponent.get(putMessage.getChannel()).add(encoder.decode(e)); } else { HashSet s = new HashSet<>(); s.add(encoder.decode(e)); - distributedStorageComponent.put(putMessage.getChannel(),s); + distributedStorageComponent.put(putMessage.getChannel(), s); } } catch (ClassNotFoundException ex) { @@ -235,10 +234,10 @@ public void onNext(GetRequest request) { Entity entity = null; - if(distributedStorageComponent.containsKey(request.getChannel())){ + if (distributedStorageComponent.containsKey(request.getChannel())) { - for (Entity e : distributedStorageComponent.get(request.getChannel()) ) { - if(e.id().comparedTo(id)==0){ + for (Entity e : distributedStorageComponent.get(request.getChannel())) { + if (e.id().comparedTo(id) == 0) { entity = e; EncodedEntity encodedEntity = encoder.encode(entity); @@ -252,7 +251,6 @@ public void onNext(GetRequest request) { } } - } else { System.out.println("CHANNEL NOT FOUND"); } diff --git a/src/main/java/network/p2p/P2pConduit.java b/src/main/java/network/p2p/P2pConduit.java index 93af9843..3e86b7fc 100644 --- a/src/main/java/network/p2p/P2pConduit.java +++ b/src/main/java/network/p2p/P2pConduit.java @@ -2,7 +2,6 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.List; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import model.Entity; diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index b7a6742a..71712011 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -120,31 +120,31 @@ public void sendUnicast(Entity e, Identifier target, String channel) throws Inte public void putEntity(Entity e, String channel) throws InterruptedException { - Identifier currentID = e.id(); - Identifier smallestID = (Identifier) idToAddressMap.keySet().toArray()[0]; - Identifier targetID; + Identifier currentId = e.id(); + Identifier smallestId = (Identifier) idToAddressMap.keySet().toArray()[0]; + Identifier targetId; for (Identifier id : idToAddressMap.keySet()) { - if (currentID.comparedTo(id) == -1 && e.id().comparedTo(id) == 1) { - currentID = id; + if (currentId.comparedTo(id) == -1 && e.id().comparedTo(id) == 1) { + currentId = id; } - if (smallestID.comparedTo(id) == 1) { - smallestID = id; + if (smallestId.comparedTo(id) == 1) { + smallestId = id; } } - if (currentID.comparedTo(e.id()) == 0) { - targetID = smallestID; + if (currentId.comparedTo(e.id()) == 0) { + targetId = smallestId; } else { - targetID = currentID; + targetId = currentId; } - String targetAddress = this.idToAddressMap.get(targetID); + String targetAddress = this.idToAddressMap.get(targetId); if (targetAddress == null) { - throw new IllegalArgumentException("target identifier does not exist: " + targetID.toString()); + throw new IllegalArgumentException("target identifier does not exist: " + targetId.toString()); } ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); try { @@ -160,31 +160,31 @@ public Entity getEntity(Identifier identifier, String channel) throws Interrupte Entity e = null; - Identifier currentID = identifier; - Identifier smallestID = (Identifier) idToAddressMap.keySet().toArray()[0]; - Identifier targetID; + Identifier currentId = identifier; + Identifier smallestId = (Identifier) idToAddressMap.keySet().toArray()[0]; + Identifier targetId; for (Identifier id : idToAddressMap.keySet()) { - if (currentID.comparedTo(id) == -1 && identifier.comparedTo(id) == 1) { - currentID = id; + if (currentId.comparedTo(id) == -1 && identifier.comparedTo(id) == 1) { + currentId = id; } - if (smallestID.comparedTo(id) == 1) { - smallestID = id; + if (smallestId.comparedTo(id) == 1) { + smallestId = id; } } - if (currentID.comparedTo(identifier) == 0) { - targetID = smallestID; + if (currentId.comparedTo(identifier) == 0) { + targetId = smallestId; } else { - targetID = currentID; + targetId = currentId; } - String targetAddress = this.idToAddressMap.get(targetID); + String targetAddress = this.idToAddressMap.get(targetId); if (targetAddress == null) { - throw new IllegalArgumentException("target identifier does not exist: " + targetID.toString()); + throw new IllegalArgumentException("target identifier does not exist: " + targetId.toString()); } ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(targetAddress).usePlaintext().build(); try { diff --git a/src/test/java/networking/p2p/StorageTest.java b/src/test/java/networking/p2p/StorageTest.java index bbbbcc7e..f3f873b6 100644 --- a/src/test/java/networking/p2p/StorageTest.java +++ b/src/test/java/networking/p2p/StorageTest.java @@ -1,8 +1,17 @@ package networking.p2p; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import model.Entity; import model.exceptions.LightChainDistributedStorageException; -import model.exceptions.LightChainNetworkingException; import model.lightchain.Identifier; import network.Conduit; import network.p2p.P2pConduit; @@ -13,15 +22,6 @@ import unittest.fixtures.EntityFixture; import unittest.fixtures.IdentifierFixture; -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - /** * Encapsulates tests for p2p storage. */ @@ -102,7 +102,6 @@ void testOne() throws InterruptedException { t.join(); } - Thread[] threads2 = new Thread[concurrencyDegree]; for (int i = 0; i < concurrencyDegree; i++) { int finalI = i; @@ -127,7 +126,6 @@ void testOne() throws InterruptedException { t.join(); } - Thread[] threads3 = new Thread[concurrencyDegree]; for (int i = 0; i < concurrencyDegree; i++) { int finalI = i; @@ -188,8 +186,13 @@ void testOne() throws InterruptedException { } + /** + * Creates 10 Networks each with 2 Engines on 2 different channels. Each Engine on each Network puts 100 Entities + * on their Channels, totaling 1000 Entities on each Channel. Tests that the Distributed Storage Components + * cumulatively contain all the Entities, nothing else and no duplicates. + */ @Test - void testThree() throws InterruptedException { + void testTwo() throws InterruptedException { int concurrencyDegree = 10; @@ -214,6 +217,155 @@ void testThree() throws InterruptedException { startNetworks(networks); + Thread[] threads = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads[i] = new Thread(() -> { + + for (int j = 0; j < 100; j++) { + entitiesForChannel1[finalI * 100 + j] = new EntityFixture(); + entitiesForChannel2[finalI * 100 + j] = new EntityFixture(); + } + + }); + } + + for (Thread t : threads) { + t.start(); + t.join(); + } + + Thread[] threads2 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads2[i] = new Thread(() -> { + + for (int j = 0; j < 100; j++) { + entitiesForChannel1[finalI * 100 + j] = new EntityFixture(); + entitiesForChannel2[finalI * 100 + j] = new EntityFixture(); + try { + conduits1[finalI].put(entitiesForChannel1[finalI * 10 + j]); + conduits2[finalI].put(entitiesForChannel2[finalI * 10 + j]); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + } + + }); + } + + for (Thread t : threads2) { + t.start(); + t.join(); + } + + Thread[] threads3 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads3[i] = new Thread(() -> { + + ArrayList list1 = new ArrayList(); + ArrayList list2 = new ArrayList(); + + for (int j = 0; j < 1000; j++) { + try { + list1.add(conduits1[finalI].get(entitiesForChannel1[j].id())); + list2.add(conduits2[finalI].get(entitiesForChannel2[j].id())); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + } + + // Tests that nothing but every unique Entity for each Channel was retrieved by every Engine on that Channel + Assertions.assertEquals(1000, list1.size()); + Assertions.assertEquals(1000, list2.size()); + + }); + } + + for (Thread t : threads3) { + t.start(); + } + + Thread[] threads4 = new Thread[concurrencyDegree]; + for (int i = 0; i < concurrencyDegree; i++) { + int finalI = i; + threads4[i] = new Thread(() -> { + + ArrayList list1 = new ArrayList(); + ArrayList list2 = new ArrayList(); + + Set set1 = new HashSet(); + Set set2 = new HashSet(); + + boolean duplicatesFound = false; + + for (int j = 0; j < 1000; j++) { + try { + + if (set1.contains(conduits1[finalI].get(entitiesForChannel1[j].id())) + || set2.contains(conduits2[finalI].get(entitiesForChannel2[j].id()))) { + duplicatesFound = true; + } + + set1.add(conduits1[finalI].get(entitiesForChannel1[j].id())); + set2.add(conduits2[finalI].get(entitiesForChannel2[j].id())); + + list1.add(conduits2[finalI].get(entitiesForChannel1[j].id())); + list2.add(conduits1[finalI].get(entitiesForChannel2[j].id())); + } catch (LightChainDistributedStorageException e) { + Assertions.fail(); + } + } + + // Tests that none of the Entities for specific Channels were accessible by Engines on other Channels + Assertions.assertTrue(list1.contains(null)); + Assertions.assertTrue(list2.contains(null)); + Assertions.assertEquals(list1.size(), 1); + Assertions.assertEquals(list2.size(), 1); + + // Tests no storage elements contained duplicates + Assertions.assertTrue(!duplicatesFound); + + }); + } + + for (Thread t : threads4) { + t.start(); + } + + } + + /** + * Creates 10 Networks each with 2 Engines on 2 different channels. Each Engine on each Network puts 1 unique Entity + * on their Channels, totaling 10 Entities on each Channel. Tests that each Engine on each Channel can get all + * Entities on that Channel but with no duplicates. + */ + @Test + void testThree() throws InterruptedException { + + int concurrencyDegree = 10; + + P2pNetwork[] networks = new P2pNetwork[10]; + Conduit[] conduits1 = new P2pConduit[100]; + Conduit[] conduits2 = new P2pConduit[100]; + + Entity[] entitiesForChannel1 = new Entity[1000]; + Entity[] entitiesForChannel2 = new Entity[1000]; + + for (int i = 0; i < networks.length; i++) { + + networks[i] = new P2pNetwork(IdentifierFixture.newIdentifier(), PORT_ZERO); + + MockEngine engineA1 = new MockEngine(); + conduits1[i] = networks[i].register(engineA1, channel1); + + MockEngine engineA2 = new MockEngine(); + conduits2[i] = networks[i].register(engineA2, channel2); + + } + + startNetworks(networks); Thread[] threads2 = new Thread[concurrencyDegree]; for (int i = 0; i < concurrencyDegree; i++) { @@ -262,7 +414,6 @@ void testThree() throws InterruptedException { } - private void startNetworks(P2pNetwork[] networks) { Thread[] networkThreads = new Thread[networks.length]; AtomicInteger threadErrorCount = new AtomicInteger(); From e477dd442c6f5aba7786ca477e846d6eadff810e Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Tue, 3 May 2022 14:05:27 +0300 Subject: [PATCH 09/10] fixes lint --- src/main/java/network/p2p/MessageClient.java | 3 + src/main/java/network/p2p/MessageServer.java | 5 +- src/main/java/network/p2p/P2pNetwork.java | 16 ++ src/main/java/network/p2p/proto/GetReply.java | 206 +++++++------- .../network/p2p/proto/GetReplyOrBuilder.java | 2 +- .../java/network/p2p/proto/GetRequest.java | 206 +++++++------- .../p2p/proto/GetRequestOrBuilder.java | 2 +- src/main/java/network/p2p/proto/Message.java | 256 +++++++++--------- .../network/p2p/proto/MessageOrBuilder.java | 4 +- .../network/p2p/proto/MessageOuterClass.java | 4 +- .../java/network/p2p/proto/MessengerGrpc.java | 48 ++-- .../java/network/p2p/proto/PutMessage.java | 252 ++++++++--------- .../p2p/proto/PutMessageOrBuilder.java | 4 +- .../network/p2p/proto/StorageOuterClass.java | 8 +- 14 files changed, 519 insertions(+), 497 deletions(-) diff --git a/src/main/java/network/p2p/MessageClient.java b/src/main/java/network/p2p/MessageClient.java index 8775a261..aad6497b 100644 --- a/src/main/java/network/p2p/MessageClient.java +++ b/src/main/java/network/p2p/MessageClient.java @@ -166,6 +166,9 @@ public void onCompleted() { } } + /** + * Implements logic to asynchronously get entity from the target. + */ public Entity get(Identifier identifier, String channel) throws InterruptedException { final CountDownLatch finishLatch = new CountDownLatch(1); diff --git a/src/main/java/network/p2p/MessageServer.java b/src/main/java/network/p2p/MessageServer.java index b377dcea..4d41825e 100644 --- a/src/main/java/network/p2p/MessageServer.java +++ b/src/main/java/network/p2p/MessageServer.java @@ -107,7 +107,7 @@ public void stop() throws InterruptedException { } /** - * Concrete implementation of the gRPC Serverside response methods. + * Concrete implementation of the gRPC Serverside response methods for Message functionality. */ @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "meant to be externally mutable") public class MessengerImpl extends MessengerGrpc.MessengerImplBase { @@ -163,6 +163,9 @@ public void onCompleted() { } } + /** + * Concrete implementation of the gRPC Serverside response methods for Storage functionality. + */ public class StorageImpl extends StorageGrpc.StorageImplBase { @Override diff --git a/src/main/java/network/p2p/P2pNetwork.java b/src/main/java/network/p2p/P2pNetwork.java index 71712011..643d36c8 100644 --- a/src/main/java/network/p2p/P2pNetwork.java +++ b/src/main/java/network/p2p/P2pNetwork.java @@ -118,6 +118,13 @@ public void sendUnicast(Entity e, Identifier target, String channel) throws Inte } } + /** + * Puts the provided Entity into the correct storage element. + * + * @param e the entity to be put. + * @param channel the network channel on which this entity is put. + * @throws InterruptedException if the transmission of Entity relay is interrupted. + */ public void putEntity(Entity e, String channel) throws InterruptedException { Identifier currentId = e.id(); @@ -156,6 +163,9 @@ public void putEntity(Entity e, String channel) throws InterruptedException { } + /** + * Implements logic to asynchronously put entity from the target. + */ public Entity getEntity(Identifier identifier, String channel) throws InterruptedException { Entity e = null; @@ -198,6 +208,12 @@ public Entity getEntity(Identifier identifier, String channel) throws Interrupte } + /** + * Gathers all the Entities requested by the caller. + * + * @param channel the channel of the requesting Engine + * @return an ArrayList containing all the Entities + */ public ArrayList getAllEntities(String channel) { ArrayList entities = new ArrayList<>(); diff --git a/src/main/java/network/p2p/proto/GetReply.java b/src/main/java/network/p2p/proto/GetReply.java index 7f17a18f..11e69597 100644 --- a/src/main/java/network/p2p/proto/GetReply.java +++ b/src/main/java/network/p2p/proto/GetReply.java @@ -20,14 +20,14 @@ private GetReply() { type_ = ""; } - @Override + @java.lang.Override @SuppressWarnings({"unused"}) - protected Object newInstance( + protected java.lang.Object newInstance( UnusedPrivateParameter unused) { return new GetReply(); } - @Override + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -38,7 +38,7 @@ private GetReply( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new NullPointerException(); + throw new java.lang.NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -56,7 +56,7 @@ private GetReply( break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); type_ = s; break; @@ -82,15 +82,15 @@ private GetReply( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - GetReply.class, Builder.class); + network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); } public static final int PAYLOAD_FIELD_NUMBER = 1; @@ -99,26 +99,26 @@ private GetReply( * bytes Payload = 1; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 2; - private volatile Object type_; + private volatile java.lang.Object type_; /** * string Type = 2; * @return The type. */ - @Override - public String getType() { - Object ref = type_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getType() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } @@ -127,14 +127,14 @@ public String getType() { * string Type = 2; * @return The bytes for type. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; - if (ref instanceof String) { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -143,7 +143,7 @@ public String getType() { } private byte memoizedIsInitialized = -1; - @Override + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -153,7 +153,7 @@ public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!payload_.isEmpty()) { @@ -165,7 +165,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @Override + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -183,15 +183,15 @@ public int getSerializedSize() { return size; } - @Override - public boolean equals(final Object obj) { + @java.lang.Override + public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof GetReply)) { + if (!(obj instanceof network.p2p.proto.GetReply)) { return super.equals(obj); } - GetReply other = (GetReply) obj; + network.p2p.proto.GetReply other = (network.p2p.proto.GetReply) obj; if (!getPayload() .equals(other.getPayload())) return false; @@ -201,7 +201,7 @@ public boolean equals(final Object obj) { return true; } - @Override + @java.lang.Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -217,69 +217,69 @@ public int hashCode() { return hash; } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetReply parseFrom(byte[] data) + public static network.p2p.proto.GetReply parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetReply parseFrom(java.io.InputStream input) + public static network.p2p.proto.GetReply parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static GetReply parseDelimitedFrom(java.io.InputStream input) + public static network.p2p.proto.GetReply parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static GetReply parseDelimitedFrom( + public static network.p2p.proto.GetReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static GetReply parseFrom( + public static network.p2p.proto.GetReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -287,23 +287,23 @@ public static GetReply parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @Override + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(GetReply prototype) { + public static Builder newBuilder(network.p2p.proto.GetReply prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @Override + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @Override + @java.lang.Override protected Builder newBuilderForType( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -313,18 +313,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetReply) - GetReplyOrBuilder { + network.p2p.proto.GetReplyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - GetReply.class, Builder.class); + network.p2p.proto.GetReply.class, network.p2p.proto.GetReply.Builder.class); } // Construct using network.p2p.proto.GetReply.newBuilder() @@ -333,7 +333,7 @@ private Builder() { } private Builder( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -342,7 +342,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @Override + @java.lang.Override public Builder clear() { super.clear(); payload_ = com.google.protobuf.ByteString.EMPTY; @@ -352,79 +352,79 @@ public Builder clear() { return this; } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetReply_descriptor; } - @Override - public GetReply getDefaultInstanceForType() { - return GetReply.getDefaultInstance(); + @java.lang.Override + public network.p2p.proto.GetReply getDefaultInstanceForType() { + return network.p2p.proto.GetReply.getDefaultInstance(); } - @Override - public GetReply build() { - GetReply result = buildPartial(); + @java.lang.Override + public network.p2p.proto.GetReply build() { + network.p2p.proto.GetReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @Override - public GetReply buildPartial() { - GetReply result = new GetReply(this); + @java.lang.Override + public network.p2p.proto.GetReply buildPartial() { + network.p2p.proto.GetReply result = new network.p2p.proto.GetReply(this); result.payload_ = payload_; result.type_ = type_; onBuilt(); return result; } - @Override + @java.lang.Override public Builder clone() { return super.clone(); } - @Override + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.setField(field, value); } - @Override + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @Override + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @Override + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return super.setRepeatedField(field, index, value); } - @Override + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.addRepeatedField(field, value); } - @Override + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof GetReply) { - return mergeFrom((GetReply)other); + if (other instanceof network.p2p.proto.GetReply) { + return mergeFrom((network.p2p.proto.GetReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(GetReply other) { - if (other == GetReply.getDefaultInstance()) return this; + public Builder mergeFrom(network.p2p.proto.GetReply other) { + if (other == network.p2p.proto.GetReply.getDefaultInstance()) return this; if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) { setPayload(other.getPayload()); } @@ -437,21 +437,21 @@ public Builder mergeFrom(GetReply other) { return this; } - @Override + @java.lang.Override public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - GetReply parsedMessage = null; + network.p2p.proto.GetReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (GetReply) e.getUnfinishedMessage(); + parsedMessage = (network.p2p.proto.GetReply) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -466,7 +466,7 @@ public Builder mergeFrom( * bytes Payload = 1; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -495,21 +495,21 @@ public Builder clearPayload() { return this; } - private Object type_ = ""; + private java.lang.Object type_ = ""; /** * string Type = 2; * @return The type. */ - public String getType() { - Object ref = type_; - if (!(ref instanceof String)) { + public java.lang.String getType() { + java.lang.Object ref = type_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -518,11 +518,11 @@ public String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; + java.lang.Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -535,7 +535,7 @@ public String getType() { * @return This builder for chaining. */ public Builder setType( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -570,13 +570,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @Override + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @Override + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -587,18 +587,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.GetReply) - private static final GetReply DEFAULT_INSTANCE; + private static final network.p2p.proto.GetReply DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new GetReply(); + DEFAULT_INSTANCE = new network.p2p.proto.GetReply(); } - public static GetReply getDefaultInstance() { + public static network.p2p.proto.GetReply getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @Override + @java.lang.Override public GetReply parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -611,13 +611,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @Override + @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @Override - public GetReply getDefaultInstanceForType() { + @java.lang.Override + public network.p2p.proto.GetReply getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/GetReplyOrBuilder.java b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java index 59cce1cd..0b3bfbb1 100644 --- a/src/main/java/network/p2p/proto/GetReplyOrBuilder.java +++ b/src/main/java/network/p2p/proto/GetReplyOrBuilder.java @@ -17,7 +17,7 @@ public interface GetReplyOrBuilder extends * string Type = 2; * @return The type. */ - String getType(); + java.lang.String getType(); /** * string Type = 2; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/GetRequest.java b/src/main/java/network/p2p/proto/GetRequest.java index 44383dd3..7cb1dde1 100644 --- a/src/main/java/network/p2p/proto/GetRequest.java +++ b/src/main/java/network/p2p/proto/GetRequest.java @@ -20,14 +20,14 @@ private GetRequest() { channel_ = ""; } - @Override + @java.lang.Override @SuppressWarnings({"unused"}) - protected Object newInstance( + protected java.lang.Object newInstance( UnusedPrivateParameter unused) { return new GetRequest(); } - @Override + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -38,7 +38,7 @@ private GetRequest( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new NullPointerException(); + throw new java.lang.NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -56,7 +56,7 @@ private GetRequest( break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); channel_ = s; break; @@ -82,15 +82,15 @@ private GetRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - GetRequest.class, Builder.class); + network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); } public static final int IDENTIFIER_FIELD_NUMBER = 1; @@ -99,26 +99,26 @@ private GetRequest( * bytes Identifier = 1; * @return The identifier. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getIdentifier() { return identifier_; } public static final int CHANNEL_FIELD_NUMBER = 2; - private volatile Object channel_; + private volatile java.lang.Object channel_; /** * string Channel = 2; * @return The channel. */ - @Override - public String getChannel() { - Object ref = channel_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } @@ -127,14 +127,14 @@ public String getChannel() { * string Channel = 2; * @return The bytes for channel. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; - if (ref instanceof String) { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -143,7 +143,7 @@ public String getChannel() { } private byte memoizedIsInitialized = -1; - @Override + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -153,7 +153,7 @@ public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!identifier_.isEmpty()) { @@ -165,7 +165,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @Override + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -183,15 +183,15 @@ public int getSerializedSize() { return size; } - @Override - public boolean equals(final Object obj) { + @java.lang.Override + public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof GetRequest)) { + if (!(obj instanceof network.p2p.proto.GetRequest)) { return super.equals(obj); } - GetRequest other = (GetRequest) obj; + network.p2p.proto.GetRequest other = (network.p2p.proto.GetRequest) obj; if (!getIdentifier() .equals(other.getIdentifier())) return false; @@ -201,7 +201,7 @@ public boolean equals(final Object obj) { return true; } - @Override + @java.lang.Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -217,69 +217,69 @@ public int hashCode() { return hash; } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetRequest parseFrom(byte[] data) + public static network.p2p.proto.GetRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static GetRequest parseFrom(java.io.InputStream input) + public static network.p2p.proto.GetRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static GetRequest parseDelimitedFrom(java.io.InputStream input) + public static network.p2p.proto.GetRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static GetRequest parseDelimitedFrom( + public static network.p2p.proto.GetRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static GetRequest parseFrom( + public static network.p2p.proto.GetRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -287,23 +287,23 @@ public static GetRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @Override + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(GetRequest prototype) { + public static Builder newBuilder(network.p2p.proto.GetRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @Override + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @Override + @java.lang.Override protected Builder newBuilderForType( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -313,18 +313,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.GetRequest) - GetRequestOrBuilder { + network.p2p.proto.GetRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - GetRequest.class, Builder.class); + network.p2p.proto.GetRequest.class, network.p2p.proto.GetRequest.Builder.class); } // Construct using network.p2p.proto.GetRequest.newBuilder() @@ -333,7 +333,7 @@ private Builder() { } private Builder( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -342,7 +342,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @Override + @java.lang.Override public Builder clear() { super.clear(); identifier_ = com.google.protobuf.ByteString.EMPTY; @@ -352,79 +352,79 @@ public Builder clear() { return this; } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_GetRequest_descriptor; } - @Override - public GetRequest getDefaultInstanceForType() { - return GetRequest.getDefaultInstance(); + @java.lang.Override + public network.p2p.proto.GetRequest getDefaultInstanceForType() { + return network.p2p.proto.GetRequest.getDefaultInstance(); } - @Override - public GetRequest build() { - GetRequest result = buildPartial(); + @java.lang.Override + public network.p2p.proto.GetRequest build() { + network.p2p.proto.GetRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @Override - public GetRequest buildPartial() { - GetRequest result = new GetRequest(this); + @java.lang.Override + public network.p2p.proto.GetRequest buildPartial() { + network.p2p.proto.GetRequest result = new network.p2p.proto.GetRequest(this); result.identifier_ = identifier_; result.channel_ = channel_; onBuilt(); return result; } - @Override + @java.lang.Override public Builder clone() { return super.clone(); } - @Override + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.setField(field, value); } - @Override + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @Override + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @Override + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return super.setRepeatedField(field, index, value); } - @Override + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.addRepeatedField(field, value); } - @Override + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof GetRequest) { - return mergeFrom((GetRequest)other); + if (other instanceof network.p2p.proto.GetRequest) { + return mergeFrom((network.p2p.proto.GetRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(GetRequest other) { - if (other == GetRequest.getDefaultInstance()) return this; + public Builder mergeFrom(network.p2p.proto.GetRequest other) { + if (other == network.p2p.proto.GetRequest.getDefaultInstance()) return this; if (other.getIdentifier() != com.google.protobuf.ByteString.EMPTY) { setIdentifier(other.getIdentifier()); } @@ -437,21 +437,21 @@ public Builder mergeFrom(GetRequest other) { return this; } - @Override + @java.lang.Override public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - GetRequest parsedMessage = null; + network.p2p.proto.GetRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (GetRequest) e.getUnfinishedMessage(); + parsedMessage = (network.p2p.proto.GetRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -466,7 +466,7 @@ public Builder mergeFrom( * bytes Identifier = 1; * @return The identifier. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getIdentifier() { return identifier_; } @@ -495,21 +495,21 @@ public Builder clearIdentifier() { return this; } - private Object channel_ = ""; + private java.lang.Object channel_ = ""; /** * string Channel = 2; * @return The channel. */ - public String getChannel() { - Object ref = channel_; - if (!(ref instanceof String)) { + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -518,11 +518,11 @@ public String getChannel() { */ public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; + java.lang.Object ref = channel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -535,7 +535,7 @@ public String getChannel() { * @return This builder for chaining. */ public Builder setChannel( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -570,13 +570,13 @@ public Builder setChannelBytes( onChanged(); return this; } - @Override + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @Override + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -587,18 +587,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.GetRequest) - private static final GetRequest DEFAULT_INSTANCE; + private static final network.p2p.proto.GetRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new GetRequest(); + DEFAULT_INSTANCE = new network.p2p.proto.GetRequest(); } - public static GetRequest getDefaultInstance() { + public static network.p2p.proto.GetRequest getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @Override + @java.lang.Override public GetRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -611,13 +611,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @Override + @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @Override - public GetRequest getDefaultInstanceForType() { + @java.lang.Override + public network.p2p.proto.GetRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/GetRequestOrBuilder.java b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java index 58cbf84a..7c363626 100644 --- a/src/main/java/network/p2p/proto/GetRequestOrBuilder.java +++ b/src/main/java/network/p2p/proto/GetRequestOrBuilder.java @@ -17,7 +17,7 @@ public interface GetRequestOrBuilder extends * string Channel = 2; * @return The channel. */ - String getChannel(); + java.lang.String getChannel(); /** * string Channel = 2; * @return The bytes for channel. diff --git a/src/main/java/network/p2p/proto/Message.java b/src/main/java/network/p2p/proto/Message.java index 766b3a2b..353b1f54 100644 --- a/src/main/java/network/p2p/proto/Message.java +++ b/src/main/java/network/p2p/proto/Message.java @@ -23,14 +23,14 @@ private Message() { type_ = ""; } - @Override + @java.lang.Override @SuppressWarnings({"unused"}) - protected Object newInstance( + protected java.lang.Object newInstance( UnusedPrivateParameter unused) { return new Message(); } - @Override + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -41,7 +41,7 @@ private Message( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new NullPointerException(); + throw new java.lang.NullPointerException(); } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = @@ -60,7 +60,7 @@ private Message( break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); channel_ = s; break; @@ -79,7 +79,7 @@ private Message( break; } case 42: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); type_ = s; break; @@ -108,15 +108,15 @@ private Message( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable + return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - Message.class, Builder.class); + network.p2p.proto.Message.class, network.p2p.proto.Message.Builder.class); } public static final int ORIGINID_FIELD_NUMBER = 1; @@ -125,26 +125,26 @@ private Message( * bytes OriginId = 1; * @return The originId. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getOriginId() { return originId_; } public static final int CHANNEL_FIELD_NUMBER = 2; - private volatile Object channel_; + private volatile java.lang.Object channel_; /** * string Channel = 2; * @return The channel. */ - @Override - public String getChannel() { - Object ref = channel_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } @@ -153,14 +153,14 @@ public String getChannel() { * string Channel = 2; * @return The bytes for channel. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; - if (ref instanceof String) { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -174,7 +174,7 @@ public String getChannel() { * repeated bytes TargetIds = 3; * @return A list containing the targetIds. */ - @Override + @java.lang.Override public java.util.List getTargetIdsList() { return targetIds_; @@ -201,26 +201,26 @@ public com.google.protobuf.ByteString getTargetIds(int index) { * bytes Payload = 4; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 5; - private volatile Object type_; + private volatile java.lang.Object type_; /** * string Type = 5; * @return The type. */ - @Override - public String getType() { - Object ref = type_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getType() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } @@ -229,14 +229,14 @@ public String getType() { * string Type = 5; * @return The bytes for type. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; - if (ref instanceof String) { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -245,7 +245,7 @@ public String getType() { } private byte memoizedIsInitialized = -1; - @Override + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -255,7 +255,7 @@ public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!originId_.isEmpty()) { @@ -276,7 +276,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @Override + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -310,15 +310,15 @@ public int getSerializedSize() { return size; } - @Override - public boolean equals(final Object obj) { + @java.lang.Override + public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof Message)) { + if (!(obj instanceof network.p2p.proto.Message)) { return super.equals(obj); } - Message other = (Message) obj; + network.p2p.proto.Message other = (network.p2p.proto.Message) obj; if (!getOriginId() .equals(other.getOriginId())) return false; @@ -334,7 +334,7 @@ public boolean equals(final Object obj) { return true; } - @Override + @java.lang.Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -358,69 +358,69 @@ public int hashCode() { return hash; } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Message parseFrom(byte[] data) + public static network.p2p.proto.Message parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Message parseFrom(java.io.InputStream input) + public static network.p2p.proto.Message parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static Message parseDelimitedFrom(java.io.InputStream input) + public static network.p2p.proto.Message parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static Message parseDelimitedFrom( + public static network.p2p.proto.Message parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Message parseFrom( + public static network.p2p.proto.Message parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -428,23 +428,23 @@ public static Message parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @Override + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(Message prototype) { + public static Builder newBuilder(network.p2p.proto.Message prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @Override + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @Override + @java.lang.Override protected Builder newBuilderForType( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -454,18 +454,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.Message) - MessageOrBuilder { + network.p2p.proto.MessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable + return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - Message.class, Builder.class); + network.p2p.proto.Message.class, network.p2p.proto.Message.Builder.class); } // Construct using network.p2p.proto.Message.newBuilder() @@ -474,7 +474,7 @@ private Builder() { } private Builder( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -483,7 +483,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @Override + @java.lang.Override public Builder clear() { super.clear(); originId_ = com.google.protobuf.ByteString.EMPTY; @@ -499,29 +499,29 @@ public Builder clear() { return this; } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; + return network.p2p.proto.MessageOuterClass.internal_static_network_p2p_proto_Message_descriptor; } - @Override - public Message getDefaultInstanceForType() { - return Message.getDefaultInstance(); + @java.lang.Override + public network.p2p.proto.Message getDefaultInstanceForType() { + return network.p2p.proto.Message.getDefaultInstance(); } - @Override - public Message build() { - Message result = buildPartial(); + @java.lang.Override + public network.p2p.proto.Message build() { + network.p2p.proto.Message result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @Override - public Message buildPartial() { - Message result = new Message(this); + @java.lang.Override + public network.p2p.proto.Message buildPartial() { + network.p2p.proto.Message result = new network.p2p.proto.Message(this); int from_bitField0_ = bitField0_; result.originId_ = originId_; result.channel_ = channel_; @@ -536,50 +536,50 @@ public Message buildPartial() { return result; } - @Override + @java.lang.Override public Builder clone() { return super.clone(); } - @Override + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.setField(field, value); } - @Override + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @Override + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @Override + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return super.setRepeatedField(field, index, value); } - @Override + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.addRepeatedField(field, value); } - @Override + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Message) { - return mergeFrom((Message)other); + if (other instanceof network.p2p.proto.Message) { + return mergeFrom((network.p2p.proto.Message)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(Message other) { - if (other == Message.getDefaultInstance()) return this; + public Builder mergeFrom(network.p2p.proto.Message other) { + if (other == network.p2p.proto.Message.getDefaultInstance()) return this; if (other.getOriginId() != com.google.protobuf.ByteString.EMPTY) { setOriginId(other.getOriginId()); } @@ -609,21 +609,21 @@ public Builder mergeFrom(Message other) { return this; } - @Override + @java.lang.Override public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - Message parsedMessage = null; + network.p2p.proto.Message parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Message) e.getUnfinishedMessage(); + parsedMessage = (network.p2p.proto.Message) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -639,7 +639,7 @@ public Builder mergeFrom( * bytes OriginId = 1; * @return The originId. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getOriginId() { return originId_; } @@ -668,21 +668,21 @@ public Builder clearOriginId() { return this; } - private Object channel_ = ""; + private java.lang.Object channel_ = ""; /** * string Channel = 2; * @return The channel. */ - public String getChannel() { - Object ref = channel_; - if (!(ref instanceof String)) { + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -691,11 +691,11 @@ public String getChannel() { */ public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; + java.lang.Object ref = channel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -708,7 +708,7 @@ public String getChannel() { * @return This builder for chaining. */ public Builder setChannel( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -811,7 +811,7 @@ public Builder addTargetIds(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder addAllTargetIds( - Iterable values) { + java.lang.Iterable values) { ensureTargetIdsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, targetIds_); @@ -834,7 +834,7 @@ public Builder clearTargetIds() { * bytes Payload = 4; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -863,21 +863,21 @@ public Builder clearPayload() { return this; } - private Object type_ = ""; + private java.lang.Object type_ = ""; /** * string Type = 5; * @return The type. */ - public String getType() { - Object ref = type_; - if (!(ref instanceof String)) { + public java.lang.String getType() { + java.lang.Object ref = type_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -886,11 +886,11 @@ public String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; + java.lang.Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -903,7 +903,7 @@ public String getType() { * @return This builder for chaining. */ public Builder setType( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -938,13 +938,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @Override + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @Override + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -955,18 +955,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.Message) - private static final Message DEFAULT_INSTANCE; + private static final network.p2p.proto.Message DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new Message(); + DEFAULT_INSTANCE = new network.p2p.proto.Message(); } - public static Message getDefaultInstance() { + public static network.p2p.proto.Message getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @Override + @java.lang.Override public Message parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -979,13 +979,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @Override + @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @Override - public Message getDefaultInstanceForType() { + @java.lang.Override + public network.p2p.proto.Message getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/MessageOrBuilder.java b/src/main/java/network/p2p/proto/MessageOrBuilder.java index 8afbcb14..3d95ec14 100644 --- a/src/main/java/network/p2p/proto/MessageOrBuilder.java +++ b/src/main/java/network/p2p/proto/MessageOrBuilder.java @@ -17,7 +17,7 @@ public interface MessageOrBuilder extends * string Channel = 2; * @return The channel. */ - String getChannel(); + java.lang.String getChannel(); /** * string Channel = 2; * @return The bytes for channel. @@ -52,7 +52,7 @@ public interface MessageOrBuilder extends * string Type = 5; * @return The type. */ - String getType(); + java.lang.String getType(); /** * string Type = 5; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/MessageOuterClass.java b/src/main/java/network/p2p/proto/MessageOuterClass.java index 11283033..71aab2bd 100644 --- a/src/main/java/network/p2p/proto/MessageOuterClass.java +++ b/src/main/java/network/p2p/proto/MessageOuterClass.java @@ -27,7 +27,7 @@ public static void registerAllExtensions( private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - String[] descriptorData = { + java.lang.String[] descriptorData = { "\n\rmessage.proto\022\021network.p2p.proto\032\033goog" + "le/protobuf/empty.proto\"^\n\007Message\022\020\n\010Or" + "iginId\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\022\021\n\tTargetI" + @@ -46,7 +46,7 @@ public static void registerAllExtensions( internal_static_network_p2p_proto_Message_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_Message_descriptor, - new String[] { "OriginId", "Channel", "TargetIds", "Payload", "Type", }); + new java.lang.String[] { "OriginId", "Channel", "TargetIds", "Payload", "Type", }); com.google.protobuf.EmptyProto.getDescriptor(); } diff --git a/src/main/java/network/p2p/proto/MessengerGrpc.java b/src/main/java/network/p2p/proto/MessengerGrpc.java index b9f2d545..48623e1d 100644 --- a/src/main/java/network/p2p/proto/MessengerGrpc.java +++ b/src/main/java/network/p2p/proto/MessengerGrpc.java @@ -15,27 +15,27 @@ private MessengerGrpc() {} public static final String SERVICE_NAME = "network.p2p.proto.Messenger"; // Static method descriptors that strictly reflect the proto. - private static volatile io.grpc.MethodDescriptor getDeliverMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "Deliver", - requestType = Message.class, + requestType = network.p2p.proto.Message.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) - public static io.grpc.MethodDescriptor getDeliverMethod() { - io.grpc.MethodDescriptor getDeliverMethod; + io.grpc.MethodDescriptor getDeliverMethod; if ((getDeliverMethod = MessengerGrpc.getDeliverMethod) == null) { synchronized (MessengerGrpc.class) { if ((getDeliverMethod = MessengerGrpc.getDeliverMethod) == null) { MessengerGrpc.getDeliverMethod = getDeliverMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.CLIENT_STREAMING) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Deliver")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - Message.getDefaultInstance())) + network.p2p.proto.Message.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new MessengerMethodDescriptorSupplier("Deliver")) @@ -52,7 +52,7 @@ com.google.protobuf.Empty> getDeliverMethod() { public static MessengerStub newStub(io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @Override + @java.lang.Override public MessengerStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerStub(channel, callOptions); } @@ -67,7 +67,7 @@ public static MessengerBlockingStub newBlockingStub( io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @Override + @java.lang.Override public MessengerBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerBlockingStub(channel, callOptions); } @@ -82,7 +82,7 @@ public static MessengerFutureStub newFutureStub( io.grpc.Channel channel) { io.grpc.stub.AbstractStub.StubFactory factory = new io.grpc.stub.AbstractStub.StubFactory() { - @Override + @java.lang.Override public MessengerFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerFutureStub(channel, callOptions); } @@ -96,18 +96,18 @@ public static abstract class MessengerImplBase implements io.grpc.BindableServic /** */ - public io.grpc.stub.StreamObserver deliver( + public io.grpc.stub.StreamObserver deliver( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getDeliverMethod(), responseObserver); } - @Override public final io.grpc.ServerServiceDefinition bindService() { + @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getDeliverMethod(), io.grpc.stub.ServerCalls.asyncClientStreamingCall( new MethodHandlers< - Message, + network.p2p.proto.Message, com.google.protobuf.Empty>( this, METHODID_DELIVER))) .build(); @@ -122,7 +122,7 @@ private MessengerStub( super(channel, callOptions); } - @Override + @java.lang.Override protected MessengerStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerStub(channel, callOptions); @@ -130,7 +130,7 @@ protected MessengerStub build( /** */ - public io.grpc.stub.StreamObserver deliver( + public io.grpc.stub.StreamObserver deliver( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ClientCalls.asyncClientStreamingCall( getChannel().newCall(getDeliverMethod(), getCallOptions()), responseObserver); @@ -145,7 +145,7 @@ private MessengerBlockingStub( super(channel, callOptions); } - @Override + @java.lang.Override protected MessengerBlockingStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerBlockingStub(channel, callOptions); @@ -160,7 +160,7 @@ private MessengerFutureStub( super(channel, callOptions); } - @Override + @java.lang.Override protected MessengerFutureStub build( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { return new MessengerFutureStub(channel, callOptions); @@ -182,8 +182,8 @@ private static final class MethodHandlers implements this.methodId = methodId; } - @Override - @SuppressWarnings("unchecked") + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { default: @@ -191,8 +191,8 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv } } - @Override - @SuppressWarnings("unchecked") + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") public io.grpc.stub.StreamObserver invoke( io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { @@ -209,12 +209,12 @@ private static abstract class MessengerBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { MessengerBaseDescriptorSupplier() {} - @Override + @java.lang.Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return MessageOuterClass.getDescriptor(); + return network.p2p.proto.MessageOuterClass.getDescriptor(); } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() { return getFileDescriptor().findServiceByName("Messenger"); } @@ -234,7 +234,7 @@ private static final class MessengerMethodDescriptorSupplier this.methodName = methodName; } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() { return getServiceDescriptor().findMethodByName(methodName); } diff --git a/src/main/java/network/p2p/proto/PutMessage.java b/src/main/java/network/p2p/proto/PutMessage.java index 84d02e0d..0e58a792 100644 --- a/src/main/java/network/p2p/proto/PutMessage.java +++ b/src/main/java/network/p2p/proto/PutMessage.java @@ -22,14 +22,14 @@ private PutMessage() { type_ = ""; } - @Override + @java.lang.Override @SuppressWarnings({"unused"}) - protected Object newInstance( + protected java.lang.Object newInstance( UnusedPrivateParameter unused) { return new PutMessage(); } - @Override + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -40,7 +40,7 @@ private PutMessage( throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { - throw new NullPointerException(); + throw new java.lang.NullPointerException(); } com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -58,7 +58,7 @@ private PutMessage( break; } case 18: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); channel_ = s; break; @@ -69,7 +69,7 @@ private PutMessage( break; } case 34: { - String s = input.readStringRequireUtf8(); + java.lang.String s = input.readStringRequireUtf8(); type_ = s; break; @@ -95,15 +95,15 @@ private PutMessage( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - PutMessage.class, Builder.class); + network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); } public static final int ORIGINID_FIELD_NUMBER = 1; @@ -112,26 +112,26 @@ private PutMessage( * bytes OriginId = 1; * @return The originId. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getOriginId() { return originId_; } public static final int CHANNEL_FIELD_NUMBER = 2; - private volatile Object channel_; + private volatile java.lang.Object channel_; /** * string Channel = 2; * @return The channel. */ - @Override - public String getChannel() { - Object ref = channel_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } @@ -140,14 +140,14 @@ public String getChannel() { * string Channel = 2; * @return The bytes for channel. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; - if (ref instanceof String) { + java.lang.Object ref = channel_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -161,26 +161,26 @@ public String getChannel() { * bytes Payload = 3; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } public static final int TYPE_FIELD_NUMBER = 4; - private volatile Object type_; + private volatile java.lang.Object type_; /** * string Type = 4; * @return The type. */ - @Override - public String getType() { - Object ref = type_; - if (ref instanceof String) { - return (String) ref; + @java.lang.Override + public java.lang.String getType() { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } @@ -189,14 +189,14 @@ public String getType() { * string Type = 4; * @return The bytes for type. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; - if (ref instanceof String) { + java.lang.Object ref = type_; + if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -205,7 +205,7 @@ public String getType() { } private byte memoizedIsInitialized = -1; - @Override + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -215,7 +215,7 @@ public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!originId_.isEmpty()) { @@ -233,7 +233,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @Override + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -258,15 +258,15 @@ public int getSerializedSize() { return size; } - @Override - public boolean equals(final Object obj) { + @java.lang.Override + public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof PutMessage)) { + if (!(obj instanceof network.p2p.proto.PutMessage)) { return super.equals(obj); } - PutMessage other = (PutMessage) obj; + network.p2p.proto.PutMessage other = (network.p2p.proto.PutMessage) obj; if (!getOriginId() .equals(other.getOriginId())) return false; @@ -280,7 +280,7 @@ public boolean equals(final Object obj) { return true; } - @Override + @java.lang.Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -300,69 +300,69 @@ public int hashCode() { return hash; } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static PutMessage parseFrom(byte[] data) + public static network.p2p.proto.PutMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static PutMessage parseFrom(java.io.InputStream input) + public static network.p2p.proto.PutMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static PutMessage parseDelimitedFrom(java.io.InputStream input) + public static network.p2p.proto.PutMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static PutMessage parseDelimitedFrom( + public static network.p2p.proto.PutMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static PutMessage parseFrom( + public static network.p2p.proto.PutMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -370,23 +370,23 @@ public static PutMessage parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @Override + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(PutMessage prototype) { + public static Builder newBuilder(network.p2p.proto.PutMessage prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @Override + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @Override + @java.lang.Override protected Builder newBuilderForType( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -396,18 +396,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:network.p2p.proto.PutMessage) - PutMessageOrBuilder { + network.p2p.proto.PutMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @Override - protected FieldAccessorTable + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - PutMessage.class, Builder.class); + network.p2p.proto.PutMessage.class, network.p2p.proto.PutMessage.Builder.class); } // Construct using network.p2p.proto.PutMessage.newBuilder() @@ -416,7 +416,7 @@ private Builder() { } private Builder( - BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -425,7 +425,7 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @Override + @java.lang.Override public Builder clear() { super.clear(); originId_ = com.google.protobuf.ByteString.EMPTY; @@ -439,29 +439,29 @@ public Builder clear() { return this; } - @Override + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; + return network.p2p.proto.StorageOuterClass.internal_static_network_p2p_proto_PutMessage_descriptor; } - @Override - public PutMessage getDefaultInstanceForType() { - return PutMessage.getDefaultInstance(); + @java.lang.Override + public network.p2p.proto.PutMessage getDefaultInstanceForType() { + return network.p2p.proto.PutMessage.getDefaultInstance(); } - @Override - public PutMessage build() { - PutMessage result = buildPartial(); + @java.lang.Override + public network.p2p.proto.PutMessage build() { + network.p2p.proto.PutMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @Override - public PutMessage buildPartial() { - PutMessage result = new PutMessage(this); + @java.lang.Override + public network.p2p.proto.PutMessage buildPartial() { + network.p2p.proto.PutMessage result = new network.p2p.proto.PutMessage(this); result.originId_ = originId_; result.channel_ = channel_; result.payload_ = payload_; @@ -470,50 +470,50 @@ public PutMessage buildPartial() { return result; } - @Override + @java.lang.Override public Builder clone() { return super.clone(); } - @Override + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.setField(field, value); } - @Override + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @Override + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @Override + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return super.setRepeatedField(field, index, value); } - @Override + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return super.addRepeatedField(field, value); } - @Override + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof PutMessage) { - return mergeFrom((PutMessage)other); + if (other instanceof network.p2p.proto.PutMessage) { + return mergeFrom((network.p2p.proto.PutMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(PutMessage other) { - if (other == PutMessage.getDefaultInstance()) return this; + public Builder mergeFrom(network.p2p.proto.PutMessage other) { + if (other == network.p2p.proto.PutMessage.getDefaultInstance()) return this; if (other.getOriginId() != com.google.protobuf.ByteString.EMPTY) { setOriginId(other.getOriginId()); } @@ -533,21 +533,21 @@ public Builder mergeFrom(PutMessage other) { return this; } - @Override + @java.lang.Override public final boolean isInitialized() { return true; } - @Override + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - PutMessage parsedMessage = null; + network.p2p.proto.PutMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (PutMessage) e.getUnfinishedMessage(); + parsedMessage = (network.p2p.proto.PutMessage) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -562,7 +562,7 @@ public Builder mergeFrom( * bytes OriginId = 1; * @return The originId. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getOriginId() { return originId_; } @@ -591,21 +591,21 @@ public Builder clearOriginId() { return this; } - private Object channel_ = ""; + private java.lang.Object channel_ = ""; /** * string Channel = 2; * @return The channel. */ - public String getChannel() { - Object ref = channel_; - if (!(ref instanceof String)) { + public java.lang.String getChannel() { + java.lang.Object ref = channel_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); channel_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -614,11 +614,11 @@ public String getChannel() { */ public com.google.protobuf.ByteString getChannelBytes() { - Object ref = channel_; + java.lang.Object ref = channel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); channel_ = b; return b; } else { @@ -631,7 +631,7 @@ public String getChannel() { * @return This builder for chaining. */ public Builder setChannel( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -672,7 +672,7 @@ public Builder setChannelBytes( * bytes Payload = 3; * @return The payload. */ - @Override + @java.lang.Override public com.google.protobuf.ByteString getPayload() { return payload_; } @@ -701,21 +701,21 @@ public Builder clearPayload() { return this; } - private Object type_ = ""; + private java.lang.Object type_ = ""; /** * string Type = 4; * @return The type. */ - public String getType() { - Object ref = type_; - if (!(ref instanceof String)) { + public java.lang.String getType() { + java.lang.Object ref = type_; + if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); + java.lang.String s = bs.toStringUtf8(); type_ = s; return s; } else { - return (String) ref; + return (java.lang.String) ref; } } /** @@ -724,11 +724,11 @@ public String getType() { */ public com.google.protobuf.ByteString getTypeBytes() { - Object ref = type_; + java.lang.Object ref = type_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (String) ref); + (java.lang.String) ref); type_ = b; return b; } else { @@ -741,7 +741,7 @@ public String getType() { * @return This builder for chaining. */ public Builder setType( - String value) { + java.lang.String value) { if (value == null) { throw new NullPointerException(); } @@ -776,13 +776,13 @@ public Builder setTypeBytes( onChanged(); return this; } - @Override + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @Override + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -793,18 +793,18 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:network.p2p.proto.PutMessage) - private static final PutMessage DEFAULT_INSTANCE; + private static final network.p2p.proto.PutMessage DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new PutMessage(); + DEFAULT_INSTANCE = new network.p2p.proto.PutMessage(); } - public static PutMessage getDefaultInstance() { + public static network.p2p.proto.PutMessage getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @Override + @java.lang.Override public PutMessage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -817,13 +817,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @Override + @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @Override - public PutMessage getDefaultInstanceForType() { + @java.lang.Override + public network.p2p.proto.PutMessage getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/src/main/java/network/p2p/proto/PutMessageOrBuilder.java b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java index 645c6e6d..df63fd3f 100644 --- a/src/main/java/network/p2p/proto/PutMessageOrBuilder.java +++ b/src/main/java/network/p2p/proto/PutMessageOrBuilder.java @@ -17,7 +17,7 @@ public interface PutMessageOrBuilder extends * string Channel = 2; * @return The channel. */ - String getChannel(); + java.lang.String getChannel(); /** * string Channel = 2; * @return The bytes for channel. @@ -35,7 +35,7 @@ public interface PutMessageOrBuilder extends * string Type = 4; * @return The type. */ - String getType(); + java.lang.String getType(); /** * string Type = 4; * @return The bytes for type. diff --git a/src/main/java/network/p2p/proto/StorageOuterClass.java b/src/main/java/network/p2p/proto/StorageOuterClass.java index 239ed126..39cf4006 100644 --- a/src/main/java/network/p2p/proto/StorageOuterClass.java +++ b/src/main/java/network/p2p/proto/StorageOuterClass.java @@ -37,7 +37,7 @@ public static void registerAllExtensions( private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - String[] descriptorData = { + java.lang.String[] descriptorData = { "\n\rstorage.proto\022\021network.p2p.proto\032\033goog" + "le/protobuf/empty.proto\"N\n\nPutMessage\022\020\n" + "\010OriginId\030\001 \001(\014\022\017\n\007Channel\030\002 \001(\t\022\017\n\007Payl" + @@ -59,19 +59,19 @@ public static void registerAllExtensions( internal_static_network_p2p_proto_PutMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_PutMessage_descriptor, - new String[] { "OriginId", "Channel", "Payload", "Type", }); + new java.lang.String[] { "OriginId", "Channel", "Payload", "Type", }); internal_static_network_p2p_proto_GetRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_network_p2p_proto_GetRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_GetRequest_descriptor, - new String[] { "Identifier", "Channel", }); + new java.lang.String[] { "Identifier", "Channel", }); internal_static_network_p2p_proto_GetReply_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_network_p2p_proto_GetReply_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_network_p2p_proto_GetReply_descriptor, - new String[] { "Payload", "Type", }); + new java.lang.String[] { "Payload", "Type", }); com.google.protobuf.EmptyProto.getDescriptor(); } From 253c911b3b29ec00b1b971a114e5e19f922f348a Mon Sep 17 00:00:00 2001 From: mgulsun18 Date: Tue, 3 May 2022 14:14:20 +0300 Subject: [PATCH 10/10] fixes spotbugs --- src/main/java/network/p2p/MessageClient.java | 5 +++-- src/main/java/network/p2p/MessageServer.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/network/p2p/MessageClient.java b/src/main/java/network/p2p/MessageClient.java index aad6497b..deaee6e6 100644 --- a/src/main/java/network/p2p/MessageClient.java +++ b/src/main/java/network/p2p/MessageClient.java @@ -188,7 +188,6 @@ public void onNext(GetReply response) { // TODO: replace with fatal log System.err.println("could not decode incoming GetReply response"); ex.printStackTrace(); - System.exit(1); } } @@ -224,7 +223,9 @@ public void onCompleted() { requestObserver.onCompleted(); // Receiving happens asynchronously - finishLatch.await(1, TimeUnit.MINUTES); + if (!finishLatch.await(1, TimeUnit.MINUTES)) { + System.err.println("get can not finish within 1 minutes"); + } return entity[0]; diff --git a/src/main/java/network/p2p/MessageServer.java b/src/main/java/network/p2p/MessageServer.java index 4d41825e..79cf7d7c 100644 --- a/src/main/java/network/p2p/MessageServer.java +++ b/src/main/java/network/p2p/MessageServer.java @@ -166,6 +166,7 @@ public void onCompleted() { /** * Concrete implementation of the gRPC Serverside response methods for Storage functionality. */ + @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "meant to be externally mutable") public class StorageImpl extends StorageGrpc.StorageImplBase { @Override