Review internal dependencies

giis-uniovi · Jun 23, 2024 · bcc6cc1 · bcc6cc1
1 parent 0f44eeb
commit bcc6cc1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 
 		<httpclient-version>5.3.1</httpclient-version>
 
-		<!-- datagen still using httpclient4, pending migration -->
+		<!-- store-loader still using httpclient4 to call REST APIs, pending migration -->
 		<httpclient4-version>4.5.14</httpclient4-version>
 
 		<mockserver.version>5.15.0</mockserver.version>
@@ -51,7 +51,7 @@
 				<version>${portable.version}</version>
 			</dependency>
 
-			<!-- Dependencias para OpenApi (para jackson usa el bom pues hay muchas dependencias) -->
+			<!-- OpenApi dependencies (uses the jackson bom as many modules are used) -->
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>
@@ -65,7 +65,6 @@
 				<artifactId>httpclient5</artifactId>
 				<version>${httpclient-version}</version>
 			</dependency>
-			<!-- Aunque openapi usa httpclient5, datagen todavia necesita httpclient4 -->
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
@@ -76,7 +75,7 @@
 			    <artifactId>commons-lang3</artifactId>
 			    <version>3.14.0</version>
 			</dependency>
-			<!-- otras dependencias -->
+			<!-- other dependencies -->
 			<dependency>
 				<groupId>io.swagger.parser.v3</groupId>
 				<artifactId>swagger-parser</artifactId>
@@ -98,7 +97,7 @@
 				<version>1.3.2</version>
 			</dependency>
 
-			<!-- Mock de servicios, si hay problemas de dependencias usar el artefacto shaded, https://github.com/mock-server/mockserver -->
+			<!-- Service mocks, if any problem with dependencies, use the shaded artifact: https://github.com/mock-server/mockserver -->
 			<dependency>
 				<groupId>org.mock-server</groupId>
 				<artifactId>mockserver-netty</artifactId>
@@ -124,7 +123,7 @@
 				<scope>test</scope>
 			</dependency>
 
-			<!--Exclusivas para ejecucion de test -->
+			<!-- Only for test -->
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>

diff --git a/tdrules-client-oa/pom.xml b/tdrules-client-oa/pom.xml
@@ -31,11 +31,6 @@
 			<artifactId>tdrules-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.github.giis-uniovi</groupId>
-			<artifactId>tdrules-store-shared</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>io.swagger.parser.v3</groupId>

diff --git a/tdrules-client-oa/src/main/java/giis/tdrules/client/oa/transform/SchemaTransformer.java b/tdrules-client-oa/src/main/java/giis/tdrules/client/oa/transform/SchemaTransformer.java
@@ -14,7 +14,6 @@
 import giis.tdrules.openapi.model.TdCheck;
 import giis.tdrules.openapi.model.TdEntity;
 import giis.tdrules.openapi.model.TdSchema;
-import giis.tdrules.store.dtypes.DataTypes;
 import io.swagger.v3.oas.models.media.Schema;
 
 /**
@@ -35,7 +34,7 @@ public SchemaTransformer(Map<String, Schema> oaSchemas, OaSchemaLogger oaLogger)
 		this.oaSchemas = oaSchemas;
 		this.oaLogger = oaLogger;
 		this.ct = new CompositeTransformer(this);
-		this.tdSchema = new TdSchema().storetype(DataTypes.OA_DBMS_VENDOR_NAME);
+		this.tdSchema = new TdSchema().storetype("openapi");
 		this.upstreamAttr = new UpstreamAttribute(this.tdSchema);
 	}
 

diff --git a/tdrules-store-loader/pom.xml b/tdrules-store-loader/pom.xml
@@ -31,6 +31,7 @@
 			<artifactId>tdrules-store-shared</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>io.github.giis-uniovi</groupId>
 			<artifactId>tdrules-client-rdb</artifactId>