Merge pull request #69 from eBay/byarger/deps

Updating versions of dependencies noted for security reasons and compatibility

Author: yarg0007

NST/src/main/java/com/ebay/openapi/export/jsonschema/EbayRemoveTypesTransformer.java

@@ -0,0 +1,34 @@
+package com.ebay.openapi.export.jsonschema;
+
+import com.atlassian.oai.validator.schema.transform.SchemaTransformationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class EbayRemoveTypesTransformer extends EbaySchemaTransformer {
+
+    private static final EbayRemoveTypesTransformer INSTANCE = new EbayRemoveTypesTransformer();
+    private static final String TYPES = "types";
+
+    public static EbayRemoveTypesTransformer getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void apply(JsonNode schemaObject, SchemaTransformationContext context) {
+
+        if (schemaObject == null) {
+            return;
+        }
+
+        if (!(context.isRequest() || context.isResponse())) {
+            return;
+        }
+
+        if (schemaObject instanceof ObjectNode && schemaObject.has(TYPES)) {
+            ObjectNode objNode = (ObjectNode) schemaObject;
+            objNode.remove(TYPES);
+        }
+
+        applyToChildSchemas(schemaObject, child -> apply(child, context));
+    }
+}

NST/src/main/java/com/ebay/openapi/export/jsonschema/OpenApiToJsonSchema.java

@@ -335,7 +335,8 @@ private List<EbaySchemaTransformer> createTransformers() {
 				EbaySchemaDefinitionsInjectionTransformer.getInstance(),
 				EbaySchemaRefInjectionTransformer.getInstance(),
 				EbayRemoveExampleSetFlagTransformer.getInstance(),
-				EbayNullableTransformer.getInstance()));
+				EbayNullableTransformer.getInstance(),
+				EbayRemoveTypesTransformer.getInstance()));
 		if (!allowAdditionalProperties) {
 			transformers.add(EbayAdditionalPropertiesInjectionTransformer.getInstance());
 		}

NSTTutorials/ResponseLoggerInjections/src/test/java/com/ebay/nst/tutorials/rest/responseloggerinjections/ResponseLoggerInjectionsTest.java

@@ -14,7 +14,7 @@
 public class ResponseLoggerInjectionsTest implements NSTServiceTestRunner {
 
     private static final String RESPONSE_LOGGER_INJECTIONS_PATH = "src/test/java/com/ebay/nst/tutorials/rest/responseloggerinjections";
-    private static final String GENERATED_MOCK_PATH = RESPONSE_LOGGER_INJECTIONS_PATH + "/ResponseLoggerInjectionsTest_exampleResponseLoggerInjectionMockGenerationTest_0_ResponseLoggerInjectionsWrapper.har";
+    private static final String GENERATED_MOCK_PATH = RESPONSE_LOGGER_INJECTIONS_PATH + "/ResponseLoggerInjectionsTest_exampleResponseLoggerInjectionMockGenerationTest_1_ResponseLoggerInjectionsWrapper.har";
 
     @Test
     public void exampleResponseLoggerInjectionMockGenerationTest() throws Exception {

NSTTutorials/UITestCodeGeneration/src/test/java/com/ebay/nst/tutorials/rest/uitestcodegeneration/UITestCodeGenerationTest.swift

@@ -1,9 +1,26 @@
 
+
 import XCTest
 class UITestCodeGenerationTest {
 
+	// AUTO GENERATED MEMBER FIELD CODE BLOCK - DO NOT MODIFY CONTENTS
+	let caHolidayPageModel = CaHolidayPageModel()
+	// END OF AUTO GENERATED MEMBER FIELD CODE BLOCK
+
 	func test_exampleUiTestCodeGenerationTest() {
 
+		// AUTO GENERATED METHOD CODE BLOCK - DO NOT MODIFY CONTENTS
+		// CORRESPONDING API CALL: UITestCodeGenerationWrapper
+		// OPERATION INDEX: 1
+		// Enter: Output that would trigger this API request as the initial step of the UI test.
+		// END OF AUTO GENERATED METHOD CODE BLOCK
+
+		// AUTO GENERATED METHOD CODE BLOCK - DO NOT MODIFY CONTENTS
+		// CORRESPONDING API CALL: UITestCodeGenerationWrapper
+		// OPERATION INDEX: 2
+		// Navigate: Output that would navigate to the action that would trigger this API request.
+		// END OF AUTO GENERATED METHOD CODE BLOCK
+
 	}
 
 }

NSTTutorials/pom.xml

@@ -41,7 +41,7 @@
         <maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>2.9</maven.surefire.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nstest.version>1.0.4</nstest.version>
+        <nstest.version>1.3.0</nstest.version>
         <nsttutorials.version>0.0.1-SNAPSHOT</nsttutorials.version>
         <testng.version>7.5</testng.version>
         <maven.deploy.skip>true</maven.deploy.skip>

pom.xml

@@ -16,15 +16,15 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<kotlin.version>1.8.10</kotlin.version>
+		<kotlin.version>2.1.0</kotlin.version>
 		<maven.compiler.version>1.8</maven.compiler.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 <!--		<maven.compiler.release>1.8</maven.compiler.release>-->
 		<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
 		<maven.surefire.plugin.version>2.9</maven.surefire.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nstest.version>1.2.3</nstest.version>
+		<nstest.version>1.3.0</nstest.version>
 		<testng.version>7.5</testng.version>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.8.0</version>
+			<version>2.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>32.0.0-android</version>
+			<version>32.1.3-android</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.java-json-tools</groupId>
@@ -88,7 +88,7 @@
 		<dependency>
 			<groupId>com.atlassian.oai</groupId>
 			<artifactId>swagger-request-validator-core</artifactId>
-			<version>2.30.0</version>
+			<version>2.44.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ebay.nst</groupId>