refactor: adapt to breaking changes introduced by dicom-rs 0.9

Author: nickamzol

src/backend/dimse/association/client.rs

@@ -1,4 +1,4 @@
-use dicom::ul::pdu::{PDataValueType, PresentationContextResult};
+use dicom::ul::pdu::{PDataValueType, PresentationContextNegotiated};
 use dicom::ul::Pdu;
 use std::convert::identity;
 use std::io::Write;
@@ -16,7 +16,7 @@ pub struct ClientAssociation {
 	channel: Sender<Command>,
 	uuid: Uuid,
 	tcp_stream: TcpStream,
-	presentation_context: Vec<PresentationContextResult>,
+	presentation_context: Vec<PresentationContextNegotiated>,
 	acceptor_max_pdu_length: u32,
 }
 
@@ -39,7 +39,7 @@ impl ClientAssociation {
 					.first()
 					.is_some_and(|pdv| pdv.value_type == PDataValueType::Command);
 				if is_command {
-					association.send(pdu).map_err(AssociationError::Client)
+					association.send(pdu).map_err(AssociationError::Association)
 				} else {
 					let data_length: usize = data.iter().map(|pdv| pdv.data.len()).sum();
 					if data_length > association.acceptor_max_pdu_length() as usize {
@@ -52,11 +52,11 @@ impl ClientAssociation {
 						}
 						Ok(())
 					} else {
-						association.send(pdu).map_err(AssociationError::Client)
+						association.send(pdu).map_err(AssociationError::Association)
 					}
 				}
 			}
-			_ => association.send(pdu).map_err(AssociationError::Client),
+			_ => association.send(pdu).map_err(AssociationError::Association),
 		}
 	}
 
@@ -120,7 +120,7 @@ impl ClientAssociation {
 						}
 						Command::Receive(reply_to) => {
 							let receive_result =
-								association.receive().map_err(AssociationError::Client);
+								association.receive().map_err(AssociationError::Association);
 							reply_to
 								.send(receive_result)
 								.map_err(|_| ChannelError::Closed)
@@ -197,7 +197,7 @@ impl Association for ClientAssociation {
 		}
 	}
 
-	fn presentation_contexts(&self) -> &[PresentationContextResult] {
+	fn presentation_contexts(&self) -> &[PresentationContextNegotiated] {
 		&self.presentation_context
 	}
 }

src/backend/dimse/association/mod.rs

@@ -1,4 +1,4 @@
-use dicom::ul::pdu::PresentationContextResult;
+use dicom::ul::pdu::{PresentationContextNegotiated, PresentationContextResult};
 use dicom::ul::Pdu;
 use std::time::Duration;
 use thiserror::Error;
@@ -19,9 +19,7 @@ pub enum AssociationError {
 	#[error("Failed to write P-DATA chunk: {0}")]
 	ChunkWriter(std::io::Error),
 	#[error(transparent)]
-	Client(#[from] dicom::ul::association::client::Error),
-	#[error(transparent)]
-	Server(#[from] dicom::ul::association::server::Error),
+	Association(#[from] dicom::ul::association::Error),
 }
 
 pub trait Association {
@@ -31,7 +29,7 @@ pub trait Association {
 
 	fn close(&mut self);
 
-	fn presentation_contexts(&self) -> &[PresentationContextResult];
+	fn presentation_contexts(&self) -> &[PresentationContextNegotiated];
 }
 
 #[derive(Debug)]

src/backend/dimse/association/server.rs

@@ -1,6 +1,7 @@
 use super::{oneshot, AskPattern, Association, AssociationError, ChannelError, Command, Sender};
 use dicom::transfer_syntax::TransferSyntaxRegistry;
-use dicom::ul::{pdu::PresentationContextResult, Pdu};
+use dicom::ul::pdu::Pdu;
+use dicom::ul::pdu::PresentationContextNegotiated;
 use std::convert::identity;
 use std::io::ErrorKind;
 use std::{net::TcpStream, thread, time::Duration};
@@ -11,7 +12,7 @@ use uuid::Uuid;
 pub struct ServerAssociation {
 	uuid: Uuid,
 	channel: Sender<Command>,
-	presentation_contexts: Vec<PresentationContextResult>,
+	presentation_contexts: Vec<PresentationContextNegotiated>,
 	tcp_stream: TcpStream,
 }
 
@@ -84,7 +85,7 @@ impl ServerAssociation {
 						}
 						Command::Receive(response) => {
 							let receive_result =
-								association.receive().map_err(AssociationError::Server);
+								association.receive().map_err(AssociationError::Association);
 							response
 								.send(receive_result)
 								.map_err(|_value| ChannelError::Closed)
@@ -101,7 +102,7 @@ impl ServerAssociation {
 
 				if let Err(e) = association.abort() {
 					match e {
-						dicom::ul::association::server::Error::WireSend { source, .. }
+						dicom::ul::association::Error::WireSend { source, .. }
 							if source.kind() == ErrorKind::BrokenPipe =>
 						{
 							// no-op, happens on MacOS if the TCP stream is already closed
@@ -153,7 +154,7 @@ impl Association for ServerAssociation {
 		}
 	}
 
-	fn presentation_contexts(&self) -> &[PresentationContextResult] {
+	fn presentation_contexts(&self) -> &[PresentationContextNegotiated] {
 		&self.presentation_contexts
 	}
 }