refs #2126 - change safe-url-resolver package

swagger-api · Nov 18, 2024 · 3b35ca0 · 3b35ca0
1 parent 1bc2e79
commit 3b35ca0
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/modules/swagger-parser-safe-url-resolver/README.md b/modules/swagger-parser-safe-url-resolver/README.md
@@ -23,19 +23,19 @@ This behavior can also be customized with the allowlist and denylist in the cons
 Add the following to you `pom.xml` file under `dependencies`
 ```xml
 <dependency>
-    <groupId>io.swagger.parser.v3</groupId>
+    <groupId>io.swagger</groupId>
     <artifactId>swagger-parser-safe-url-resolver</artifactId>
     // version of swagger-parser being used
-    <version>2.1.14</version> 
+    <version>${swagger-parser-v1-version}</version> 
 </dependency>
 ```
 
 ## Example usage
 
 ```java
-import io.swagger.v3.parser.urlresolver.PermittedUrlsChecker;
-import io.swagger.v3.parser.urlresolver.exceptions.HostDeniedException;
-import io.swagger.v3.parser.urlresolver.models.ResolvedUrl;
+import io.swagger.parser.urlresolver.PermittedUrlsChecker;
+import io.swagger.parser.urlresolver.exceptions.HostDeniedException;
+import io.swagger.parser.urlresolver.models.ResolvedUrl;
 
 import java.util.List;
 

diff --git a/...ser/urlresolver/PermittedUrlsChecker.java → ...ser/urlresolver/PermittedUrlsChecker.java b/...ser/urlresolver/PermittedUrlsChecker.java → ...ser/urlresolver/PermittedUrlsChecker.java
@@ -1,9 +1,9 @@
-package io.swagger.v3.parser.urlresolver;
+package io.swagger.parser.urlresolver;
 
-import io.swagger.v3.parser.urlresolver.exceptions.HostDeniedException;
-import io.swagger.v3.parser.urlresolver.matchers.UrlPatternMatcher;
-import io.swagger.v3.parser.urlresolver.models.ResolvedUrl;
-import io.swagger.v3.parser.urlresolver.utils.NetUtils;
+import io.swagger.parser.urlresolver.exceptions.HostDeniedException;
+import io.swagger.parser.urlresolver.matchers.UrlPatternMatcher;
+import io.swagger.parser.urlresolver.models.ResolvedUrl;
+import io.swagger.parser.urlresolver.utils.NetUtils;
 
 import java.net.InetAddress;
 import java.net.MalformedURLException;

diff --git a/...olver/exceptions/HostDeniedException.java → ...olver/exceptions/HostDeniedException.java b/...olver/exceptions/HostDeniedException.java → ...olver/exceptions/HostDeniedException.java
@@ -1,4 +1,4 @@
-package io.swagger.v3.parser.urlresolver.exceptions;
+package io.swagger.parser.urlresolver.exceptions;
 
 public class HostDeniedException extends Exception {
     public HostDeniedException(String message) {

diff --git a/...lresolver/matchers/UrlPatternMatcher.java → ...lresolver/matchers/UrlPatternMatcher.java b/...lresolver/matchers/UrlPatternMatcher.java → ...lresolver/matchers/UrlPatternMatcher.java
@@ -1,6 +1,6 @@
-package io.swagger.v3.parser.urlresolver.matchers;
+package io.swagger.parser.urlresolver.matchers;
 
-import io.swagger.v3.parser.urlresolver.utils.NetUtils;
+import io.swagger.parser.urlresolver.utils.NetUtils;
 
 import java.net.IDN;
 import java.net.MalformedURLException;

diff --git a/...arser/urlresolver/models/ResolvedUrl.java → ...arser/urlresolver/models/ResolvedUrl.java b/...arser/urlresolver/models/ResolvedUrl.java → ...arser/urlresolver/models/ResolvedUrl.java
@@ -1,4 +1,4 @@
-package io.swagger.v3.parser.urlresolver.models;
+package io.swagger.parser.urlresolver.models;
 
 public class ResolvedUrl {
 

diff --git a/...v3/parser/urlresolver/utils/NetUtils.java → ...er/parser/urlresolver/utils/NetUtils.java b/...v3/parser/urlresolver/utils/NetUtils.java → ...er/parser/urlresolver/utils/NetUtils.java
@@ -1,4 +1,4 @@
-package io.swagger.v3.parser.urlresolver.utils;
+package io.swagger.parser.urlresolver.utils;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;

diff --git a/...urlresolver/PermittedUrlsCheckerTest.java → ...urlresolver/PermittedUrlsCheckerTest.java b/...urlresolver/PermittedUrlsCheckerTest.java → ...urlresolver/PermittedUrlsCheckerTest.java
@@ -1,8 +1,8 @@
-package io.swagger.v3.parser.urlresolver;
+package io.swagger.parser.urlresolver;
 
-import io.swagger.v3.parser.urlresolver.exceptions.HostDeniedException;
-import io.swagger.v3.parser.urlresolver.models.ResolvedUrl;
-import io.swagger.v3.parser.urlresolver.utils.NetUtils;
+import io.swagger.parser.urlresolver.exceptions.HostDeniedException;
+import io.swagger.parser.urlresolver.models.ResolvedUrl;
+import io.swagger.parser.urlresolver.utils.NetUtils;
 import mockit.*;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;

diff --git a/...olver/matchers/UrlPatternMatcherTest.java → ...olver/matchers/UrlPatternMatcherTest.java b/...olver/matchers/UrlPatternMatcherTest.java → ...olver/matchers/UrlPatternMatcherTest.java
@@ -1,4 +1,4 @@
-package io.swagger.v3.parser.urlresolver.matchers;
+package io.swagger.parser.urlresolver.matchers;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;

diff --git a/...arser/urlresolver/utils/NetUtilsTest.java → ...arser/urlresolver/utils/NetUtilsTest.java b/...arser/urlresolver/utils/NetUtilsTest.java → ...arser/urlresolver/utils/NetUtilsTest.java
@@ -1,4 +1,4 @@
-package io.swagger.v3.parser.urlresolver.utils;
+package io.swagger.parser.urlresolver.utils;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;

diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/ResolverCache.java b/modules/swagger-parser/src/main/java/io/swagger/parser/ResolverCache.java
@@ -14,8 +14,8 @@
 import io.swagger.models.refs.RefFormat;
 import io.swagger.models.refs.RefType;
 import io.swagger.parser.util.*;
-import io.swagger.v3.parser.urlresolver.PermittedUrlsChecker;
-import io.swagger.v3.parser.urlresolver.exceptions.HostDeniedException;
+import io.swagger.parser.urlresolver.PermittedUrlsChecker;
+import io.swagger.parser.urlresolver.exceptions.HostDeniedException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;