From 9c6c7dbdb82335393fbfe4c1d71c97a3651dbc7a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Jul 2021 18:44:48 +0200
Subject: [virtualizer] Get rid of Generics for VirtualizationConfiguration

---
 .../virtualization/configuration/logic/ConfigurationLogic.java |  2 +-
 .../logic/ConfigurationLogicDozModClientToDozModServer.java    |  4 ++--
 .../logic/ConfigurationLogicDozModServerToDozModClient.java    | 10 ++--------
 .../logic/ConfigurationLogicDozModServerToStatelessClient.java |  8 ++++----
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/main/java/org/openslx/virtualization/configuration/logic')

diff --git a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogic.java b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogic.java
index 018d046..90319e2 100644
--- a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogic.java
+++ b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogic.java
@@ -14,7 +14,7 @@ import org.openslx.virtualization.configuration.transformation.TransformationGen
  * 
  * @param <T> type of configuration data used as input arguments for a transformation.
  */
-public abstract class ConfigurationLogic<T> extends TransformationGeneric<VirtualizationConfiguration<?, ?, ?, ?>, T>
+public abstract class ConfigurationLogic<T> extends TransformationGeneric<VirtualizationConfiguration, T>
 {
 	/**
 	 * Creates a new generic transformation logic for virtualization configurations.
diff --git a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServer.java b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServer.java
index f375693..f5d9a76 100644
--- a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServer.java
+++ b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServer.java
@@ -47,7 +47,7 @@ public class ConfigurationLogicDozModClientToDozModServer
 	 * @param args input arguments for the validation.
 	 * @throws TransformationException validation has failed.
 	 */
-	private void validateInputs( VirtualizationConfiguration<?, ?, ?, ?> config,
+	private void validateInputs( VirtualizationConfiguration config,
 			ConfigurationDataDozModClientToDozModServer args )
 			throws TransformationException
 	{
@@ -59,7 +59,7 @@ public class ConfigurationLogicDozModClientToDozModServer
 	}
 
 	@Override
-	public void transform( VirtualizationConfiguration<?, ?, ?, ?> config,
+	public void transform( VirtualizationConfiguration config,
 			ConfigurationDataDozModClientToDozModServer args )
 			throws TransformationException
 	{
diff --git a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClient.java b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClient.java
index 06c8ad1..acbf4fc 100644
--- a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClient.java
+++ b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClient.java
@@ -4,7 +4,6 @@ import java.util.Map;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.virtualization.configuration.VirtualizationConfiguration;
-import org.openslx.virtualization.configuration.VirtualizationConfiguration.UsbSpeed;
 import org.openslx.virtualization.configuration.VirtualizationConfigurationException;
 import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToDozModClient;
 import org.openslx.virtualization.configuration.transformation.TransformationException;
@@ -63,7 +62,7 @@ public class ConfigurationLogicDozModServerToDozModClient
 	 * @param args input arguments for the validation.
 	 * @throws TransformationException validation has failed.
 	 */
-	private void validateInputs( VirtualizationConfiguration<?, ?, ?, ?> config,
+	private void validateInputs( VirtualizationConfiguration config,
 			ConfigurationDataDozModServerToDozModClient args )
 			throws TransformationException
 	{
@@ -122,7 +121,7 @@ public class ConfigurationLogicDozModServerToDozModClient
 	}
 
 	@Override
-	public void transform( VirtualizationConfiguration<?, ?, ?, ?> config,
+	public void transform( VirtualizationConfiguration config,
 			ConfigurationDataDozModServerToDozModClient args )
 			throws TransformationException
 	{
@@ -188,11 +187,6 @@ public class ConfigurationLogicDozModServerToDozModClient
 		// append second CDROM drive connected to the host's physical drive
 		config.addCdrom( null );
 
-		// set maximum USB speed
-		if ( config.getMaxUsbSpeed() != UsbSpeed.USB3_0 ) {
-			config.setMaxUsbSpeed( UsbSpeed.USB2_0 );
-		}
-
 		// apply settings to edit virtualized system locally
 		try {
 			config.transformEditable();
diff --git a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
index 96d0b91..5dec3d9 100644
--- a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
+++ b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
@@ -2,7 +2,6 @@ package org.openslx.virtualization.configuration.logic;
 
 import org.openslx.virtualization.configuration.VirtualizationConfiguration;
 import org.openslx.virtualization.configuration.VirtualizationConfiguration.EtherType;
-import org.openslx.virtualization.configuration.VirtualizationConfiguration.UsbSpeed;
 import org.openslx.virtualization.configuration.VirtualizationConfigurationException;
 import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToStatelessClient;
 import org.openslx.virtualization.configuration.transformation.TransformationException;
@@ -54,7 +53,7 @@ public class ConfigurationLogicDozModServerToStatelessClient
 	 * @param args input arguments for the validation.
 	 * @throws TransformationException validation has failed.
 	 */
-	private void validateInputs( VirtualizationConfiguration<?, ?, ?, ?> config,
+	private void validateInputs( VirtualizationConfiguration config,
 			ConfigurationDataDozModServerToStatelessClient args )
 			throws TransformationException
 	{
@@ -66,7 +65,7 @@ public class ConfigurationLogicDozModServerToStatelessClient
 	}
 
 	@Override
-	public void transform( VirtualizationConfiguration<?, ?, ?, ?> config,
+	public void transform( VirtualizationConfiguration config,
 			ConfigurationDataDozModServerToStatelessClient args )
 			throws TransformationException
 	{
@@ -103,7 +102,8 @@ public class ConfigurationLogicDozModServerToStatelessClient
 
 		// disable USB if necessary
 		if ( !args.hasUsbAccess() ) {
-			config.setMaxUsbSpeed( UsbSpeed.NONE );
+			// XXX TODO find best way to do this without explicit method
+			// config.setMaxUsbSpeed( UsbSpeed.NONE );
 		}
 	}
 }
-- 
cgit v1.2.3-55-g7522