Skip to content

Migrate from URL to URI #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodion-goritskov wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Migrate from URL to URI #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87642dd
Change Endpoint type from URL to URI
rodion-goritskov Feb 18, 2023
01abb9a
Remove unneeded code
rodion-goritskov Feb 18, 2023
5d29631
Remove unnecessary imports
rodion-goritskov Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/test/groovy/org/openstack4j/api/identity/v3/KeystoneServiceEndpointServiceSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class KeystoneServiceEndpointServiceSpec extends AbstractSpec {
def static final String SERVICE_CRUD_DESCRIPTION = "A service used for tests."
def static final String SERVICE_CRUD_DESCRIPTION_UPDATE = "A updated service used for tests."
def static final String ENDPOINT_CRUD_NAME = "Endpoint_CRUD"
def static final URL ENDPOINT_CRUD_URL = new URL("http", "devstack.openstack.stack", 5000, "/v3")
def static final URL ENDPOINT_CRUD_URL_UPDATE = new URL("http", "stack.openstack.devstack", 5000, "/v3");
def static final URI ENDPOINT_CRUD_URL = new URL("http", "devstack.openstack.stack", 5000, "/v3").toURI()
def static final URI ENDPOINT_CRUD_URL_UPDATE = new URL("http", "stack.openstack.devstack", 5000, "/v3").toURI();
def static final Facing ENDPOINT_CRUD_IFACE = Facing.ADMIN
def static final String ENDPOINT_CRUD_REGIONID = "RegionOne"
def String SERVICE_CRUD_ID
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/openstack4j/api/identity/v3/ServiceEndpointService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openstack4j.api.identity.v3;

import java.net.URL;
import java.net.URI;
import java.util.List;

import org.openstack4j.api.types.Facing;
Expand Down Expand Up @@ -84,13 +84,13 @@ public interface ServiceEndpointService extends RestService {
* Creates a new endpoint
*
* @param name the name of the endpoint
* @param url the url of the endpont
* @param url the url of the endpoint
* @param iface the interface type of the endpoint
* @param regionId the region id of the region that contains the endpoint
* @param serviceId the service id of the service the endpoint belongs to
* @param enabled the enabled status of the endpoint
*/
Endpoint createEndpoint(String name, URL url, Facing iface, String regionId, String serviceId, boolean enabled);
Endpoint createEndpoint(String name, URI url, Facing iface, String regionId, String serviceId, boolean enabled);

/**
* Get details for an endpoint
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/openstack4j/model/identity/v3/Endpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openstack4j.model.identity.v3;

import java.net.URL;
import java.net.URI;
import java.util.Map;

import org.openstack4j.api.types.Facing;
Expand Down Expand Up @@ -60,7 +60,7 @@ public interface Endpoint extends ModelEntity, Buildable<EndpointBuilder> {
/**
* @return the URL of the endpoint
*/
URL getUrl();
URI getUrl();

/**
* @return the Links of the endpoint
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/openstack4j/model/identity/v3/builder/EndpointBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openstack4j.model.identity.v3.builder;

import java.net.URL;
import java.net.URI;
import java.util.Map;

import org.openstack4j.api.types.Facing;
Expand Down Expand Up @@ -55,7 +55,7 @@ public interface EndpointBuilder extends Builder<EndpointBuilder, Endpoint> {
/**
* @see Endpoint#getUrl()
*/
EndpointBuilder url(URL url);
EndpointBuilder url(URI url);

/**
* @see Endpoint#getLinks()
Expand Down
1 change: 0 additions & 1 deletion ...src/main/java/org/openstack4j/openstack/identity/internal/DefaultEndpointURLResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
import java.util.Optional;
import java.util.SortedSet;
import java.util.concurrent.ConcurrentHashMap;

Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/org/openstack4j/openstack/identity/v3/domain/KeystoneEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openstack4j.openstack.identity.v3.domain;

import java.net.URL;
import java.net.URI;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -36,7 +36,7 @@ public class KeystoneEndpoint implements Endpoint {
@JsonProperty("region_id")
private String regionId;
@JsonProperty
private URL url;
private URI url;
private Map<String, String> links;
private Boolean enabled = true;

Expand Down Expand Up @@ -123,7 +123,7 @@ public String getRegionId() {
* @return {@inheritDoc}
*/
@Override
public URL getUrl() {
public URI getUrl() {
return url;
}

Expand Down Expand Up @@ -302,7 +302,7 @@ public EndpointBuilder region(String region) {
* @see KeystoneEndpoint#getUrl()
*/
@Override
public EndpointBuilder url(URL url) {
public EndpointBuilder url(URI url) {
model.url = url;
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/openstack4j/openstack/identity/v3/internal/ServiceEndpointServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openstack4j.openstack.identity.v3.internal;

import java.net.URL;
import java.net.URI;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -72,7 +72,7 @@ public Endpoint createEndpoint(Endpoint endpoint) {
}

@Override
public Endpoint createEndpoint(String name, URL url, Facing iface, String regionId, String serviceId, boolean enabled) {
public Endpoint createEndpoint(String name, URI url, Facing iface, String regionId, String serviceId, boolean enabled) {
Objects.requireNonNull(name);
Objects.requireNonNull(url);
Objects.requireNonNull(iface);
Expand Down