Code Review
/
policy
/
models.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove dmaap from models
[policy/models.git]
/
models-interactions
/
model-impl
/
so
/
src
/
test
/
java
/
org
/
onap
/
policy
/
so
/
SoDummyServer.java
diff --git
a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
index
e9c3383
..
bb7e851
100644
(file)
--- a/
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
+++ b/
models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServer.java
@@
-5,7
+5,7
@@
* Copyright (C) 2018 Ericsson. All rights reserved.
* ================================================================================
* Modifications Copyright (C) 2018-2019 AT&T. All rights reserved.
* Copyright (C) 2018 Ericsson. All rights reserved.
* ================================================================================
* Modifications Copyright (C) 2018-2019 AT&T. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019
, 2024
Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,18
+24,19
@@
package org.onap.policy.so;
import com.google.gson.Gson;
package org.onap.policy.so;
import com.google.gson.Gson;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
@Path("/SO")
public class SoDummyServer {
@Path("/SO")
public class SoDummyServer {
+ private static final String ONGOING = "ONGOING";
private static int postMessagesReceived = 0;
private static int putMessagesReceived = 0;
private static int statMessagesReceived = 0;
private static int postMessagesReceived = 0;
private static int putMessagesReceived = 0;
private static int statMessagesReceived = 0;
@@
-113,9
+114,9
@@
public class SoDummyServer {
SoResponse response = ongoingRequestMap.get(nsInstanceId);
SoResponse response = ongoingRequestMap.get(nsInstanceId);
- int iterationsLeft = Integer.
valueOf
(response.getRequest().getRequestScope());
+ int iterationsLeft = Integer.
parseInt
(response.getRequest().getRequestScope());
if (--iterationsLeft > 0) {
if (--iterationsLeft > 0) {
- response.getRequest().setRequestScope(
new Integer(iterationsLeft).toString(
));
+ response.getRequest().setRequestScope(
Integer.toString(iterationsLeft
));
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode()).entity(responseString).build();
}
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode()).entity(responseString).build();
}
@@
-158,12
+159,7
@@
public class SoDummyServer {
return Response.status(400).build();
}
return Response.status(400).build();
}
- SoRequest request = null;
- try {
- request = new Gson().fromJson(jsonString, SoRequest.class);
- } catch (Exception e) {
- return Response.status(400).build();
- }
+ SoRequest request = new Gson().fromJson(jsonString, SoRequest.class);
if (request == null) {
return Response.status(400).build();
if (request == null) {
return Response.status(400).build();
@@
-206,7
+202,7
@@
public class SoDummyServer {
if ("ReturnOnging202".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
if ("ReturnOnging202".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState(
"ONGOING"
);
+ response.getRequest().getRequestStatus().setRequestState(
ONGOING
);
response.setHttpResponseCode(202);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
response.setHttpResponseCode(202);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
@@
-217,7
+213,7
@@
public class SoDummyServer {
if ("ReturnOnging200".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
if ("ReturnOnging200".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState(
"ONGOING"
);
+ response.getRequest().getRequestStatus().setRequestState(
ONGOING
);
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
@@
-228,7
+224,7
@@
public class SoDummyServer {
if ("ReturnBadAfterWait".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
if ("ReturnBadAfterWait".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState(
"ONGOING"
);
+ response.getRequest().getRequestStatus().setRequestState(
ONGOING
);
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())