[INJICERT-657] move packages around

Signed-off-by: Harsh Vardhan <[email protected]>
mosip · Dec 17, 2024 · 18ccace · 18ccace
1 parent 63425dd
commit 18ccace
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/...ervices/spi/RenderingTemplateService.java → ...fy/core/spi/RenderingTemplateService.java b/...ervices/spi/RenderingTemplateService.java → ...fy/core/spi/RenderingTemplateService.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-package io.mosip.certify.services.spi;
+package io.mosip.certify.core.spi;
 
 import io.mosip.certify.api.dto.RenderingTemplateDTO;
 

diff --git a/certify-service/src/main/java/io/mosip/certify/controller/RenderingTemplateController.java b/certify-service/src/main/java/io/mosip/certify/controller/RenderingTemplateController.java
@@ -7,7 +7,7 @@
 
 import io.mosip.certify.api.dto.RenderingTemplateDTO;
 import io.mosip.certify.core.exception.RenderingTemplateException;
-import io.mosip.certify.services.spi.RenderingTemplateService;
+import io.mosip.certify.core.spi.RenderingTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/certify-service/src/main/java/io/mosip/certify/services/CertifyIssuanceServiceImpl.java b/certify-service/src/main/java/io/mosip/certify/services/CertifyIssuanceServiceImpl.java
@@ -28,7 +28,7 @@
 import io.mosip.certify.core.util.AuditHelper;
 import io.mosip.certify.core.util.SecurityHelperService;
 import io.mosip.certify.api.spi.DataProviderPlugin;
-import io.mosip.certify.services.vcformatters.VCFormatter;
+import io.mosip.certify.vcformatters.VCFormatter;
 import io.mosip.certify.validators.CredentialRequestValidator;
 import io.mosip.certify.exception.InvalidNonceException;
 import io.mosip.certify.proof.ProofValidator;

diff --git a/certify-service/src/main/java/io/mosip/certify/services/RenderingTemplateServiceImpl.java b/certify-service/src/main/java/io/mosip/certify/services/RenderingTemplateServiceImpl.java
@@ -10,7 +10,7 @@
 import io.mosip.certify.entity.RenderingTemplate;
 import io.mosip.certify.core.exception.RenderingTemplateException;
 import io.mosip.certify.repository.RenderingTemplateRepository;
-import io.mosip.certify.services.spi.RenderingTemplateService;
+import io.mosip.certify.core.spi.RenderingTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/...fy/services/vcformatters/VCFormatter.java → ...sip/certify/vcformatters/VCFormatter.java b/...fy/services/vcformatters/VCFormatter.java → ...sip/certify/vcformatters/VCFormatter.java
@@ -1,4 +1,4 @@
-package io.mosip.certify.services.vcformatters;
+package io.mosip.certify.vcformatters;
 
 import java.util.Map;
 

diff --git a/...matters/VelocityTemplatingEngineImpl.java → ...matters/VelocityTemplatingEngineImpl.java b/...matters/VelocityTemplatingEngineImpl.java → ...matters/VelocityTemplatingEngineImpl.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-package io.mosip.certify.services.vcformatters;
+package io.mosip.certify.vcformatters;
 
 import java.io.*;
 import java.time.Duration;
@@ -21,7 +21,7 @@
 import io.mosip.certify.core.constants.VCDMConstants;
 import io.mosip.certify.core.exception.RenderingTemplateException;
 import io.mosip.certify.repository.CredentialTemplateRepository;
-import io.mosip.certify.services.spi.RenderingTemplateService;
+import io.mosip.certify.core.spi.RenderingTemplateService;
 import io.mosip.certify.services.CredentialUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.SneakyThrows;

diff --git a/...fy-service/src/test/java/io/mosip/certify/controller/RenderingTemplateControllerTest.java b/...fy-service/src/test/java/io/mosip/certify/controller/RenderingTemplateControllerTest.java
@@ -4,7 +4,7 @@
 import io.mosip.certify.core.constants.ErrorConstants;
 import io.mosip.certify.core.dto.ParsedAccessToken;
 import io.mosip.certify.core.exception.RenderingTemplateException;
-import io.mosip.certify.services.spi.RenderingTemplateService;
+import io.mosip.certify.core.spi.RenderingTemplateService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;

diff --git a/certify-service/src/test/java/io/mosip/certify/services/CertifyIssuanceServiceImplTest.java b/certify-service/src/test/java/io/mosip/certify/services/CertifyIssuanceServiceImplTest.java
@@ -2,7 +2,7 @@
 
 import io.mosip.certify.api.spi.AuditPlugin;
 import io.mosip.certify.api.spi.DataProviderPlugin;
-import io.mosip.certify.services.vcformatters.VCFormatter;
+import io.mosip.certify.vcformatters.VCFormatter;
 import io.mosip.certify.core.constants.ErrorConstants;
 import io.mosip.certify.core.constants.VCFormats;
 import io.mosip.certify.core.dto.CredentialDefinition;

diff --git a/...ers/VelocityTemplatingEngineImplTest.java → ...ers/VelocityTemplatingEngineImplTest.java b/...ers/VelocityTemplatingEngineImplTest.java → ...ers/VelocityTemplatingEngineImplTest.java
@@ -1,4 +1,4 @@
-package io.mosip.certify.services.vcformatters;
+package io.mosip.certify.vcformatters;
 
 import io.mosip.certify.entity.CredentialTemplate;
 import io.mosip.certify.repository.CredentialTemplateRepository;
@@ -16,10 +16,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.stereotype.Service;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.RestTemplate;
 
-import java.time.Duration;
 import java.util.*;
 
 import static org.mockito.Mockito.when;