Skip to content

Update the service URL with http #18

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
ravinperera00 merged 2 commits into from
Sep 4, 2025
Merged

Update the service URL with http #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1335951
[Automated] Update the native jar versions
SasinduDilshara Sep 3, 2025
1453022
Update localhost value with http
SasinduDilshara Sep 3, 2025
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
6 changes: 3 additions & 3 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "data.jsondata"
version = "1.1.0"
version = "1.1.1"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.object"}
Expand All @@ -73,7 +73,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "http"
version = "2.14.0"
version = "2.14.4"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -240,7 +240,7 @@ modules = [
[[package]]
org = "ballerina"
name = "oauth2"
version = "2.14.0"
version = "2.14.1"
dependencies = [
{org = "ballerina", name = "cache"},
{org = "ballerina", name = "crypto"},
Expand Down
8 changes: 6 additions & 2 deletions native/src/main/java/io/ballerina/wso2/apim/catalog/ServiceCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;

import static io.ballerina.wso2.apim.catalog.utils.Constants.BALLERINA;
import static io.ballerina.wso2.apim.catalog.utils.Constants.HTTP_PACKAGE_NAME;
import static io.ballerina.wso2.apim.catalog.utils.Constants.SLASH;
import static io.ballerina.wso2.apim.catalog.utils.Utils.createMd5Hash;
import static io.ballerina.wso2.apim.catalog.utils.Utils.generateBasePath;
import static io.ballerina.wso2.apim.catalog.utils.Utils.getDefinitionType;
Expand Down Expand Up @@ -178,10 +180,12 @@ private static void updateServiceName(BMap<BString, Object> artifactValues, Http
}

private static void updateServiceUrl(BMap<BString, Object> artifactValues, HttpServiceConfig httpServiceConfig) {
String basePath = httpServiceConfig.basePath.equals(LOCALHOST) ? "" : httpServiceConfig.basePath;
String basePathConfig = httpServiceConfig.basePath;
String basePath = basePathConfig.equals(SLASH) ? "" : basePathConfig;
boolean isLocalHost = Objects.equals(httpServiceConfig.host, LOCALHOST);
artifactValues.put(StringUtils.fromString(SERVICE_URL),
StringUtils.fromString(httpServiceConfig.host +
COLON + httpServiceConfig.port + basePath));
(isLocalHost ? (COLON + httpServiceConfig.port) : "") + basePath));
artifactValues.put(StringUtils.fromString(DEFINITION_URL),
StringUtils.fromString(httpServiceConfig.definitionUrl));
}
Expand Down
2 changes: 1 addition & 1 deletion native/src/main/java/io/ballerina/wso2/apim/catalog/utils/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public final class Constants {
public static final String HTTP_MODULE_NAME = "ballerina/http";
public static final String HTTP_ANNOTATION_NAME = "ServiceConfig";
public static final String HOST = "host";
public static final String LOCALHOST = "localhost";
public static final String LOCALHOST = "http://localhost";
public static final String PORT = "port";
public static final String OAS3 = "OAS3";
public static final String BASIC = "BASIC";
Expand Down
Loading