Merge pull request #2224 from nguyenthanhptiter11/release-candidate-2…

….3-original OAI buider fix sonar
VietOpenCPS · Mar 6, 2020 · 1d5af58 · 1d5af58
2 parents 3004d2c + d6e6d2a
commit 1d5af58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/...les/backend-api-rest/src/main/java/org/opencps/api/controller/impl/OAIManagementImpl.java b/...les/backend-api-rest/src/main/java/org/opencps/api/controller/impl/OAIManagementImpl.java
@@ -28,9 +28,8 @@ public Response getOAI(HttpServletRequest request, HttpHeaders header, Company c
 
 		_log.debug("oaiQuery=" + query);
 
-		OAIBuilderUtils builder = OAIBuilderUtils.getInstance(query);
+		OAIBuilderUtils builder = new OAIBuilderUtils(query);
 		OAIPMHtype results = builder.getResults();
-		builder.destroy();
 
 		return Response.status(HttpURLConnection.HTTP_OK).entity(results).build();
 	}

diff --git a/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/OAIBuilderUtils.java b/modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/OAIBuilderUtils.java
@@ -15,20 +15,20 @@ public class OAIBuilderUtils {
 	private static final String M_CALCULATE = "calculate";
 	private RequestType query;
 	private OAIPMHtype results;
-	private static OAIBuilderUtils instance;
+//	private static OAIBuilderUtils instance;
 
-	private OAIBuilderUtils(RequestType query) {
+	public OAIBuilderUtils(RequestType query) {
 		super();
 		this.query = query;
 		init();
 	}
 
-	public static OAIBuilderUtils getInstance(RequestType query) {
-		if (instance == null) {
-			instance = new OAIBuilderUtils(query);
-		}
-		return instance;
-	}
+//	public static OAIBuilderUtils getInstance(RequestType query) {
+//		if (instance == null) {
+//			instance = new OAIBuilderUtils(query);
+//		}
+//		return instance;
+//	}
 
 	public RequestType getQuery() {
 		return query;
@@ -46,11 +46,11 @@ public void setResults(OAIPMHtype results) {
 		this.results = results;
 	}
 
-	public void destroy() {
-		query = null;
-		results = null;
+//	public void destroy() {
+//		query = null;
+//		results = null;
 //		instance = null;
-	}
+//	}
 
 	private void init() {