Skip to content

[SRVLOGIC-1137] Restore host in ProcessDefinition serviceUrl #133

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

Merged
baldimir merged 1 commit into from
Aug 21, 2026
Merged

[SRVLOGIC-1137] Restore host in ProcessDefinition serviceUrl #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions ...ndex-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@
*/
package org.kie.kogito.index.graphql;

import java.net.URI;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.ServiceLoader.Provider;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
Expand All @@ -30,8 +35,14 @@
import org.kie.kogito.index.graphql.query.GraphQLQueryOrderByParser;
import org.kie.kogito.index.graphql.query.GraphQLQueryParser;
import org.kie.kogito.index.graphql.query.GraphQLQueryParserRegistry;
import org.kie.kogito.index.model.*;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.Node;
import org.kie.kogito.index.model.NodeInstance;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.model.ProcessDefinitionKey;
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.model.Timer;
import org.kie.kogito.index.model.URIInfo;
import org.kie.kogito.index.service.DataIndexServiceException;
import org.kie.kogito.index.storage.DataIndexStorageService;
import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
Expand Down Expand Up @@ -157,7 +168,7 @@ public String getProcessDefinitionServiceUrl(DataFetchingEnvironment env) {
if (source == null || source.getEndpoint() == null) {
return null;
}
return URI.create(source.getEndpoint()).getPath();
return URIInfo.buildURIInfo(source).truncatedURI().toString();
}

public String getProcessInstanceServiceUrl(DataFetchingEnvironment env) {
Expand Down
37 changes: 37 additions & 0 deletions ...e-common/src/test/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.kie.kogito.index.service.graphql;

import org.junit.jupiter.api.Test;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.model.ProcessInstance;
Comment on lines 21 to 23

@baldimir baldimir Aug 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mcruzdev please take a look at this.

import org.mockito.Mockito;

Expand Down Expand Up @@ -55,6 +56,24 @@ public void testUrlProcessIdServiceUrl() {
assertThat(schemaManager.getProcessInstanceServiceUrl(getEnv("demo.orderItems", "http://localhost:8080/orderItems"))).isEqualTo("http://localhost:8080");
}

@Test
public void testNullProcessDefinitionServiceUrl() {
assertThat(schemaManager.getProcessDefinitionServiceUrl(getDefEnv(null, null, null))).isNull();
assertThat(schemaManager.getProcessDefinitionServiceUrl(getDefEnv("travels", null, null))).isNull();
}

@Test
public void testUrlProcessDefinitionServiceUrl() {
assertThat(schemaManager.getProcessDefinitionServiceUrl(getDefEnv("travels", "1.0", "http://localhost:8080/travels"))).isEqualTo("http://localhost:8080");
assertThat(schemaManager.getProcessDefinitionServiceUrl(getDefEnv("travels", "http://travels.example.com/travels"))).isEqualTo("http://travels.example.com");
}

@Test
public void testUrlWithVersionProcessDefinitionServiceUrl() {
assertThat(schemaManager.getProcessDefinitionServiceUrl(getDefEnv("callbackstatetimeouts", "0.0.1", "http://callbackstatetimeouts.example.com/callbackstatetimeouts/0.0.1")))
.isEqualTo("http://callbackstatetimeouts.example.com");
}

private DataFetchingEnvironment getEnv(String processId, String endpoint) {
DataFetchingEnvironment env = Mockito.mock(DataFetchingEnvironment.class);
Mockito.when(env.getSource()).thenReturn(getProcessInstance(processId, endpoint));
Expand All @@ -67,4 +86,22 @@ private ProcessInstance getProcessInstance(String processId, String endpoint) {
pi.setEndpoint(endpoint);
return pi;
}

private DataFetchingEnvironment getDefEnv(String id, String endpoint) {
return getDefEnv(id, null, endpoint);
}

private DataFetchingEnvironment getDefEnv(String id, String version, String endpoint) {
DataFetchingEnvironment env = Mockito.mock(DataFetchingEnvironment.class);
Mockito.when(env.getSource()).thenReturn(getProcessDefinition(id, version, endpoint));
return env;
}

private ProcessDefinition getProcessDefinition(String id, String version, String endpoint) {
ProcessDefinition pd = new ProcessDefinition();
pd.setId(id);
pd.setVersion(version);
pd.setEndpoint(endpoint);
return pd;
}
}
Loading