Skip to content

Commit

Permalink
MOSIP-32460 id repo resolved review comment and removed pom duplicacy…
Browse files Browse the repository at this point in the history 
… issue

Signed-off-by: Neha Farheen <[email protected]>
  • Loading branch information
Neha Farheen committed Jun 10, 2024
1 parent 2baa321 commit a10da8c
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 150 deletions.
4 changes: 4 additions & 0 deletions ...o/mosip/credential/request/generator/batch/config/CredentialScheduleJobConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
import io.mosip.kernel.core.exception.ExceptionUtils;
import io.mosip.kernel.core.logger.spi.Logger;

/**
* @author Neha Farheen The Class RestUtil.
*/

@Configuration
public class CredentialScheduleJobConfiguration {

Expand Down
7 changes: 0 additions & 7 deletions ...-request-generator/src/main/java/io/mosip/credential/request/generator/util/RestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.util.List;
import java.util.Objects;


/**
* @author Sowmya The Class RestUtil.
*/
Expand Down Expand Up @@ -188,10 +187,6 @@ public <T> T getApi(ApiName apiName, List<String> pathsegments, String queryPara
public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
if (restTemplate == null) {


// HttpClientBuilder httpClientBuilder = HttpClients.custom().setMaxConnPerRoute(maxConnectionPerRoute)
// .setMaxConnTotal(totalMaxConnection).disableCookieManagement();

var connnectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder.create()
.setMaxConnPerRoute(maxConnectionPerRoute)
.setMaxConnTotal(totalMaxConnection);
Expand All @@ -208,8 +203,6 @@ public RestTemplate getRestTemplate() throws KeyManagementException, NoSuchAlgor
return restTemplate;
}




/**
* Sets the request header.
Expand Down
1 change: 0 additions & 1 deletion ...redential/request/generator/test/controller/CredentialRequestGeneratorControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

@RunWith(SpringRunner.class)
@ContextConfiguration(classes = TestConfig.class)
//@TestPropertySource(locations = "classpath:application.properties")
@SpringBootTest(classes = TestBootApplication.class)
@AutoConfigureMockMvc
public class CredentialRequestGeneratorControllerTest {
Expand Down
4 changes: 4 additions & 0 deletions ...pository/credential-service/src/main/java/io/mosip/credentialstore/config/MvelConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;

/**
* @author Neha Farheen.
*/

@Configuration
public class MvelConfig {

Expand Down
13 changes: 0 additions & 13 deletions ...ry-identity-service/src/main/java/io/mosip/idrepository/identity/config/IdRepoConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,6 @@ public class IdRepoConfig extends IdRepoDataSourceConfig
/** The id. */
private Map<String, String> id;

// @Autowired
// private CredentialStatusManager credStatusManager;

// @Autowired
// private IdRepoWebSubHelper websubHelper;
//
//
//
// @Override
// public void onApplicationEvent(ApplicationReadyEvent event) {
// websubHelper.subscribeForVidEvent();
// }

/**
* Gets the db.
*
Expand Down
2 changes: 0 additions & 2 deletions ...-repository-identity-service/src/main/java/io/mosip/idrepository/identity/entity/Uin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,9 @@ public Uin(String uinRefId, String uin, String uinHash, byte[] uinData, String u
private LocalDateTime deletedDateTime;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "uin", cascade = CascadeType.ALL)
//@NotFound(action = NotFoundAction.IGNORE)
private List<UinBiometric> biometrics;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "uin", cascade = CascadeType.ALL)
//@NotFound(action = NotFoundAction.IGNORE)
private List<UinDocument> documents;

/**
Expand Down
2 changes: 0 additions & 2 deletions ...sitory-identity-service/src/main/java/io/mosip/idrepository/identity/entity/UinDraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,9 @@ public UinDraft(String uin, String uinHash, byte[] uinData, String uinDataHash,
private LocalDateTime deletedDateTime;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "uin", cascade = CascadeType.ALL)
//@NotFound(action = NotFoundAction.IGNORE)
private List<UinBiometricDraft> biometrics;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "uin", cascade = CascadeType.ALL)
//@NotFound(action = NotFoundAction.IGNORE)
private List<UinDocumentDraft> documents;

/**
Expand Down
107 changes: 1 addition & 106 deletions id-repository/id-repository-salt-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,112 +82,7 @@
<json.schema.validator.version>2.2.10</json.schema.validator.version>
<json.version>20180813</json.version>
<jsonsimple.version>1.1.1</jsonsimple.version>

<!-- utilities -->
<commons-math3>3.6.1</commons-math3>
<commons-lang3>3.7</commons-lang3>
<commons-io>2.6</commons-io>
<commons-codec>1.11</commons-codec>
<commons-collections4.version>4.3</commons-collections4.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.configuration2.version>2.2</commons.configuration2.version>
<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
<guava.version>19.0</guava.version>
<lombok.version>1.18.32</lombok.version>
<jsch.version>0.1.54</jsch.version>
<sshd.version>1.4.0</sshd.version>
<itextcore.version>7.1.0</itextcore.version>
<itexthtml2pdf.version>2.0.0</itexthtml2pdf.version>
<itext.version>5.5.13</itext.version>
<freemarker.version>2.3.23</freemarker.version>
<velocity.version>1.7</velocity.version>
<velocity.tool.version>2.0</velocity.tool.version>
<datamapper.orika>1.5.2</datamapper.orika>
<modelmapper.version>2.1.1</modelmapper.version>
<bouncycastle.version>1.66</bouncycastle.version>
<icu4j.version>63.1</icu4j.version>
<seventeam-otp.version>1.0.0</seventeam-otp.version>
<google.zxing.version>3.3.3</google.zxing.version>
<hadoop-client>3.1.0</hadoop-client>
<htrace-core4>4.1.0-incubating</htrace-core4>
<aws.javasdk.version>1.11.368</aws.javasdk.version>
<s3mock.version>0.2.4</s3mock.version>
<ignite.version>2.3.0</ignite.version>
<findbugs.version>3.0.1</findbugs.version>
<byte.buddy.version>1.9.12</byte.buddy.version>
<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
<aspectjweaver.version>1.8.12</aspectjweaver.version>
<micrometer.core.version>1.4.2</micrometer.core.version>
<micrometer.registry.prometheus.version>1.4.2</micrometer.registry.prometheus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->

<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<!-- <maven.jacoco.plugin.version>0.8.4</maven.jacoco.plugin.version> -->
<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<!-- spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>

<!-- swagger -->
<swagger.core.version>2.0.7</swagger.core.version>
<swagger.annotations.version>1.5.21</swagger.annotations.version>
<springfox.version>2.9.2</springfox.version>

<!-- vertx -->
<vertx.version>3.6.2</vertx.version>
<vertx.health.check.version>3.7.0</vertx.health.check.version>


<!-- javax -->
<javax.interceptor.version>1.2</javax.interceptor.version>
<javax.el-api.version>3.0.0</javax.el-api.version>
<javax.transaction.api.version>1.3</javax.transaction.api.version>
<javax.persistence.api.version>2.2</javax.persistence.api.version>
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
<glassfish.javax.el>2.2.6</glassfish.javax.el>

<!-- data -->
<h2.version>1.4.197</h2.version>
<mysql.connector.version>5.1.46</mysql.connector.version>
<postgresql.version>42.2.2</postgresql.version>
<eclipselink.version>2.5.0</eclipselink.version>
<hibernate.version>5.2.17.Final</hibernate.version>
<hibernate.validator.version>6.0.12.Final</hibernate.validator.version>

<!-- test -->
<junit.version>4.12</junit.version>
<mockito.version>2.23.4</mockito.version>
<powermock.version>1.7.4</powermock.version>
<powermock.beta.version>2.0.7</powermock.beta.version>

<!-- logger -->
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.19</slf4j.version>
<log4j-over-slf4j>1.7.7</log4j-over-slf4j>
<jcl.to.slf4j.version>1.7.25</jcl.to.slf4j.version>

<!-- json -->
<jackson.version>2.9.5</jackson.version>
<jackson.datatype.version>2.9.8</jackson.datatype.version>
<jackson.databind>2.9.6</jackson.databind>
<json.utility.version>20180130</json.utility.version>
<json.schema.validator.version>2.2.10</json.schema.validator.version>
<json.version>20180813</json.version>
<jsonsimple.version>1.1.1</jsonsimple.version>


<!-- utilities -->
<commons-math3>3.6.1</commons-math3>
<commons-lang3>3.7</commons-lang3>
Expand Down
4 changes: 4 additions & 0 deletions ...sitory-vid-service/src/main/java/io/mosip/idrepository/vid/config/RestTemplateConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;

/**
* @author Neha Farheen.
*/

@Configuration
public class RestTemplateConfig {

Expand Down
20 changes: 1 addition & 19 deletions ...-repository-vid-service/src/main/java/io/mosip/idrepository/vid/config/VidRepoConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,23 +231,5 @@ private void logThreadQueueDetails(ThreadPoolTaskExecutor threadPoolTaskExecutor
threadPoolTaskExecutor.getActiveCount(),
threadPoolTaskExecutor.getThreadPoolExecutor().getTaskCount(), threadPoolQueueSize);
}

// @Value("${config.server.file.storage.uri}")
// private String configServerFileStorageURL;
//
// @Value("${credential.service.mvel.file}")
// private String mvelFile;
//
// @Autowired
// @Qualifier("restTemplate")
// private RestTemplate restTemplate;
//
// @Bean("mask")
// public VariableResolverFactory getVariableResolverFactory() {
// String mvelExpression = restTemplate.getForObject(configServerFileStorageURL + mvelFile, String.class);
// VariableResolverFactory functionFactory = new MapVariableResolverFactory();
// MVEL.eval(mvelExpression, functionFactory);
// return functionFactory;
// }


}

0 comments on commit a10da8c

Please sign in to comment.