Update to ArDoCo v2

ArDoCo · Dec 6, 2024 · a7c6627 · a7c6627
1 parent ef700c4
commit a7c6627
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -162,3 +162,5 @@ buildNumber.properties
 # End of https://www.toptal.com/developers/gitignore/api/java,maven,intellij
 
 docker-compose.yml
+.settings
+.flattened-pom.xml
diff --git a/pom.xml b/pom.xml
@@ -1,58 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.0</version>
-    <relativePath />
+ <parent>
+    <groupId>io.github.ardoco</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.0-refactoring</version>
   </parent>
-  <groupId>io.github.ardoco</groupId>
+
   <artifactId>stanfordnlp</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-
+
   <name>StanfordCoreNLP-Provider-Service</name>
   <description>Microservice for Standford Core NLP</description>
-  <properties>
-    <java.version>21</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <maven.compiler.release>${java.version}</maven.compiler.release>
-    <ardoco.core.version>1.0.0</ardoco.core.version>
-    <stanford-corenlp.version>4.5.7</stanford-corenlp.version>
-    <spotless.version>2.44.0.BETA4</spotless.version>
-  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>3.4.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>edu.stanford.nlp</groupId>
-      <artifactId>stanford-corenlp</artifactId>
-      <version>${stanford-corenlp.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>edu.stanford.nlp</groupId>
-      <artifactId>stanford-corenlp</artifactId>
-      <version>${stanford-corenlp.version}</version>
-      <classifier>models</classifier>
-    </dependency>
     <dependency>
       <groupId>io.github.ardoco.core</groupId>
       <artifactId>common</artifactId>
-      <version>${ardoco.core.version}</version>
+      <version>${ardoco.version}</version>
     </dependency>
     <dependency>
       <groupId>io.github.ardoco.core</groupId>
       <artifactId>text-provider-json</artifactId>
-      <version>${ardoco.core.version}</version>
+      <version>${ardoco.version}</version>
     </dependency>
     <dependency>
       <groupId>io.github.ardoco.tlr</groupId>
       <artifactId>text-preprocessing</artifactId>
-      <version>${ardoco.core.version}</version>
+      <version>${ardoco.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -74,7 +65,6 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.20.4</version>
     </dependency>
   </dependencies>
 

diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/stanfordnlp/corenlp/TextRequestBody.java b/src/main/java/edu/kit/kastel/mcse/ardoco/stanfordnlp/corenlp/TextRequestBody.java
@@ -1,15 +1,9 @@
 package edu.kit.kastel.mcse.ardoco.stanfordnlp.corenlp;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class TextRequestBody {
-    private static final Logger logger = LoggerFactory.getLogger(TextRequestBody.class);
 
     private String text;
 
@@ -26,6 +20,6 @@ public void setText(String text) {
     }
 
     public String getText() {
-        return text;
+        return this.text;
     }
 }