move tmc-langs-abstraction inside tmc-langs-framework

Author: Heliozoa

Cargo.toml

@@ -1,6 +1,5 @@
 [workspace]
 members =[
-    "tmc-langs-abstraction",
     "tmc-langs-cli",
     "tmc-langs-core",
     "tmc-langs-csharp",

README.md

@@ -48,10 +48,6 @@ Documentation and binaries for the supported targets are built and deployed to G
 
 ## Included projects
 
-### tmc-langs-abstraction
-
-A library containing some common types.
-
 ### tmc-langs-cli
 
 A binary CLI interface for TMC-langs for IDEs.

tmc-langs-abstraction/Cargo.toml

@@ -6,8 +6,10 @@ pub use policy::CSharpStudentFilePolicy;
 use crate::{CSTestResult, CSharpError};
 
 use tmc_langs_framework::{
-    domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
-    plugin::{Language, Strategy, ValidationResult},
+    domain::{
+        ExerciseDesc, RunResult, RunStatus, Strategy, TestDesc, TestResult, ValidationResult,
+    },
+    plugin::Language,
     CommandWithTimeout, LanguagePlugin, OutputWithTimeout, TmcError,
 };
 

tmc-langs-abstraction/src/lib.rs

@@ -5,7 +5,6 @@ authors = ["Daniel Martinez <daniel.x.martinez@helsinki.fi>"]
 edition = "2018"
 
 [dependencies]
-tmc-langs-abstraction = { path = "../tmc-langs-abstraction" }
 regex = "1"
 lazy_static = "1"
 log = "0.4"

tmc-langs-csharp/src/plugin.rs

@@ -209,6 +209,30 @@ pub enum IntOrString {
     String(String),
 }
 
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum Strategy {
+    Fail,
+    Warn,
+    Disabled,
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct ValidationError {
+    pub column: usize,
+    pub line: usize,
+    pub message: String,
+    pub source_name: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct ValidationResult {
+    pub strategy: Strategy,
+    pub validation_errors: Option<HashMap<PathBuf, Vec<ValidationError>>>,
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

tmc-langs-framework/Cargo.toml

@@ -1,10 +1,10 @@
 //! Contains LanguagePlugin.
 
 pub use isolang::Language;
-pub use tmc_langs_abstraction::{Strategy, ValidationError, ValidationResult};
 
 use super::domain::{
     ExerciseDesc, ExercisePackagingConfiguration, RunResult, RunStatus, TestResult, TmcProjectYml,
+    ValidationResult,
 };
 use super::io::{submission_processing, zip};
 use super::policy::StudentFilePolicy;

tmc-langs-framework/src/domain.rs

@@ -13,8 +13,8 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::time::Duration;
 use tmc_langs_framework::{
-    domain::{ExerciseDesc, RunResult},
-    plugin::{Language, LanguagePlugin, ValidationResult},
+    domain::{ExerciseDesc, RunResult, ValidationResult},
+    plugin::{Language, LanguagePlugin},
     TmcError,
 };
 use walkdir::WalkDir;
@@ -297,7 +297,7 @@ impl JavaPlugin for AntPlugin {
 mod test {
     use super::*;
     use tempfile::{tempdir, TempDir};
-    use tmc_langs_framework::plugin::Strategy;
+    use tmc_langs_framework::domain::Strategy;
 
     fn init() {
         let _ = env_logger::builder().is_test(true).try_init();

tmc-langs-framework/src/plugin.rs

@@ -15,8 +15,8 @@ use std::process::{Command, Stdio};
 use std::time::Duration;
 use tar::Archive;
 use tmc_langs_framework::{
-    domain::{ExerciseDesc, RunResult},
-    plugin::{Language, LanguagePlugin, ValidationResult},
+    domain::{ExerciseDesc, RunResult, ValidationResult},
+    plugin::{Language, LanguagePlugin},
     TmcError,
 };
 
@@ -274,7 +274,7 @@ mod test {
     use super::super::{TestCase, TestCaseStatus};
     use super::*;
     use tempfile::{tempdir, TempDir};
-    use tmc_langs_framework::plugin::Strategy;
+    use tmc_langs_framework::domain::Strategy;
     use walkdir::WalkDir;
 
     #[cfg(windows)]

tmc-langs-java/src/ant.rs

@@ -9,8 +9,8 @@ use std::fs::{self, File};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use tmc_langs_framework::{
-    domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
-    plugin::{Language, LanguagePlugin, ValidationResult},
+    domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult, ValidationResult},
+    plugin::{Language, LanguagePlugin},
 };
 use walkdir::WalkDir;
 

tmc-langs-java/src/maven.rs

@@ -5,7 +5,6 @@ authors = ["Daniel Martinez <daniel.x.martinez@helsinki.fi>"]
 edition = "2018"
 
 [dependencies]
-tmc-langs-abstraction = { path = "../tmc-langs-abstraction" }
 tmc-langs-csharp = { path = "../tmc-langs-csharp" }
 tmc-langs-framework = { path = "../tmc-langs-framework" }
 tmc-langs-java = { path = "../tmc-langs-java" }

tmc-langs-java/src/plugin.rs

@@ -2,9 +2,11 @@
 
 pub mod task_executor;
 
-pub use tmc_langs_abstraction::{Strategy, ValidationResult};
 pub use tmc_langs_framework::{
-    domain::{ExerciseDesc, ExercisePackagingConfiguration, RunResult, RunStatus},
+    domain::{
+        ExerciseDesc, ExercisePackagingConfiguration, RunResult, RunStatus, Strategy,
+        ValidationResult,
+    },
     plugin::Language,
     TmcError,
 };