Merge pull request #128 from JanardhanBS-SyncByte/develop-java21

[MOSIP-33145]
mosip · May 24, 2024 · 7e843af · 7e843af
2 parents 25b8f6f + 7fdc5cd
commit 7e843af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/biosdk-services/src/main/java/io/mosip/biosdk/services/config/BioSdkLibConfig.java b/biosdk-services/src/main/java/io/mosip/biosdk/services/config/BioSdkLibConfig.java
@@ -24,9 +24,13 @@
 public class BioSdkLibConfig {
     private static final Logger logger = LoggerFactory.getLogger(BioSdkLibConfig.class);
 
-    @Autowired
     private Environment env;
 
+    @Autowired
+    public BioSdkLibConfig(Environment env) {
+    	this.env = env;
+    }
+
     @PostConstruct
     public void validateBioSdkLib() throws ClassNotFoundException {
     	String sdkClass = this.env.getProperty("biosdk_bioapi_impl");

diff --git a/biosdk-services/src/main/java/io/mosip/biosdk/services/controller/MainController.java b/biosdk-services/src/main/java/io/mosip/biosdk/services/controller/MainController.java
@@ -49,15 +49,14 @@ public class MainController {
 
 	private Logger logger = LoggerConfig.logConfig(MainController.class);
 
-	@Autowired
 	private Utils serviceUtil;
-
-	@Autowired
 	private BioSdkServiceFactory bioSdkServiceFactory;
-
 	private Gson gson = null;
 
-	public MainController() {
+	@Autowired
+	public MainController(Utils serviceUtil, BioSdkServiceFactory bioSdkServiceFactory) {
+		this.serviceUtil = serviceUtil;
+		this.bioSdkServiceFactory = bioSdkServiceFactory;
 		gson = new GsonBuilder().serializeNulls().create();
 	}
 
@@ -73,7 +72,7 @@ public ResponseEntity<String> status() {
 	@GetMapping(path = "/s")
 	@ApiOperation(value = "Service role status")
 	@ApiResponses(value = { @ApiResponse(code = 200, message = "Service is running...") })
-	public ResponseEntity<String> roleStatus() {
+	public ResponseEntity<String> status1() {
 		Date d = new Date();
 		return ResponseEntity.status(HttpStatus.OK).body("Service is running... " + d.toString());
 	}

diff --git a/...src/main/java/io/mosip/biosdk/services/impl/spec_1_0/BioSdkServiceProviderImpl_V_1_0.java b/...src/main/java/io/mosip/biosdk/services/impl/spec_1_0/BioSdkServiceProviderImpl_V_1_0.java
@@ -44,18 +44,17 @@ public class BioSdkServiceProviderImpl_V_1_0 implements BioSdkServiceProvider {
 	private static final String DECODE_SUCCESS = "decoding successful";
 	private static final String JSON_TO_DTO_SUCCESS = "json to dto successful";
 
-	@Autowired
 	private IBioApiV2 iBioApi;
-
-	@Autowired
 	private Utils utils;
-
 	private Gson gson;
 
 	@Value("${mosip.biosdk.log-request-response-enabled:false}")
 	private boolean isLogRequestResponse;
 
-	public BioSdkServiceProviderImpl_V_1_0() {
+	@Autowired
+	public BioSdkServiceProviderImpl_V_1_0(IBioApiV2 iBioApi, Utils utils) {
+		this.iBioApi = iBioApi;
+		this.utils = utils;
 		gson = new GsonBuilder().serializeNulls().create();
 	}