diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 744b358a..9698c6be 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -43,7 +43,7 @@ jobs:
secrets:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
- OSSRH_URL: ${{ secrets.RELEASE_URL }}
+ OSSRH_URL: ${{ secrets.OSSRH_CENTRAL_URL }}
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/data-share/data-share-service/pom.xml b/data-share/data-share-service/pom.xml
index 41be473b..47b6d622 100644
--- a/data-share/data-share-service/pom.xml
+++ b/data-share/data-share-service/pom.xml
@@ -5,16 +5,17 @@
io.mosip.datashare
data-share
- 1.2.0.1
+ 1.2.0.2-SNAPSHOT
data-share-service
- 1.2.0.1
+ 1.2.0.2-SNAPSHOT
data-share-service
UTF-8
1.5.10
+ 0.7.0
@@ -152,10 +153,29 @@
true
-
+
+
+ ossrh
+ https://central.sonatype.com/repository/maven-snapshots/
+
+
+ ossrh
+ https://central.sonatype.com/api/v1/publisher
+
+
+
+ org.sonatype.central
+ central-publishing-maven-plugin
+ ${central.publishing.maven.plugin.version}
+ true
+
+ ossrh
+ false
+
+
org.springframework.boot
spring-boot-maven-plugin
@@ -170,6 +190,9 @@
build-info
repackage
+
+ false
+
@@ -196,8 +219,21 @@
ZIP
+
+
+ build-info-repackage
+
+ build-info
+ repackage
+
+
+ false
+
+
+
pre-integration-test
+ pre-integration-test
start
@@ -215,18 +251,14 @@
+
post-integration-test
+ post-integration-test
stop
-
-
- build-info
- repackage
-
-
diff --git a/data-share/data-share-service/src/main/java/io/mosip/datashare/service/impl/DataShareServiceImpl.java b/data-share/data-share-service/src/main/java/io/mosip/datashare/service/impl/DataShareServiceImpl.java
index 27522a6d..54ba84f2 100644
--- a/data-share/data-share-service/src/main/java/io/mosip/datashare/service/impl/DataShareServiceImpl.java
+++ b/data-share/data-share-service/src/main/java/io/mosip/datashare/service/impl/DataShareServiceImpl.java
@@ -302,8 +302,8 @@ private boolean getAndUpdateMetaData(String randomShareKey, String policyId, Str
int transactionAllowed = Integer.parseInt((String) metaDataMap.get(TRANSACTIONSALLOWED));
if(transactionAllowed >= 1) {
isDataShareAllow=true;
- objectStoreAdapter.decMetadata(subcriberId, policyId, null, null, randomShareKey,
- "transactionsallowed");
+ metaDataMap.put(TRANSACTIONSALLOWED, transactionAllowed- 1);
+ objectStoreAdapter.addObjectMetaData(subcriberId, policyId, null, null, randomShareKey, metaDataMap);
LOGGER.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.POLICYID.toString(), policyId,
"Successfully update the metadata");
}
diff --git a/data-share/data-share-service/src/main/java/io/mosip/datashare/util/RestUtil.java b/data-share/data-share-service/src/main/java/io/mosip/datashare/util/RestUtil.java
index 43485de3..27f67f52 100644
--- a/data-share/data-share-service/src/main/java/io/mosip/datashare/util/RestUtil.java
+++ b/data-share/data-share-service/src/main/java/io/mosip/datashare/util/RestUtil.java
@@ -18,10 +18,10 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.TrustStrategy;
+import org.springframework.beans.factory.annotation.Value;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@@ -56,12 +56,19 @@
@Component
public class RestUtil {
+ @Value("${mosip.data.share.restTemplate.max-connection-per-route:20}")
+ private int maxConnectionPerRoute;
+
+ @Value("${mosip.data.share.restTemplate.total-max-connections:100}")
+ private int totalMaxConnection;
+
/** The environment. */
@Autowired
private Environment environment;
/** The Constant AUTHORIZATION. */
private static final String AUTHORIZATION = "Authorization=";
+
private RestTemplate localRestTemplate;
@PostConstruct
@@ -216,9 +223,11 @@ public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgor
SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
.loadTrustMaterial(null, acceptingTrustStrategy).build();
SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
- CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
+ HttpClientBuilder httpClientBuilder = HttpClients.custom().setMaxConnPerRoute(maxConnectionPerRoute)
+ .setMaxConnTotal(totalMaxConnection).setSSLSocketFactory(csf);
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
- requestFactory.setHttpClient(httpClient);
+
+ requestFactory.setHttpClient(httpClientBuilder.build());
localRestTemplate = new RestTemplate(requestFactory);
}
return localRestTemplate;
diff --git a/data-share/pom.xml b/data-share/pom.xml
index aba4b6c1..27ba47a6 100644
--- a/data-share/pom.xml
+++ b/data-share/pom.xml
@@ -5,11 +5,11 @@
io.mosip.datashare
durian
- 1.2.0.1
+ 1.2.0.2-SNAPSHOT
data-share
- 1.2.0.1
+ 1.2.0.2-SNAPSHOT
pom
data-share
@@ -45,6 +45,16 @@
data-share-service
+
+
+ ossrh
+ https://central.sonatype.com/repository/maven-snapshots/
+
+
+ ossrh
+ https://central.sonatype.com/api/v1/publisher
+
+
diff --git a/pom.xml b/pom.xml
index fce02bb9..da1ccee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
io.mosip.datashare
durian
- 1.2.0.1
+ 1.2.0.2-SNAPSHOT
pom
MOSIP Durian Parent POM
@@ -36,9 +36,9 @@
- ossrh
- CentralRepository
- https://oss.sonatype.org/content/repositories/snapshots
+ ossrh-central
+ MavenCentralRepository
+ https://central.sonatype.com/repository/maven-snapshots
default
true
@@ -58,24 +58,23 @@
ossrh
- https://oss.sonatype.org/content/repositories/snapshots
+ https://central.sonatype.com/repository/maven-snapshots/
ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ https://central.sonatype.com/api/v1/publisher
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.7
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.7.0
true
- ossrh
- https://oss.sonatype.org/
- false
+ ossrh
+ false