Skip to content

Commit

Permalink
devonfw#1517 removed util package from mavensearch
Browse files Browse the repository at this point in the history
  • Loading branch information
@jan-vcapgemini
jan-vcapgemini committed Nov 3, 2022
1 parent a3a7f4c commit 9854b78
Show file tree
Hide file tree
Showing 19 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion ...util/to/model/AbstractSearchResponse.java → ...arch/to/model/AbstractSearchResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model;
package com.devonfw.cobigen.retriever.mavensearch.to.model;

import java.io.IOException;
import java.net.InetSocketAddress;
Expand Down
10 changes: 5 additions & 5 deletions .../util/to/model/SearchResponseFactory.java → ...earch/to/model/SearchResponseFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model;
package com.devonfw.cobigen.retriever.mavensearch.to.model;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -11,10 +11,10 @@
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.jfrog.JfrogSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.maven.MavenSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2.Nexus2SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus3.Nexus3SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog.JfrogSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.maven.MavenSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2.Nexus2SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3.Nexus3SearchResponse;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
Expand Down
2 changes: 1 addition & 1 deletion ...arch/util/to/model/ServerCredentials.java → ...vensearch/to/model/ServerCredentials.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model;
package com.devonfw.cobigen.retriever.mavensearch.to.model;

/**
*
Expand Down
6 changes: 3 additions & 3 deletions ...l/to/model/jfrog/JfrogSearchResponse.java → ...h/to/model/jfrog/JfrogSearchResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.jfrog;
package com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -12,8 +12,8 @@
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
2 changes: 1 addition & 1 deletion ...odel/jfrog/JfrogSearchResponseResult.java → ...odel/jfrog/JfrogSearchResponseResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.jfrog;
package com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
6 changes: 3 additions & 3 deletions ...l/to/model/maven/MavenSearchResponse.java → ...h/to/model/maven/MavenSearchResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.maven;
package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -12,8 +12,8 @@
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...o/model/maven/MavenSearchResponseDoc.java → ...o/model/maven/MavenSearchResponseDoc.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.maven;
package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...el/maven/MavenSearchResponseResponse.java → ...el/maven/MavenSearchResponseResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.maven;
package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...us2/Nexus2SearchResponeArtifactLinks.java → ...us2/Nexus2SearchResponeArtifactLinks.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
6 changes: 3 additions & 3 deletions ...to/model/nexus2/Nexus2SearchResponse.java → ...to/model/nexus2/Nexus2SearchResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -11,8 +11,8 @@
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...us2/Nexus2SearchResponseArtifactHits.java → ...us2/Nexus2SearchResponseArtifactHits.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...odel/nexus2/Nexus2SearchResponseData.java → ...odel/nexus2/Nexus2SearchResponseData.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;

import java.util.List;

Expand Down
6 changes: 3 additions & 3 deletions ...to/model/nexus3/Nexus3SearchResponse.java → ...to/model/nexus3/Nexus3SearchResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus3;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -12,8 +12,8 @@
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...del/nexus3/Nexus3SearchResponseAsset.java → ...del/nexus3/Nexus3SearchResponseAsset.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus3;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...odel/nexus3/Nexus3SearchResponseItem.java → ...odel/nexus3/Nexus3SearchResponseItem.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus3;
package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/devonfw/cobigen/retriever/mavensearch/util/MavenSearchArtifactRetriever.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.net.URL;
import java.util.List;

import com.devonfw.cobigen.retriever.mavensearch.util.to.model.SearchResponseFactory;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.SearchResponseFactory;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;

/**
* Class for handling the Maven REST Search API and the communication with it.
Expand Down
8 changes: 4 additions & 4 deletions ...triever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchResponseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

import org.junit.Test;

import com.devonfw.cobigen.retriever.mavensearch.util.to.model.jfrog.JfrogSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.maven.MavenSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus2.Nexus2SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.nexus3.Nexus3SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog.JfrogSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.maven.MavenSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2.Nexus2SearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3.Nexus3SearchResponse;
import com.fasterxml.jackson.databind.ObjectMapper;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...iever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.junit.Rule;
import org.junit.Test;

import com.devonfw.cobigen.retriever.mavensearch.util.to.model.SearchResponseFactory;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.SearchResponseFactory;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.junit.WireMockRule;

Expand Down
4 changes: 2 additions & 2 deletions ...ct-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.util.to.model.ServerCredentials;
import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
import com.github.tomakehurst.wiremock.http.Fault;
import com.github.tomakehurst.wiremock.junit.WireMockRule;

Expand Down

0 comments on commit 9854b78

Please sign in to comment.