Erweiterungen

lib/protocoll_messages/bootstrap_response_payload.dart

@@ -4,14 +4,21 @@ import 'package:stadtbote/protocoll_messages/bootstrap_response_config.dart';
 part 'bootstrap_response_payload.g.dart';
 
 @JsonSerializable()
-class BootstrapResponsePayload
+class BootstrapResponse
 {
-  late BootstrapResponseConfig config;
+  late String broker;
+  late String id;
 
-  BootstrapResponsePayload();
+  @JsonKey(name: "to_server")
+  late String toServer;
 
-  factory BootstrapResponsePayload.fromJson(Map<String, dynamic> json) => _$BootstrapResponsePayloadFromJson(json);
+  @JsonKey(name: "from_server")
+  late String fromServer;
 
-  Map<String, dynamic> toJson() => _$BootstrapResponsePayloadToJson(this);
+  BootstrapResponse();
+
+  factory BootstrapResponse.fromJson(Map<String, dynamic> json) => _$BootstrapResponseFromJson(json);
+
+  Map<String, dynamic> toJson() => _$BootstrapResponseToJson(this);
 }
 

lib/protocoll_messages/bootstrap_response_payload.g.dart

@@ -6,14 +6,17 @@ part of 'bootstrap_response_payload.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-BootstrapResponsePayload _$BootstrapResponsePayloadFromJson(
-        Map<String, dynamic> json) =>
-    BootstrapResponsePayload()
-      ..config = BootstrapResponseConfig.fromJson(
-          json['config'] as Map<String, dynamic>);
+BootstrapResponse _$BootstrapResponseFromJson(Map<String, dynamic> json) =>
+    BootstrapResponse()
+      ..broker = json['broker'] as String
+      ..id = json['id'] as String
+      ..toServer = json['to_server'] as String
+      ..fromServer = json['from_server'] as String;
 
-Map<String, dynamic> _$BootstrapResponsePayloadToJson(
-        BootstrapResponsePayload instance) =>
+Map<String, dynamic> _$BootstrapResponseToJson(BootstrapResponse instance) =>
     <String, dynamic>{
-      'config': instance.config,
+      'broker': instance.broker,
+      'id': instance.id,
+      'to_server': instance.toServer,
+      'from_server': instance.fromServer,
     };

lib/protocoll_messages/logout_message.dart

@@ -4,28 +4,6 @@ part 'logout_message.g.dart';
 
 @JsonSerializable()
 class LogoutMessage {
-  late LogoutContainer logout;
-
-  LogoutMessage();
-
-  factory LogoutMessage.fromJson(Map<String, dynamic> json) => _$LogoutMessageFromJson(json);
-
-  Map<String, dynamic> toJson() => _$LogoutMessageToJson(this);
-}
-
-@JsonSerializable()
-class LogoutContainer {
-  late LogoutMessagePosition? pos;
-
-  LogoutContainer();
-
-  factory LogoutContainer.fromJson(Map<String, dynamic> json) => _$LogoutContainerFromJson(json);
-
-  Map<String, dynamic> toJson() => _$LogoutContainerToJson(this);
-}
-
-@JsonSerializable()
-class LogoutMessagePosition {
   late String time;
 
   late double lat;
@@ -34,10 +12,10 @@ class LogoutMessagePosition {
 
   late int acc;
 
-  LogoutMessagePosition();
+  LogoutMessage();
 
-  factory LogoutMessagePosition.fromJson(Map<String, dynamic> json) => _$LogoutMessagePositionFromJson(json);
+  factory LogoutMessage.fromJson(Map<String, dynamic> json) => _$LogoutMessageFromJson(json);
 
-  Map<String, dynamic> toJson() => _$LogoutMessagePositionToJson(this);
+  Map<String, dynamic> toJson() => _$LogoutMessageToJson(this);
 }
 

lib/protocoll_messages/logout_message.g.dart

@@ -8,35 +8,12 @@ part of 'logout_message.dart';
 
 LogoutMessage _$LogoutMessageFromJson(Map<String, dynamic> json) =>
     LogoutMessage()
-      ..logout =
-          LogoutContainer.fromJson(json['logout'] as Map<String, dynamic>);
-
-Map<String, dynamic> _$LogoutMessageToJson(LogoutMessage instance) =>
-    <String, dynamic>{
-      'logout': instance.logout,
-    };
-
-LogoutContainer _$LogoutContainerFromJson(Map<String, dynamic> json) =>
-    LogoutContainer()
-      ..pos = json['pos'] == null
-          ? null
-          : LogoutMessagePosition.fromJson(json['pos'] as Map<String, dynamic>);
-
-Map<String, dynamic> _$LogoutContainerToJson(LogoutContainer instance) =>
-    <String, dynamic>{
-      'pos': instance.pos,
-    };
-
-LogoutMessagePosition _$LogoutMessagePositionFromJson(
-        Map<String, dynamic> json) =>
-    LogoutMessagePosition()
       ..time = json['time'] as String
       ..lat = (json['lat'] as num).toDouble()
       ..long = (json['long'] as num).toDouble()
       ..acc = json['acc'] as int;
 
-Map<String, dynamic> _$LogoutMessagePositionToJson(
-        LogoutMessagePosition instance) =>
+Map<String, dynamic> _$LogoutMessageToJson(LogoutMessage instance) =>
     <String, dynamic>{
       'time': instance.time,
       'lat': instance.lat,

lib/protocoll_messages/start_session_message.dart

@@ -6,8 +6,6 @@ part 'start_session_message.g.dart';
 
 @JsonSerializable()
 class StartSessionMessage {
-  late bool startSession;
-
   StartSessionMessage();
 
   factory StartSessionMessage.fromJson(Map<String, dynamic> json) => _$StartSessionMessageFromJson(json);

lib/protocoll_messages/start_session_message.g.dart

@@ -7,10 +7,8 @@ part of 'start_session_message.dart';
 // **************************************************************************
 
 StartSessionMessage _$StartSessionMessageFromJson(Map<String, dynamic> json) =>
-    StartSessionMessage()..startSession = json['startSession'] as bool;
+    StartSessionMessage();
 
 Map<String, dynamic> _$StartSessionMessageToJson(
         StartSessionMessage instance) =>
-    <String, dynamic>{
-      'startSession': instance.startSession,
-    };
+    <String, dynamic>{};