Datasets:

tiginamaria

/

bug-localization

like 2

telstra/open-kilda/5043/4991

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/4991

https://github.com/telstra/open-kilda/pull/5043

https://github.com/telstra/open-kilda/pull/5043

closes

GRPC API returns incorrect JSON error response

**Steps to reproduce:** *****ON HARDWARE ENV***** 1. go to GRPC swagger 2. send some incorrect request. For example try to get logical port for unknown IP 1.1.1.1 ```GET /noviflow/1.1.1.1/logicalports``` **Expected result:** Correct JSON response **Actual result:** Concatenation of 2 JSONs which can't be parsed ``` can't parse JSON. Raw result: {"timestamp":1667985669923,"error-code":-1,"error-message":"Communication failure - UNAVAILABLE: io exception"}{"timestamp":"2022-11-09T09:21:09.937+0000","status":500,"error":"Internal Server Error","message":"UNAVAILABLE: io exception","path":"/api/v1/noviflow/1.1.1.1/logicalports"} ```

d149be4aacd25954eef9bee08f4a579219511f25

894ff16bb3a5f19b6e3bd854424743a08169c815

https://github.com/telstra/open-kilda/compare/d149be4aacd25954eef9bee08f4a579219511f25...894ff16bb3a5f19b6e3bd854424743a08169c815

diff --git a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java index 976105b18..eb164b24e 100644 --- a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java +++ b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java @@ -30,13 +30,16 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + @ControllerAdvice public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { /** * Exception handler. */ - @ExceptionHandler + @ExceptionHandler(GrpcRequestFailureException.class) public ResponseEntity<Object> handleException(GrpcRequestFailureException ex, WebRequest request) { HttpStatus status; @@ -57,11 +60,10 @@ public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { return makeExceptionalResponse(ex, makeErrorPayload(ex.getCode(), ex.getMessage()), status, request); } - - @ExceptionHandler - public ResponseEntity<Object> handleException(StatusRuntimeException ex, WebRequest request) { - GrpcMessageError body = makeErrorPayload(-1, format("Communication failure - %s", ex.getMessage())); - return makeExceptionalResponse(ex, body, HttpStatus.INTERNAL_SERVER_ERROR, request); + + @ExceptionHandler(StatusRuntimeException.class) + public void handleException(StatusRuntimeException ex, HttpServletResponse response) throws IOException { + response.sendError(HttpStatus.INTERNAL_SERVER_ERROR.value()); } @Override @@ -72,6 +74,7 @@ public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { return makeExceptionalResponse(exception, error, status, request); } + private ResponseEntity<Object> makeExceptionalResponse( Exception ex, GrpcMessageError body, HttpStatus status, WebRequest request) { logger.error(format("Produce error response: %s", body));

['src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java']

{'.java': 1}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/5023/5022

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/5022

https://github.com/telstra/open-kilda/pull/5023

https://github.com/telstra/open-kilda/pull/5023

closes

Incorrect error message if flow max_latency is higher than max_latency_tier2

**Steps to reproduce:** 1. Try to create flow by API `POST /v2/flows` where flow max_latency is higher than max_latency_tier2 ``` { "flow_id": "nik", "source": { "inner_vlan_id": 0, "port_number": 10, "switch_id": "00:00:00:22:3d:6b:00:7a", "vlan_id": 0 }, "destination": { "inner_vlan_id": 0, "port_number": 10, "switch_id": "00:00:00:22:3d:6c:00:40", "vlan_id": 0 }, "maximum_bandwidth": 1000, "max_latency": 200, "max_latency_tier2": 100 } ``` **Expected result:** correct error message with latency in milliseconds `The maxLatency 200 is higher than maxLatencyTier2 100` **Actual result:** `"The maxLatency 200000000 is higher than maxLatencyTier2 100000000"`

6fd226f9f3641e58803283dc6f3914024a2f04c7

793c41caf94b57b25be54d93b14fcfbc86a6dc76

https://github.com/telstra/open-kilda/compare/6fd226f9f3641e58803283dc6f3914024a2f04c7...793c41caf94b57b25be54d93b14fcfbc86a6dc76

diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtils.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtils.java index 02775742e..27b1fb07e 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtils.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtils.java @@ -19,6 +19,8 @@ import static java.lang.String.format; import org.openkilda.messaging.error.ErrorType; +import java.util.concurrent.TimeUnit; + public final class ValidatorUtils { private ValidatorUtils() {} @@ -40,9 +42,9 @@ public final class ValidatorUtils { } if (maxLatency > maxLatencyTier2) { throw new InvalidFlowException( - format("The maxLatency %d is higher than maxLatencyTier2 %d", - maxLatency, - maxLatencyTier2), + format("The maxLatency %dms is higher than maxLatencyTier2 %dms", + TimeUnit.NANOSECONDS.toMillis(maxLatency), + TimeUnit.NANOSECONDS.toMillis(maxLatencyTier2)), ErrorType.DATA_INVALID); } } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtilsTest.java b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtilsTest.java index 6f59cf997..29a07399a 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtilsTest.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtilsTest.java @@ -15,12 +15,40 @@ package org.openkilda.wfm.topology.flowhs.validation; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.Test; public class ValidatorUtilsTest { + @Test public void maxLatencyValidatorMustAcceptEqualMaxLatencyAndMaxLatencyTier2() throws InvalidFlowException { // should not raise exception ValidatorUtils.maxLatencyValidator(500L, 500L); } + + @Test + public void maxLatencyValidatorThrowsExceptionIfMaxLatencyTier2HigherThanMaxLatency() throws InvalidFlowException { + Exception exception = assertThrows(InvalidFlowException.class, () -> { + ValidatorUtils.maxLatencyValidator(60000000L, 50000000L); + }); + assertThat(exception.getMessage(), equalTo("The maxLatency 60ms is higher than maxLatencyTier2 50ms")); + } + + @Test + public void maxLatencyValidatorThrowsExceptionIfMaxLatencyNullAndMaxLatencyTier2Not() throws InvalidFlowException { + Exception exception = assertThrows(InvalidFlowException.class, () -> { + ValidatorUtils.maxLatencyValidator(null, 50000000L); + }); + assertThat(exception.getMessage(), equalTo("maxLatencyTier2 property cannot be used without maxLatency")); + } + + @Test + public void maxLatencyValidatorMustAcceptMaxLatencyExistAndMaxLatencyTier2IsNull() throws InvalidFlowException { + // should not raise exception + ValidatorUtils.maxLatencyValidator(500L, null); + } + }

['src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtils.java', 'src-java/flowhs-topology/flowhs-storm-topology/src/test/java/org/openkilda/wfm/topology/flowhs/validation/ValidatorUtilsTest.java']

{'.java': 2}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3678/3577

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3577

https://github.com/telstra/open-kilda/pull/3678

https://github.com/telstra/open-kilda/pull/3678

close

flowHistory: stateBefore is showing new value instead of old one

**Steps to reproduce:** 1. create a flow 2. update the flow (i.e. sourceVlan 30 -> 40) **Actual result:** flow is updated and valid but the `stateBefore` action in flowHistory is showing new value of vlan ``` { "type": "stateBefore", ... "sourceVlan": 40, ``` **Expected result:** The `stateBefore` section should show the old value of vlan ``` { "type": "stateBefore", ... "sourceVlan": 30, ```

6ddebb44595cfc994c5a7e7c57c81fdd7d8b13eb

67a3d643145c7ee01c8a77eea64df4e839c9b9f0

https://github.com/telstra/open-kilda/compare/6ddebb44595cfc994c5a7e7c57c81fdd7d8b13eb...67a3d643145c7ee01c8a77eea64df4e839c9b9f0

diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/update/actions/CompleteFlowPathRemovalAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/update/actions/CompleteFlowPathRemovalAction.java index 01250983f..cfc819fc2 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/update/actions/CompleteFlowPathRemovalAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/update/actions/CompleteFlowPathRemovalAction.java @@ -25,6 +25,7 @@ import org.openkilda.wfm.topology.flowhs.fsm.update.FlowUpdateContext; import org.openkilda.wfm.topology.flowhs.fsm.update.FlowUpdateFsm; import org.openkilda.wfm.topology.flowhs.fsm.update.FlowUpdateFsm.Event; import org.openkilda.wfm.topology.flowhs.fsm.update.FlowUpdateFsm.State; +import org.openkilda.wfm.topology.flowhs.mapper.RequestedFlowMapper; import lombok.extern.slf4j.Slf4j; import net.jodah.failsafe.RetryPolicy; @@ -55,6 +56,7 @@ public class CompleteFlowPathRemovalAction extends private void removeFlowPaths(FlowUpdateFsm stateMachine) { Flow flow = getFlow(stateMachine.getFlowId()); + Flow originalFlow = RequestedFlowMapper.INSTANCE.toFlow(stateMachine.getOriginalFlow()); FlowPath oldPrimaryForward = flow.getPath(stateMachine.getOldPrimaryForwardPath()).orElse(null); FlowPath oldPrimaryReverse = flow.getPath(stateMachine.getOldPrimaryReversePath()).orElse(null); @@ -70,16 +72,16 @@ public class CompleteFlowPathRemovalAction extends FlowPathPair pathsToDelete = FlowPathPair.builder().forward(oldPrimaryForward).reverse(oldPrimaryReverse).build(); deleteFlowPaths(pathsToDelete); - saveRemovalActionWithDumpToHistory(stateMachine, flow, pathsToDelete); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, pathsToDelete); } else { log.debug("Completing removal of the flow path {} (no reverse pair)", oldPrimaryForward); deleteFlowPath(oldPrimaryForward); - saveRemovalActionWithDumpToHistory(stateMachine, flow, oldPrimaryForward); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, oldPrimaryForward); } } else if (oldPrimaryReverse != null) { log.debug("Completing removal of the flow path {} (no forward pair)", oldPrimaryReverse); deleteFlowPath(oldPrimaryReverse); - saveRemovalActionWithDumpToHistory(stateMachine, flow, oldPrimaryReverse); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, oldPrimaryReverse); } if (oldProtectedForward != null) { @@ -88,16 +90,16 @@ public class CompleteFlowPathRemovalAction extends FlowPathPair pathsToDelete = FlowPathPair.builder().forward(oldProtectedForward).reverse(oldProtectedReverse).build(); deleteFlowPaths(pathsToDelete); - saveRemovalActionWithDumpToHistory(stateMachine, flow, pathsToDelete); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, pathsToDelete); } else { log.debug("Completing removal of the flow path {} (no reverse pair)", oldProtectedForward); deleteFlowPath(oldProtectedForward); - saveRemovalActionWithDumpToHistory(stateMachine, flow, oldProtectedForward); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, oldProtectedForward); } } else if (oldProtectedReverse != null) { log.debug("Completing removal of the flow path {} (no forward pair)", oldProtectedReverse); deleteFlowPath(oldProtectedReverse); - saveRemovalActionWithDumpToHistory(stateMachine, flow, oldProtectedReverse); + saveRemovalActionWithDumpToHistory(stateMachine, originalFlow, oldProtectedReverse); } } }

['src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/update/actions/CompleteFlowPathRemovalAction.java']

{'.java': 1}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3279/3278

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3278

https://github.com/telstra/open-kilda/pull/3279

https://github.com/telstra/open-kilda/pull/3279

close

Needs investigation: unhandled nullpointer exception in Floodlight

<details> <summary> error </summary> ``` { "_index": "kilda-2020.03.10", "_type": "kilda-FL", "_id": "AXDEivoQzzwg1EoeFaPK", "_version": 1, "_score": null, "_source": { "role": "FL_ROLE_IS_UNDEFINED", "level": "ERROR", "thread": "pool-5-thread-19", "message": "Unhandled exception into org.openkilda.floodlight.service.session.SessionService$1: null", "type": "kilda-FL", "tags": [ "kilda-floodlight" ], "@timestamp": "2020-03-10T13:03:27.116Z", "port": 59306, "@version": 1, "host": "172.22.0.15", "stack_trace": "java.lang.NullPointerException: null\\n\\tat org.openkilda.floodlight.service.session.Session.handleResponse(Session.java:167)\\n\\tat org.openkilda.floodlight.service.session.SwitchSessions.handleResponse(SwitchSessions.java:39)\\n\\tat org.openkilda.floodlight.service.session.SessionService.handleResponse(SessionService.java:91)\\n\\tat org.openkilda.floodlight.service.session.SessionService$1.call(SessionService.java:75)\\n\\tat org.openkilda.floodlight.service.session.SessionService$1.call(SessionService.java:72)\\n\\tat org.openkilda.floodlight.command.CommandWrapper.call(CommandWrapper.java:38)\\n\\tat org.openkilda.floodlight.command.CommandWrapper.call(CommandWrapper.java:26)\\n\\tat org.openkilda.floodlight.service.CommandProcessorService.lambda$executeOneShot$0(CommandProcessorService.java:130)\\n\\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\\n\\tat java.lang.Thread.run(Thread.java:748)\\n", "loggerName": "org.openkilda.floodlight.command.Command", "contextMap": { "correlation_id": "4d9811a1-6574-4fba-a3f3-ce8489ae51e9" }, "region": "FL_REGION_IS_UNDEFINED" }, "fields": { "@timestamp": [ 1583845407116 ] }, "highlight": { "level": [ "@kibana-highlighted-field@ERROR@/kibana-highlighted-field@" ] }, "sort": [ 1583845407116 ] } ``` </details> Correlation id search shows one related debug message: `org.openkilda.floodlight.service.of.InputService - receive message (dpId: 00:00:36:1c:7a:77:97:7e, xId: 0, version: OF_13, type: PACKET_IN)` No related negative consequences observed

dcc74e5b18a8ca9fb0dc0e39cd0669d9f7a6d8e1

0dd10ef41d0dee141749ecce7fed5ced46395e1d

https://github.com/telstra/open-kilda/compare/dcc74e5b18a8ca9fb0dc0e39cd0669d9f7a6d8e1...0dd10ef41d0dee141749ecce7fed5ced46395e1d

diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/service/session/Session.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/service/session/Session.java index f3fca253f..41029d81d 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/service/session/Session.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/service/session/Session.java @@ -164,7 +164,7 @@ public class Session implements AutoCloseable { } // check session completion (we have received all responses, if we got response for closing barrier request) - if (closingBarrier.isDone()) { + if (closingBarrier != null && closingBarrier.isDone()) { incompleteRequestsStream() .forEach(entry -> entry.complete(Optional.empty())); return true; @@ -181,7 +181,14 @@ public class Session implements AutoCloseable { CompletableFuture<Optional<OFMessage>> future = new CompletableFuture<>(); long xid = message.getXid(); - requestsByXid.put(xid, future); + if (xid == 0) { + log.error("Send OF request with xid:0 to {} - {}", sw.getId(), message); + } + CompletableFuture<Optional<OFMessage>> existing = requestsByXid.put(xid, future); + if (existing != null) { + log.error("Detect xid collision on {} xid:{} - can lead to unprocessed/missing response", sw.getId(), xid); + existing.complete(Optional.empty()); // to avoid infinite wait on replaced future object + } group.bindRequest(this, xid); return future; diff --git a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/service/session/SessionServiceTest.java b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/service/session/SessionServiceTest.java index ff43b1166..9e445c8af 100644 --- a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/service/session/SessionServiceTest.java +++ b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/service/session/SessionServiceTest.java @@ -39,6 +39,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.projectfloodlight.openflow.protocol.OFBadActionCode; +import org.projectfloodlight.openflow.protocol.OFBadRequestCode; import org.projectfloodlight.openflow.protocol.OFBarrierRequest; import org.projectfloodlight.openflow.protocol.OFFactory; import org.projectfloodlight.openflow.protocol.OFMessage; @@ -205,6 +206,38 @@ public class SessionServiceTest extends EasyMockSupport { } } + @Test + public void responseBeforeClose() throws Exception { + IOFSwitch sw = createMock(IOFSwitch.class); + setupSwitchMock(sw, dpId); + swWriteAlwaysSuccess(sw); + doneWithSetUp(sw); + + OFFactory ofFactory = sw.getOFFactory(); + CompletableFuture<Optional<OFMessage>> first; + CompletableFuture<Optional<OFMessage>> second; + try (Session session = subject.open(context, sw)) { + OFPacketOut egress = makePacketOut(ofFactory, 100); + first = session.write(egress); + + second = session.write(makePacketOut(ofFactory, 1)); + + // response before close + OFMessage ingress = ofFactory.errorMsgs().buildBadRequestErrorMsg() + .setXid(egress.getXid()) + .setCode(OFBadRequestCode.BAD_PORT) + .build(); + subject.handleResponse(dpId, ingress); + } + + completeSessions(sw); + + // received error response must be reported via future + expectExceptionResponse(first, SessionErrorResponseException.class); + // second request must be marker as completed + expectNoResponse(second); + } + @Test public void sessionBarrierWriteError() throws Exception { IOFSwitch sw = createMock(IOFSwitch.class); @@ -244,6 +277,12 @@ public class SessionServiceTest extends EasyMockSupport { } } + private void expectNoResponse(CompletableFuture<Optional<OFMessage>> future) + throws ExecutionException, InterruptedException { + Assert.assertTrue(future.isDone()); + Assert.assertFalse(future.get().isPresent()); + } + private void setupSwitchMock(IOFSwitch mock, DatapathId dpId) { expect(mock.getId()).andStubReturn(dpId); expect(mock.getOFFactory()).andStubReturn(OFFactoryVer13.INSTANCE);

['src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/service/session/Session.java', 'src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/service/session/SessionServiceTest.java']

{'.java': 2}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

serg-delft/andy/112/111

serg-delft

andy

https://github.com/SERG-Delft/andy/issues/111

https://github.com/SERG-Delft/andy/pull/112

https://github.com/SERG-Delft/andy/pull/112

closes

Assessing time message phrasing is incorrect

https://github.com/cse1110/andy/blob/4e53516cc38247149e281646700dd116d8167323/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java#L194 The word `question` should be replaced with `solution`.

e3095a639b2fff45a2df509a5fa1293fd005ed39

5b839c6ad771c0355b651748778840fd9edb9262

https://github.com/serg-delft/andy/compare/e3095a639b2fff45a2df509a5fa1293fd005ed39...5b839c6ad771c0355b651748778840fd9edb9262

diff --git a/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java b/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java index cad447d..52c9b6d 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java +++ b/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java @@ -191,7 +191,7 @@ public class StandardResultWriter implements ResultWriter { if(modeActionSelector(ctx)!=null) l(String.format("\\nAndy is running in %s mode and took %.1f seconds to assess your solution.", modeActionSelector(ctx).getMode().toString(), timeInSeconds)); else - l(String.format("\\nAndy took %.1f seconds to assess your question.", timeInSeconds)); + l(String.format("\\nAndy took %.1f seconds to assess your solution.", timeInSeconds)); } private void printMetaTestResults(Context ctx, MetaTestsResult metaTests) {

['src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java']

{'.java': 1}

Java

{'Java': 1238634, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Makefile': 12592, 'Dockerfile': 1722, 'NASL': 1620, 'Shell': 63}

MIT License

serg-delft/andy/110/109

serg-delft

andy

https://github.com/SERG-Delft/andy/issues/109

https://github.com/SERG-Delft/andy/pull/110

https://github.com/SERG-Delft/andy/pull/110

closes

`assertNull` is not considered an assertion by code check

`assertNull` is not considered an assertion by the TestMethodsHaveAssertions code check: https://github.com/cse1110/andy/blob/main/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java This assertion method as well as other JUnit methods that have been missed should be added to this code check.

8932a6199da9c6e5760e646fe4ebbdd4b96baa55

594ae60cd6d906ca3f8c8373cf29c7630cb192ed

https://github.com/serg-delft/andy/compare/8932a6199da9c6e5760e646fe4ebbdd4b96baa55...594ae60cd6d906ca3f8c8373cf29c7630cb192ed

diff --git a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java index 76fa129..06db6b4 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java +++ b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java @@ -35,6 +35,14 @@ public class TestMethodsHaveAssertions extends WithinTestMethod { add("assertTrue"); add("assertFalse"); add("assertThrows"); + add("assertNull"); + add("assertArrayEquals"); + add("assertDoesNotThrow"); + add("assertIterableEquals"); + add("assertLinesMatch"); + add("assertNotNull"); + add("assertNotSame"); + add("assertSame"); // assertj add("assertThat");

['src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java']

{'.java': 1}

Java

{'Java': 1238634, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Makefile': 12592, 'Dockerfile': 1722, 'NASL': 1620, 'Shell': 63}

MIT License

serg-delft/andy/101/99

serg-delft

andy

https://github.com/SERG-Delft/andy/issues/99

https://github.com/SERG-Delft/andy/pull/101

https://github.com/SERG-Delft/andy/pull/101

closes

Score of 100/100 is possible even if not everything is completed

Grades >= 99.5 get rounded up to 100. This is an edge case: any grade between 99 and 100 should be rounded down to 99, otherwise students may get confused and think that they have completed an exercise even if they haven't actually passed everything. For example: ``` Status: Done Andy v0.27.1-85578d2 (2022-04-25T09:29:42+0000) [...] --- Assessment Branch coverage: 20/21 (overall weight=0.10) Mutation coverage: 27/27 (overall weight=0.30) Code checks: 0/0 (overall weight=0.00) Meta tests: 17/17 (overall weight=0.60) Final grade: 100/100 Super congrats! [...] ``` Note the number of covered branches - only 20 out of 21 branches are covered, but due to the low weight of the branch coverage score, this branch is worth less than 0.5/100, so the final score becomes 99.5/100, which Andy incorrectly rounds up to 100/100.

b1d07f8e5a7703f30f1719afbe5b9166c68e0f23

1a2e3182b0b8552063485a3a0ccf1ea1d0b931b9

https://github.com/serg-delft/andy/compare/b1d07f8e5a7703f30f1719afbe5b9166c68e0f23...1a2e3182b0b8552063485a3a0ccf1ea1d0b931b9

diff --git a/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java b/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java index d6ccdc3..6e71536 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java +++ b/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java @@ -24,6 +24,11 @@ public class GradeCalculator { if(finalGrade < 0 || finalGrade > 100) throw new RuntimeException("Invalid grade calculation"); + // Grades between 99.5 and 100 should be rounded down to 99 instead of up + if (finalGrade == 100 && hasIncompleteComponents(gradeValues, weights)) { + finalGrade = 99; + } + return finalGrade; } @@ -79,4 +84,16 @@ public class GradeCalculator { return (float)checksPassed / totalChecks; } + /** + * @param gradeValues the grade values + * @param weights the weights + * @return whether any of the components with positive weight are incomplete + */ + private boolean hasIncompleteComponents(GradeValues gradeValues, GradeWeight weights) { + return weights.getBranchCoverageWeight() > 0.0f && gradeValues.getCoveredBranches() < gradeValues.getTotalBranches() || + weights.getMutationCoverageWeight() > 0.0f && gradeValues.getDetectedMutations() < gradeValues.getTotalMutations() || + weights.getMetaTestsWeight() > 0.0f && gradeValues.getMetaTestsPassed() < gradeValues.getTotalMetaTests() || + weights.getCodeChecksWeight() > 0.0f && gradeValues.getChecksPassed() < gradeValues.getTotalChecks(); + } + } diff --git a/src/test/java/unit/grade/GradeCalculatorTest.java b/src/test/java/unit/grade/GradeCalculatorTest.java index d834ba6..2d340ec 100644 --- a/src/test/java/unit/grade/GradeCalculatorTest.java +++ b/src/test/java/unit/grade/GradeCalculatorTest.java @@ -3,6 +3,7 @@ package unit.grade; import nl.tudelft.cse1110.andy.grade.GradeCalculator; import nl.tudelft.cse1110.andy.grade.GradeValues; import nl.tudelft.cse1110.andy.grade.GradeWeight; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -81,4 +82,52 @@ public class GradeCalculatorTest { of(25, 25, 55, 55, 100, 100, 2, 5, 94) // 0.4*1 + 0.3*1 + 0.2*1 + 0.1*(2/5) = 0.94 --> 94 ); } + + /* + * Test where the grade is between 99.5 and 100, should be rounded down to 99 and not + * rounded up to 100, as 100 should only be achievable if everything + * with a positive weight is fully completed. + */ + @Test + void withGradeBetween99And100() { + GradeWeight weights = new GradeWeight(0.1f, 0.3f, 0.6f, 0.0f); + + GradeValues grades = new GradeValues(); + grades.setBranchGrade(20, 21); + grades.setMutationGrade(27, 27); + grades.setMetaGrade(17, 17); + grades.setCheckGrade(0, 0); + + int finalGrade = new GradeCalculator().calculateFinalGrade(grades, weights); + + assertThat(finalGrade).isEqualTo(99); + } + + @ParameterizedTest + @MethodSource("zeroWeights") + void withZeroWeights(int coveredBranches, int totalBranches, + int detectedMutations, int totalMutations, + int metaTestsPassed, int totalMetaTests, + int checksPassed, int totalChecks, int expectedGrade) { + + GradeWeight weights = new GradeWeight(0.4f, 0.0f, 0.5f, 0.1f); + + GradeValues grades = new GradeValues(); + grades.setBranchGrade(coveredBranches, totalBranches); + grades.setMutationGrade(detectedMutations, totalMutations); + grades.setMetaGrade(metaTestsPassed, totalMetaTests); + grades.setCheckGrade(checksPassed, totalChecks); + + int finalGrade = new GradeCalculator().calculateFinalGrade(grades, weights); + + assertThat(finalGrade).isEqualTo(expectedGrade); + } + + private static Stream<Arguments> zeroWeights() { + return Stream.of( + of(25, 25, 2, 55, 100, 100, 5, 5, 100), // 0.4*1 + 0*(2/55) + 0.5*1 + 0.1*1 = 1.0 --> 100 + of(25, 25, 2, 55, 100, 100, 4, 5, 98), // 0.4*1 + 0*(2/55) + 0.5*1 + 0.1*(4/5) = 0.98 --> 98 + of(25, 25, 55, 55, 100, 100, 4, 5, 98) // 0.4*1 + 0*1 + 0.5*1 + 0.1*(4/5) = 0.98 --> 98 + ); + } }

['src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java', 'src/test/java/unit/grade/GradeCalculatorTest.java']

{'.java': 2}

Java

{'Java': 1238634, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Makefile': 12592, 'Dockerfile': 1722, 'NASL': 1620, 'Shell': 63}

MIT License

telstra/open-kilda/3853/3871

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3871

https://github.com/telstra/open-kilda/pull/3853

https://github.com/telstra/open-kilda/pull/3853

closes

[Server42] disabling 'server42_flow_rtt' in feature toggle leads to excess rules on a switch with enabled 'server42_flow_rtt'

**Steps to reproduce:** 1. enable `server42_flow_rtt` in feature toggle and on a switch; 2. make sure the switch is valid; 3. disable the `server42_flow_rtt` feature toggle; **Actual result:** The switch has the excess server42 rules ``` "excess": [ -9223372036854775783, -9223372036854775782, -9223372036854775781 ], "excess-hex": [ "8000000000000019", "800000000000001a", "800000000000001b" ], ``` **Expected result:** The switch should be valid after disabling the 'server42_flow_rtt' feature toggle

1b6441b8d478b2360e947dbf138c23004692121f

95965992ce961d1a1159b15683baf51ad46709a3

https://github.com/telstra/open-kilda/compare/1b6441b8d478b2360e947dbf138c23004692121f...95965992ce961d1a1159b15683baf51ad46709a3

diff --git a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/GetExpectedDefaultRulesRequest.java b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/GetExpectedDefaultRulesRequest.java index cb00cd99b..2cb382c6d 100644 --- a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/GetExpectedDefaultRulesRequest.java +++ b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/GetExpectedDefaultRulesRequest.java @@ -44,8 +44,11 @@ public class GetExpectedDefaultRulesRequest extends CommandData { @JsonProperty("switch_arp") private boolean switchArp; - @JsonProperty("server42_flow_rtt") - private boolean server42FlowRtt; + @JsonProperty("server42_flow_rtt_feature_toggle") + private boolean server42FlowRttFeatureToggle; + + @JsonProperty("server42_flow_rtt_switch_property") + private boolean server42FlowRttSwitchProperty; @JsonProperty("server42_port") private Integer server42Port; @@ -76,7 +79,10 @@ public class GetExpectedDefaultRulesRequest extends CommandData { @JsonProperty("multi_table") boolean multiTable, @JsonProperty("switch_lldp") boolean switchLldp, @JsonProperty("switch_arp") boolean switchArp, - @JsonProperty("server42_flow_rtt") boolean server42FlowRtt, + @JsonProperty("server42_flow_rtt_feature_toggle") + boolean server42FlowRttFeatureToggle, + @JsonProperty("server42_flow_rtt_switch_property") + boolean server42FlowRttSwitchProperty, @JsonProperty("server42_port") Integer server42Port, @JsonProperty("server42_vlan") Integer server42Vlan, @JsonProperty("server42_mac_address") MacAddress server42MacAddress, @@ -90,7 +96,8 @@ public class GetExpectedDefaultRulesRequest extends CommandData { this.multiTable = multiTable; this.switchLldp = switchLldp; this.switchArp = switchArp; - this.server42FlowRtt = server42FlowRtt; + this.server42FlowRttFeatureToggle = server42FlowRttFeatureToggle; + this.server42FlowRttSwitchProperty = server42FlowRttSwitchProperty; this.server42Port = server42Port; this.server42Vlan = server42Vlan; this.server42MacAddress = server42MacAddress; diff --git a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesDeleteRequest.java b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesDeleteRequest.java index a4e544e2b..8dae46093 100644 --- a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesDeleteRequest.java +++ b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesDeleteRequest.java @@ -58,8 +58,11 @@ public class SwitchRulesDeleteRequest extends CommandData { @JsonProperty("switch_arp") private boolean switchArp = false; - @JsonProperty("server42_flow_rtt") - private boolean server42FlowRtt = false; + @JsonProperty("server42_flow_rtt_feature_toggle") + private boolean server42FlowRttFeatureToggle = false; + + @JsonProperty("server42_flow_rtt_switch_property") + private boolean server42FlowRttSwitchProperty = false; @JsonProperty("server42_port") private Integer server42Port; diff --git a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesInstallRequest.java b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesInstallRequest.java index e89d8beab..7d23982d3 100644 --- a/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesInstallRequest.java +++ b/src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesInstallRequest.java @@ -52,8 +52,11 @@ public class SwitchRulesInstallRequest extends CommandData { @JsonProperty("switch_arp") private boolean switchArp = false; - @JsonProperty("server42_flow_rtt") - private boolean server42FlowRtt = false; + @JsonProperty("server42_flow_rtt_feature_toggle") + private boolean server42FlowRttFeatureToggle = false; + + @JsonProperty("server42_flow_rtt_switch_property") + private boolean server42FlowRttSwitchProperty = false; @JsonProperty("server42_port") private Integer server42Port; diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java index 95d04de40..02876d96b 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java @@ -756,18 +756,22 @@ class RecordHandler implements Runnable { Integer server42Port = request.getServer42Port(); Integer server42Vlan = request.getServer42Vlan(); MacAddress server42MacAddress = request.getServer42MacAddress(); - if (request.isServer42FlowRtt() && server42Port != null && server42Vlan != null - && server42MacAddress != null) { + + if (request.isServer42FlowRttFeatureToggle()) { installedRules.add( processInstallDefaultFlowByCookie(request.getSwitchId(), SERVER_42_TURNING_COOKIE)); - installedRules.add(switchManager.installServer42OutputVlanFlow( - dpid, server42Port, server42Vlan, server42MacAddress)); - installedRules.add(switchManager.installServer42OutputVxlanFlow( - dpid, server42Port, server42Vlan, server42MacAddress)); - - for (Integer port : request.getServer42FlowRttPorts()) { - installedRules.add(switchManager.installServer42InputFlow( - dpid, server42Port, port, server42MacAddress)); + + if (request.isServer42FlowRttSwitchProperty() && server42Port != null && server42Vlan != null + && server42MacAddress != null) { + installedRules.add(switchManager.installServer42OutputVlanFlow( + dpid, server42Port, server42Vlan, server42MacAddress)); + installedRules.add(switchManager.installServer42OutputVxlanFlow( + dpid, server42Port, server42Vlan, server42MacAddress)); + + for (Integer port : request.getServer42FlowRttPorts()) { + installedRules.add(switchManager.installServer42InputFlow( + dpid, server42Port, port, server42MacAddress)); + } } } } @@ -951,7 +955,8 @@ class RecordHandler implements Runnable { removedRules.addAll(switchManager.deleteDefaultRules(dpid, request.getIslPorts(), request.getFlowPorts(), request.getFlowLldpPorts(), request.getFlowArpPorts(), request.getServer42FlowRttPorts(), request.isMultiTable(), request.isSwitchLldp(), - request.isSwitchArp(), request.isServer42FlowRtt())); + request.isSwitchArp(), + request.isServer42FlowRttFeatureToggle() && request.isServer42FlowRttSwitchProperty())); } } @@ -1008,16 +1013,19 @@ class RecordHandler implements Runnable { Integer server42Port = request.getServer42Port(); Integer server42Vlan = request.getServer42Vlan(); MacAddress server42MacAddress = request.getServer42MacAddress(); - if (request.isServer42FlowRtt() && server42Port != null && server42Vlan != null - && server42MacAddress != null) { + if (request.isServer42FlowRttFeatureToggle()) { switchManager.installServer42TurningFlow(dpid); - switchManager.installServer42OutputVlanFlow( - dpid, server42Port, server42Vlan, server42MacAddress); - switchManager.installServer42OutputVxlanFlow( - dpid, server42Port, server42Vlan, server42MacAddress); - for (Integer port : request.getServer42FlowRttPorts()) { - switchManager.installServer42InputFlow(dpid, server42Port, port, server42MacAddress); + if (request.isServer42FlowRttSwitchProperty() && server42Port != null && server42Vlan != null + && server42MacAddress != null) { + switchManager.installServer42OutputVlanFlow( + dpid, server42Port, server42Vlan, server42MacAddress); + switchManager.installServer42OutputVxlanFlow( + dpid, server42Port, server42Vlan, server42MacAddress); + + for (Integer port : request.getServer42FlowRttPorts()) { + switchManager.installServer42InputFlow(dpid, server42Port, port, server42MacAddress); + } } } } @@ -1073,7 +1081,8 @@ class RecordHandler implements Runnable { boolean multiTable = request.isMultiTable(); boolean switchLldp = request.isSwitchLldp(); boolean switchArp = request.isSwitchArp(); - boolean server42FlowRtt = request.isServer42FlowRtt(); + boolean server42FlowRttFeatureToggle = request.isServer42FlowRttFeatureToggle(); + boolean server42FlowRttSwitchProperty = request.isServer42FlowRttSwitchProperty(); Integer server42Port = request.getServer42Port(); Integer server42Vlan = request.getServer42Vlan(); MacAddress server42MacAddress = request.getServer42MacAddress(); @@ -1103,11 +1112,9 @@ class RecordHandler implements Runnable { defaultRules.add(context.getSwitchManager().buildArpInputCustomerFlow(dpid, port)); } } - if (server42FlowRtt) { - defaultRules.addAll(context.getSwitchManager() - .buildExpectedServer42Flows(dpid, server42Port, server42Vlan, server42MacAddress, - server42FlowRttPorts)); - } + defaultRules.addAll(context.getSwitchManager() + .buildExpectedServer42Flows(dpid, server42FlowRttFeatureToggle, server42FlowRttSwitchProperty, + server42Port, server42Vlan, server42MacAddress, server42FlowRttPorts)); List<FlowEntry> flows = defaultRules.stream() .map(OfFlowStatsMapper.INSTANCE::toFlowEntry) diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/ISwitchManager.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/ISwitchManager.java index f2b9e05ef..5e9b2283c 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/ISwitchManager.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/ISwitchManager.java @@ -424,15 +424,18 @@ public interface ISwitchManager extends IFloodlightService { * Build all expected Server 42 rules. * * @param dpid switch id - * @param server42Port server 42 port - * @param server42Vlan vlan of packer received from server 42 - * @param server42MacAddress mac address of server 42 + * @param server42FlowRttFeatureToggle server 42 feature toggle + * @param server42FlowRttSwitchProperty server 42 switch property + * @param server42Port server 42 port. Could be null if server42FlowRttSwitchProperty is false + * @param server42Vlan vlan of packer received from server 42. + * Could be null if server42FlowRttSwitchProperty is false + * @param server42MacAddress mac address of server 42. Could be null if server42FlowRttSwitchProperty is false * @param customerPorts switch ports with enabled server 42 ping * @return modification command */ List<OFFlowMod> buildExpectedServer42Flows( - DatapathId dpid, int server42Port, int server42Vlan, MacAddress server42MacAddress, - Set<Integer> customerPorts) + DatapathId dpid, boolean server42FlowRttFeatureToggle, boolean server42FlowRttSwitchProperty, + Integer server42Port, Integer server42Vlan, MacAddress server42MacAddress, Set<Integer> customerPorts) throws SwitchNotFoundException; /** diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchManager.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchManager.java index 52dc453a6..83f9251f3 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchManager.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchManager.java @@ -1773,18 +1773,25 @@ public class SwitchManager implements IFloodlightModule, IFloodlightService, ISw @Override public List<OFFlowMod> buildExpectedServer42Flows( - DatapathId dpid, int server42Port, int server42Vlan, org.openkilda.model.MacAddress server42MacAddress, + DatapathId dpid, boolean server42FlowRttFeatureToggle, boolean server42FlowRttSwitchProperty, + Integer server42Port, Integer server42Vlan, org.openkilda.model.MacAddress server42MacAddress, Set<Integer> customerPorts) throws SwitchNotFoundException { List<SwitchFlowGenerator> generators = new ArrayList<>(); - for (Integer port : customerPorts) { - generators.add(switchFlowFactory.getServer42InputFlowGenerator(server42Port, port, server42MacAddress)); - } - generators.add(switchFlowFactory.getServer42TurningFlowGenerator()); - generators.add(switchFlowFactory.getServer42OutputVlanFlowGenerator( - server42Port, server42Vlan, server42MacAddress)); - generators.add(switchFlowFactory.getServer42OutputVxlanFlowGenerator( - server42Port, server42Vlan, server42MacAddress)); + if (server42FlowRttFeatureToggle) { + generators.add(switchFlowFactory.getServer42TurningFlowGenerator()); + + if (server42FlowRttSwitchProperty) { + for (Integer port : customerPorts) { + generators.add(switchFlowFactory.getServer42InputFlowGenerator( + server42Port, port, server42MacAddress)); + } + generators.add(switchFlowFactory.getServer42OutputVlanFlowGenerator( + server42Port, server42Vlan, server42MacAddress)); + generators.add(switchFlowFactory.getServer42OutputVxlanFlowGenerator( + server42Port, server42Vlan, server42MacAddress)); + } + } IOFSwitch sw = lookupSwitch(dpid); return generators.stream() diff --git a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/NbWorkerTopology.java b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/NbWorkerTopology.java index 5424742ad..0ef489304 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/NbWorkerTopology.java +++ b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/NbWorkerTopology.java @@ -229,6 +229,7 @@ public class NbWorkerTopology extends AbstractTopology<NbWorkerTopologyConfig> { .shuffleGrouping(SWITCHES_BOLT_NAME, StreamType.TO_SWITCH_MANAGER.toString()) .shuffleGrouping(ROUTER_BOLT_NAME, StreamType.ERROR.toString()) .shuffleGrouping(FEATURE_TOGGLES_BOLT_NAME, StreamType.ERROR.toString()) + .shuffleGrouping(FEATURE_TOGGLES_BOLT_NAME, StreamType.TO_SWITCH_MANAGER.toString()) .shuffleGrouping(KILDA_CONFIG_BOLT_NAME, StreamType.ERROR.toString()) .shuffleGrouping(PATHS_BOLT_NAME, StreamType.ERROR.toString()) .shuffleGrouping(HISTORY_BOLT_NAME, StreamType.ERROR.toString()) diff --git a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/bolts/FeatureTogglesBolt.java b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/bolts/FeatureTogglesBolt.java index b52692701..7ef7152b8 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/bolts/FeatureTogglesBolt.java +++ b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/bolts/FeatureTogglesBolt.java @@ -15,6 +15,7 @@ package org.openkilda.wfm.topology.nbworker.bolts; +import org.openkilda.messaging.command.switches.SwitchValidateRequest; import org.openkilda.messaging.error.ErrorType; import org.openkilda.messaging.error.MessageException; import org.openkilda.messaging.info.InfoData; @@ -25,9 +26,11 @@ import org.openkilda.messaging.nbtopology.request.CreateOrUpdateFeatureTogglesRe import org.openkilda.messaging.nbtopology.request.GetFeatureTogglesRequest; import org.openkilda.messaging.nbtopology.response.FeatureTogglesResponse; import org.openkilda.model.FeatureToggles; +import org.openkilda.model.SwitchId; import org.openkilda.persistence.PersistenceManager; import org.openkilda.wfm.error.FeatureTogglesNotFoundException; import org.openkilda.wfm.share.mappers.FeatureTogglesMapper; +import org.openkilda.wfm.share.utils.KeyProvider; import org.openkilda.wfm.topology.nbworker.StreamType; import org.openkilda.wfm.topology.nbworker.services.FeatureTogglesService; import org.openkilda.wfm.topology.nbworker.services.IFeatureTogglesCarrier; @@ -94,6 +97,18 @@ public class FeatureTogglesBolt extends PersistenceOperationsBolt implements IFe emit(STREAM_NOTIFICATION_ID, getCurrentTuple(), makeNotificationTuple(payload)); } + @Override + public void requestSwitchSync(SwitchId switchId) { + SwitchValidateRequest data = SwitchValidateRequest.builder() + .switchId(switchId) + .performSync(true) + .processMeters(true) + .removeExcess(true) + .build(); + getOutput().emit(StreamType.TO_SWITCH_MANAGER.toString(), getCurrentTuple(), + new Values(data, KeyProvider.generateChainedKey(getCorrelationId()))); + } + // -- private -- private Values makeNotificationTuple(InfoData payload) { @@ -106,5 +121,7 @@ public class FeatureTogglesBolt extends PersistenceOperationsBolt implements IFe public void declareOutputFields(OutputFieldsDeclarer declarer) { super.declareOutputFields(declarer); declarer.declareStream(STREAM_NOTIFICATION_ID, STREAM_NOTIFICATION_FIELDS); + declarer.declareStream(StreamType.TO_SWITCH_MANAGER.toString(), + new Fields(MessageEncoder.FIELD_ID_PAYLOAD, MessageEncoder.FIELD_ID_CONTEXT)); } } diff --git a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FeatureTogglesService.java b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FeatureTogglesService.java index 764f9fc90..d2d856ca2 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FeatureTogglesService.java +++ b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FeatureTogglesService.java @@ -17,13 +17,16 @@ package org.openkilda.wfm.topology.nbworker.services; import org.openkilda.model.FeatureToggles; import org.openkilda.model.FeatureToggles.FeatureTogglesCloner; +import org.openkilda.model.Switch; import org.openkilda.persistence.repositories.FeatureTogglesRepository; import org.openkilda.persistence.repositories.RepositoryFactory; +import org.openkilda.persistence.repositories.SwitchRepository; import org.openkilda.persistence.tx.TransactionManager; import org.openkilda.wfm.error.FeatureTogglesNotFoundException; import lombok.extern.slf4j.Slf4j; +import java.util.Collection; import java.util.Optional; @Slf4j @@ -31,12 +34,14 @@ public class FeatureTogglesService { private final IFeatureTogglesCarrier carrier; private FeatureTogglesRepository featureTogglesRepository; + private SwitchRepository switchRepository; private TransactionManager transactionManager; public FeatureTogglesService(IFeatureTogglesCarrier carrier, RepositoryFactory repositoryFactory, TransactionManager transactionManager) { this.carrier = carrier; this.featureTogglesRepository = repositoryFactory.createFeatureTogglesRepository(); + this.switchRepository = repositoryFactory.createSwitchRepository(); this.transactionManager = transactionManager; } @@ -71,6 +76,15 @@ public class FeatureTogglesService { if (!before.equals(after)) { log.info("Emit feature-toggles update notification - toggles:{}", after); carrier.featureTogglesUpdateNotification(after); + + if (before.getServer42FlowRtt() != after.getServer42FlowRtt()) { + Collection<Switch> switches = switchRepository.findActive(); + + for (Switch sw : switches) { + log.info("Emit switch {} sync command", sw.getSwitchId()); + carrier.requestSwitchSync(sw.getSwitchId()); + } + } } return after; } diff --git a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/IFeatureTogglesCarrier.java b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/IFeatureTogglesCarrier.java index ffdb3bb2e..9fef92a89 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/IFeatureTogglesCarrier.java +++ b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/IFeatureTogglesCarrier.java @@ -16,7 +16,10 @@ package org.openkilda.wfm.topology.nbworker.services; import org.openkilda.model.FeatureToggles; +import org.openkilda.model.SwitchId; public interface IFeatureTogglesCarrier { void featureTogglesUpdateNotification(FeatureToggles toggles); + + void requestSwitchSync(SwitchId switchId); } diff --git a/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/fsm/SwitchValidateFsm.java b/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/fsm/SwitchValidateFsm.java index 64e8cdadf..6b62e6ab9 100644 --- a/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/fsm/SwitchValidateFsm.java +++ b/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/fsm/SwitchValidateFsm.java @@ -79,7 +79,6 @@ import org.squirrelframework.foundation.fsm.impl.AbstractStateMachine; import java.util.HashSet; import java.util.List; -import java.util.Optional; import java.util.Set; @Slf4j @@ -334,9 +333,7 @@ public class SwitchValidateFsm extends AbstractStateMachine< final SwitchId switchId = getSwitchId(); log.info("Sending requests to get expected switch service rules (switch={}, key={})", switchId, key); - - Optional<FeatureToggles> featureToggles = featureTogglesRepository.find(); - boolean isServer42FlowRtt = switchProperties.isServer42FlowRtt() && featureToggles + boolean isServer42FlowRttFeatureToggle = featureTogglesRepository.find() .map(FeatureToggles::getServer42FlowRtt) .orElse(FeatureToggles.DEFAULTS.getServer42FlowRtt()); @@ -346,7 +343,8 @@ public class SwitchValidateFsm extends AbstractStateMachine< .multiTable(isMultiTable) .switchLldp(isSwitchLldp) .switchArp(isSwitchArp) - .server42FlowRtt(isServer42FlowRtt) + .server42FlowRttFeatureToggle(isServer42FlowRttFeatureToggle) + .server42FlowRttSwitchProperty(switchProperties.isServer42FlowRtt()) .server42Port(switchProperties.getServer42Port()) .server42Vlan(switchProperties.getServer42Vlan()) .server42MacAddress(switchProperties.getServer42MacAddress()); @@ -366,7 +364,7 @@ public class SwitchValidateFsm extends AbstractStateMachine< if (flowSide.isMultiTableSegment()) { payload.flowPort(endpoint.getPortNumber()); - if (isServer42FlowRtt && !flow.isOneSwitchFlow()) { + if (isServer42FlowRttFeatureToggle && switchProperties.isServer42FlowRtt() && !flow.isOneSwitchFlow()) { payload.server42FlowRttPort(endpoint.getPortNumber()); } } diff --git a/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/service/impl/SwitchRuleServiceImpl.java b/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/service/impl/SwitchRuleServiceImpl.java index 80c8d544b..8385093e0 100644 --- a/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/service/impl/SwitchRuleServiceImpl.java +++ b/src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/service/impl/SwitchRuleServiceImpl.java @@ -75,14 +75,15 @@ public class SwitchRuleServiceImpl implements SwitchRuleService { return; } Optional<SwitchProperties> switchProperties = switchPropertiesRepository.findBySwitchId(switchId); - if (switchProperties.isPresent()) { - boolean server42Rtt = featureTogglesRepository.find().map(FeatureToggles::getServer42FlowRtt).orElse(false) - && switchProperties.get().isServer42FlowRtt(); + boolean server42FeatureToggle = featureTogglesRepository.find() + .map(FeatureToggles::getServer42FlowRtt).orElse(false); + data.setServer42FlowRttFeatureToggle(server42FeatureToggle); + if (switchProperties.isPresent()) { data.setMultiTable(switchProperties.get().isMultiTable()); data.setSwitchLldp(switchProperties.get().isSwitchLldp()); data.setSwitchArp(switchProperties.get().isSwitchArp()); - data.setServer42FlowRtt(server42Rtt); + data.setServer42FlowRttSwitchProperty(switchProperties.get().isServer42FlowRtt()); data.setServer42Port(switchProperties.get().getServer42Port()); data.setServer42Vlan(switchProperties.get().getServer42Vlan()); data.setServer42MacAddress(switchProperties.get().getServer42MacAddress()); @@ -92,7 +93,7 @@ public class SwitchRuleServiceImpl implements SwitchRuleService { Set<Integer> flowArpPorts = new HashSet<>(); Set<Integer> server42FlowPorts = new HashSet<>(); fillFlowPorts(switchProperties.get(), flowPaths, flowPorts, flowLldpPorts, flowArpPorts, server42FlowPorts, - server42Rtt); + server42FeatureToggle && switchProperties.get().isServer42FlowRtt()); data.setFlowPorts(flowPorts); data.setFlowLldpPorts(flowLldpPorts); @@ -118,14 +119,16 @@ public class SwitchRuleServiceImpl implements SwitchRuleService { return; } Optional<SwitchProperties> switchProperties = switchPropertiesRepository.findBySwitchId(switchId); - if (switchProperties.isPresent()) { - boolean server42Rtt = featureTogglesRepository.find().map(FeatureToggles::getServer42FlowRtt).orElse(false) - && switchProperties.get().isServer42FlowRtt(); + boolean server42FeatureToggle = featureTogglesRepository.find() + .map(FeatureToggles::getServer42FlowRtt).orElse(false); + data.setServer42FlowRttFeatureToggle(server42FeatureToggle); + + if (switchProperties.isPresent()) { data.setMultiTable(switchProperties.get().isMultiTable()); data.setSwitchLldp(switchProperties.get().isSwitchLldp()); data.setSwitchArp(switchProperties.get().isSwitchArp()); - data.setServer42FlowRtt(server42Rtt); + data.setServer42FlowRttSwitchProperty(switchProperties.get().isServer42FlowRtt()); data.setServer42Port(switchProperties.get().getServer42Port()); data.setServer42Vlan(switchProperties.get().getServer42Vlan()); data.setServer42MacAddress(switchProperties.get().getServer42MacAddress()); @@ -135,7 +138,7 @@ public class SwitchRuleServiceImpl implements SwitchRuleService { Set<Integer> flowArpPorts = new HashSet<>(); Set<Integer> server42FlowPorts = new HashSet<>(); fillFlowPorts(switchProperties.get(), flowPaths, flowPorts, flowLldpPorts, flowArpPorts, server42FlowPorts, - server42Rtt); + server42FeatureToggle && switchProperties.get().isServer42FlowRtt()); data.setFlowPorts(flowPorts); data.setFlowLldpPorts(flowLldpPorts); data.setFlowArpPorts(flowArpPorts);

['src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesInstallRequest.java', 'src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/GetExpectedDefaultRulesRequest.java', 'src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/IFeatureTogglesCarrier.java', 'src-java/floodlight-service/floodlight-api/src/main/java/org/openkilda/messaging/command/switches/SwitchRulesDeleteRequest.java', 'src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/service/impl/SwitchRuleServiceImpl.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/ISwitchManager.java', 'src-java/swmanager-topology/swmanager-storm-topology/src/main/java/org/openkilda/wfm/topology/switchmanager/fsm/SwitchValidateFsm.java', 'src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/bolts/FeatureTogglesBolt.java', 'src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FeatureTogglesService.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchManager.java', 'src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/NbWorkerTopology.java']

{'.java': 12}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

serg-delft/andy/86/83

serg-delft

andy

https://github.com/SERG-Delft/andy/issues/83

https://github.com/SERG-Delft/andy/pull/86

https://github.com/SERG-Delft/andy/pull/86

fixes

Overload Andy constructor

Overload the Andy constructor in order to preserve backward compatibility after the changes introduced in #70 as those changes break the Maven plugin

28faca02fe2c80e58ca06a01390cf6007fb96f32

86803722431cb76859ee539f530eeeb82c7047ee

https://github.com/serg-delft/andy/compare/28faca02fe2c80e58ca06a01390cf6007fb96f32...86803722431cb76859ee539f530eeeb82c7047ee

diff --git a/src/main/java/nl/tudelft/cse1110/andy/Andy.java b/src/main/java/nl/tudelft/cse1110/andy/Andy.java index 1aaef12..342db50 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/Andy.java +++ b/src/main/java/nl/tudelft/cse1110/andy/Andy.java @@ -33,10 +33,18 @@ public class Andy { this.metaData = metaData; } + public Andy(Action action, String workDir, String outputDir, List<String> librariesToBeIncluded, ResultWriter writer) { + this(action, workDir, outputDir, librariesToBeIncluded, writer, SubmissionMetaData.empty()); + } + public Andy(Action action, String workDir, String outputDir, ResultWriter writer, SubmissionMetaData metaData) { this(action, workDir, outputDir, null, writer, metaData); } + public Andy(Action action, String workDir, String outputDir, ResultWriter writer) { + this(action, workDir, outputDir, null, writer); + } + public void run() { Context ctx = buildContext(); diff --git a/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java b/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java index f25a358..5eb64de 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java +++ b/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java @@ -10,4 +10,8 @@ public class SubmissionMetaData { this.studentId = studentId; this.exercise = exercise; } + + public static SubmissionMetaData empty() { + return new SubmissionMetaData(null, null, null); + } } \\ No newline at end of file

['src/main/java/nl/tudelft/cse1110/andy/Andy.java', 'src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java']

{'.java': 2}

Java

{'Java': 1238634, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Makefile': 12592, 'Dockerfile': 1722, 'NASL': 1620, 'Shell': 63}

MIT License

telstra/open-kilda/3664/3603

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3603

https://github.com/telstra/open-kilda/pull/3664

https://github.com/telstra/open-kilda/pull/3664

close

Unhandled exception in org.openkilda.wfm.topology.nbworker.bolts.FlowOperationsBolt

Sometimes we receive the below exception. [error11153.txt](https://github.com/telstra/open-kilda/files/4884154/error11153.txt) search reference: ``` Duplicate key Flow(entityId=22849, flowId=03Jul135507_722_capsicum2093, srcSwitch=Switch(entityId=83, switchId=00:00:00:00:00:00:00:01, status=INACTIVE, socketAddress=/172.18.0.24:40782, hostname=lab_service-1.kilda-controller_default, controller=null, description=Nicira, Inc. OF_13 2.12.0, ofVersion=OF_13, ofDescriptionManufacturer=Nicira, Inc., ofDescriptionHardware=Open vSwitch, ofDescriptionSoftware=2.12.0, ofDescriptionSerialNumber=None, ofDescriptionDatapath=None, features=[RESET_COUNTS_FLAG, GROUP_PACKET_OUT_CONTROLLER, PKTPS_FLAG, METERS, MULTI_TABLE, MATCH_UDP_PORT], underMaintenance=false, timeCreate=null, timeModify=null, pop=null, latitude=0.0, longitude=0.0, street=null, city=null, country=null), destSwitch=Switch(entityId=83, switchId=00:00:00:00:00:00:00:01, status=INACTIVE, socketAddress=/172.18.0.24:40782, hostname... ```

f7f09f0666353009488a47612361ab2f3cbdded1

4494aca7b97b961c7e6a8ed81850e56bb68a509d

https://github.com/telstra/open-kilda/compare/f7f09f0666353009488a47612361ab2f3cbdded1...4494aca7b97b961c7e6a8ed81850e56bb68a509d

diff --git a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FlowOperationsService.java b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FlowOperationsService.java index a34dd59e6..3621c6c3d 100644 --- a/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FlowOperationsService.java +++ b/src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FlowOperationsService.java @@ -72,6 +72,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; @Slf4j public class FlowOperationsService { @@ -182,26 +183,27 @@ public class FlowOperationsService { if (!switchRepository.findById(switchId).isPresent()) { throw new SwitchNotFoundException(switchId); } - Set<Flow> flows = new HashSet<>(); if (port != null) { - flowPathRepository.findBySegmentEndpoint(switchId, port).stream() - // NOTE(tdurakov): filter out paths here that are orphaned for the flow - .filter(flowPath -> flowPath.getFlow().isActualPathId(flowPath.getPathId())) - .map(FlowPath::getFlow) - .forEach(flows::add); - flows.addAll(flowRepository.findByEndpoint(switchId, port)); + return getFlowsForEndpoint(flowPathRepository.findBySegmentEndpoint(switchId, port), + flowRepository.findByEndpoint(switchId, port)); } else { - flowPathRepository.findBySegmentSwitch(switchId).stream() - // NOTE(tdurakov): filter out paths here that are orphaned for the flow - .filter(flowPath -> flowPath.getFlow().isActualPathId(flowPath.getPathId())) - .map(FlowPath::getFlow) - .forEach(flows::add); - flows.addAll(flowRepository.findByEndpointSwitch(switchId)); + return getFlowsForEndpoint(flowPathRepository.findBySegmentSwitch(switchId), + flowRepository.findByEndpointSwitch(switchId)); } + } + + private Collection<Flow> getFlowsForEndpoint(Collection<FlowPath> flowPaths, + Collection<Flow> flows) { + Stream<Flow> flowBySegment = flowPaths.stream() + // NOTE(tdurakov): filter out paths here that are orphaned for the flow + .filter(flowPath -> flowPath.getFlow().isActualPathId(flowPath.getPathId())) + .map(FlowPath::getFlow); // need to return Flows unique by id - return flows.stream() - .collect(Collectors.toMap(Flow::getFlowId, Function.identity())) + // Due to possible race condition we can have one flow with different flow paths + // In this case we should get the last one + return Stream.concat(flowBySegment, flows.stream()) + .collect(Collectors.toMap(Flow::getFlowId, Function.identity(), (flow1, flow2) -> flow2)) .values(); }

['src-java/nbworker-topology/nbworker-storm-topology/src/main/java/org/openkilda/wfm/topology/nbworker/services/FlowOperationsService.java']

{'.java': 1}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3376/3369

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3369

https://github.com/telstra/open-kilda/pull/3376

https://github.com/telstra/open-kilda/pull/3376

close

Periodic fl router sync in rare cases may disrupt ISL discovery process on port

**Scenario:** given: port is in DOWN state 1. Floodlight router periodic sync happens 2. simultaneously with sync a port UP event happens At this point race appears. Because sync uses correlationId as key when writing to kafka and portUp event uses switchId, the order of events may disrupt, so that portUp event gets immediately followed buy portDown state (comming from sync), causing the related port to be considered by the system as 'Down'. This in turn will prevent a related ISL on that port to be discovered until next periodic sync happens. **Expected:** Disruption of port events order should not happen

67e32cb4a6e8a648789c02434db9331bab413378

bbd6e82d1bad685effd010edc8cd7c68650789da

https://github.com/telstra/open-kilda/compare/67e32cb4a6e8a648789c02434db9331bab413378...bbd6e82d1bad685effd010edc8cd7c68650789da

diff --git a/src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/ChunkedInfoMessage.java b/src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/ChunkedInfoMessage.java index d3f8db22b..f3b9567a7 100644 --- a/src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/ChunkedInfoMessage.java +++ b/src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/ChunkedInfoMessage.java @@ -51,11 +51,4 @@ public class ChunkedInfoMessage extends InfoMessage { this.messageId = String.join(" : ", String.valueOf(messageIndex), correlationId); this.totalMessages = totalMessages; } - - public ChunkedInfoMessage(InfoData data, long timestamp, String correlationId, - int messageIndex, int totalMessages, String region) { - super(data, timestamp, correlationId, region); - this.messageId = String.join(" : ", String.valueOf(messageIndex), correlationId); - this.totalMessages = totalMessages; - } } diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java index ba4760553..7a56ceac4 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java @@ -191,8 +191,6 @@ class RecordHandler implements Runnable { try { handleCommand(message, replyToTopic, replyDestination); - } catch (SwitchOperationException e) { - logger.error("Unable to handle request {}: {}", message.getData().getClass().getName(), e.getMessage()); } catch (FlowCommandException e) { String errorMessage = e.getCause() != null ? e.getCause().getMessage() : e.getMessage(); logger.error("Failed to handle message {}: {}", message, errorMessage); @@ -205,7 +203,7 @@ class RecordHandler implements Runnable { } private void handleCommand(CommandMessage message, String replyToTopic, Destination replyDestination) - throws FlowCommandException, SwitchOperationException { + throws FlowCommandException { logger.debug("Handling message: '{}'. Reply topic: '{}'. Reply destination: '{}'.", message, replyToTopic, replyDestination); CommandData data = message.getData(); @@ -775,11 +773,11 @@ class RecordHandler implements Runnable { * * @param message NetworkCommandData */ - private void doNetworkDump(final CommandMessage message) throws SwitchOperationException { + private void doNetworkDump(final CommandMessage message) { logger.info("Processing request from WFM to dump switches. {}", message.getCorrelationId()); SwitchTrackingService switchTracking = context.getModuleContext().getServiceImpl(SwitchTrackingService.class); - switchTracking.dumpAllSwitches(message.getCorrelationId()); + switchTracking.dumpAllSwitches(); } private void doInstallSwitchRules(final CommandMessage message) { diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchTrackingService.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchTrackingService.java index 17cb27d95..00dcdbb1d 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchTrackingService.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchTrackingService.java @@ -28,7 +28,6 @@ import org.openkilda.floodlight.utils.CorrelationContext; import org.openkilda.floodlight.utils.FloodlightDashboardLogger; import org.openkilda.floodlight.utils.NewCorrelationContextRequired; import org.openkilda.messaging.Message; -import org.openkilda.messaging.info.ChunkedInfoMessage; import org.openkilda.messaging.info.InfoData; import org.openkilda.messaging.info.InfoMessage; import org.openkilda.messaging.info.discovery.NetworkDumpSwitchData; @@ -77,10 +76,10 @@ public class SwitchTrackingService implements IOFSwitchListener, IService { /** * Send dump contain all connected at this moment switches. */ - public void dumpAllSwitches(String correlationId) { + public void dumpAllSwitches() { discoveryLock.writeLock().lock(); try { - dumpAllSwitchesAction(correlationId); + dumpAllSwitchesAction(); } finally { discoveryLock.writeLock().unlock(); } @@ -167,20 +166,11 @@ public class SwitchTrackingService implements IOFSwitchListener, IService { } } - private void dumpAllSwitchesAction(String correlationId) { + private void dumpAllSwitchesAction() { Collection<IOFSwitch> iofSwitches = switchManager.getAllSwitchMap(true).values(); - int switchCounter = 0; for (IOFSwitch sw : iofSwitches) { - try { - NetworkDumpSwitchData swData = new NetworkDumpSwitchData(buildSwitch(sw)); - producerService.sendMessageAndTrack(discoveryTopic, - correlationId, - new ChunkedInfoMessage(swData, System.currentTimeMillis(), - correlationId, switchCounter, iofSwitches.size(), region)); - } catch (Exception e) { - logger.error("Failed to send network dump for {}", sw.getId()); - } - switchCounter++; + NetworkDumpSwitchData payload = new NetworkDumpSwitchData(buildSwitch(sw)); + emitDiscoveryEvent(sw.getId(), payload); } } @@ -204,28 +194,33 @@ public class SwitchTrackingService implements IOFSwitchListener, IService { private void switchDiscoveryAction(DatapathId dpId, SwitchChangeType event) { logger.info("Send switch discovery ({} - {})", dpId, event); - Message message = null; + SwitchInfoData payload = null; if (SwitchChangeType.DEACTIVATED != event && SwitchChangeType.REMOVED != event) { try { IOFSwitch sw = switchManager.lookupSwitch(dpId); SpeakerSwitchView switchView = buildSwitch(sw); - message = buildSwitchMessage(sw, switchView, event); + payload = buildSwitchMessage(sw, switchView, event); } catch (SwitchNotFoundException e) { logger.error( "Switch {} is not in management state now({}), switch ISL discovery details will be degraded.", dpId, e.getMessage()); } } - if (message == null) { - message = buildSwitchMessage(dpId, event); + if (payload == null) { + payload = buildSwitchMessage(dpId, event); } - producerService.sendMessageAndTrack(discoveryTopic, dpId.toString(), message); + emitDiscoveryEvent(dpId, payload); } private void portDiscoveryAction(DatapathId dpId, OFPortDesc portDesc, PortChangeType changeType) { logger.info("Send port discovery ({}-{} - {})", dpId, portDesc.getPortNo(), changeType); - Message message = buildPortMessage(dpId, portDesc, changeType); + InfoData payload = OfPortDescConverter.INSTANCE.toPortInfoData(dpId, portDesc, changeType); + emitDiscoveryEvent(dpId, payload); + } + + private void emitDiscoveryEvent(DatapathId dpId, InfoData payload) { + Message message = buildMessage(payload); producerService.sendMessageAndTrack(discoveryTopic, dpId.toString(), message); } @@ -236,8 +231,8 @@ public class SwitchTrackingService implements IOFSwitchListener, IService { * @param eventType type of event * @return Message */ - private Message buildSwitchMessage(IOFSwitch sw, SpeakerSwitchView switchView, SwitchChangeType eventType) { - return buildMessage(IofSwitchConverter.buildSwitchInfoData(sw, switchView, eventType)); + private SwitchInfoData buildSwitchMessage(IOFSwitch sw, SpeakerSwitchView switchView, SwitchChangeType eventType) { + return IofSwitchConverter.buildSwitchInfoData(sw, switchView, eventType); } /** @@ -247,21 +242,8 @@ public class SwitchTrackingService implements IOFSwitchListener, IService { * @param eventType type of event * @return Message */ - private Message buildSwitchMessage(DatapathId dpId, SwitchChangeType eventType) { - return buildMessage(new SwitchInfoData(new SwitchId(dpId.getLong()), eventType)); - } - - /** - * Builds a port state change message with port number. - * - * @param switchId datapathId of switch - * @param portDesc port that triggered the event - * @param type type of port event - * @return Message - */ - private Message buildPortMessage(final DatapathId switchId, final OFPortDesc portDesc, final PortChangeType type) { - InfoData data = OfPortDescConverter.INSTANCE.toPortInfoData(switchId, portDesc, type); - return buildMessage(data); + private SwitchInfoData buildSwitchMessage(DatapathId dpId, SwitchChangeType eventType) { + return new SwitchInfoData(new SwitchId(dpId.getLong()), eventType); } /** diff --git a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/switchmanager/SwitchTrackingServiceTest.java b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/switchmanager/SwitchTrackingServiceTest.java index 385d06c40..74e7b41b5 100644 --- a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/switchmanager/SwitchTrackingServiceTest.java +++ b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/switchmanager/SwitchTrackingServiceTest.java @@ -33,8 +33,9 @@ import org.openkilda.floodlight.error.SwitchNotFoundException; import org.openkilda.floodlight.service.FeatureDetectorService; import org.openkilda.floodlight.service.kafka.IKafkaProducerService; import org.openkilda.floodlight.service.kafka.KafkaUtilityService; +import org.openkilda.floodlight.utils.CorrelationContext; +import org.openkilda.floodlight.utils.CorrelationContext.CorrelationContextClosable; import org.openkilda.messaging.Message; -import org.openkilda.messaging.info.ChunkedInfoMessage; import org.openkilda.messaging.info.InfoData; import org.openkilda.messaging.info.InfoMessage; import org.openkilda.messaging.info.discovery.NetworkDumpSwitchData; @@ -364,12 +365,14 @@ public class SwitchTrackingServiceTest extends EasyMockSupport { replayAll(); String correlationId = "unit-test-correlation-id"; - service.dumpAllSwitches(correlationId); + try (CorrelationContextClosable dummy = CorrelationContext.create(correlationId)) { + service.dumpAllSwitches(); + } verify(producerService); ArrayList<Message> expectedMessages = new ArrayList<>(); - expectedMessages.add(new ChunkedInfoMessage( + expectedMessages.add(new InfoMessage( new NetworkDumpSwitchData(new SpeakerSwitchView( new SwitchId(swAid.getLong()), new InetSocketAddress(Inet4Address.getByName("127.0.1.1"), 32768), @@ -380,8 +383,8 @@ public class SwitchTrackingServiceTest extends EasyMockSupport { ImmutableList.of( new SpeakerSwitchPortView(1, SpeakerSwitchPortView.State.UP), new SpeakerSwitchPortView(2, SpeakerSwitchPortView.State.UP)))), - 0, correlationId, 0, 2, "1")); - expectedMessages.add(new ChunkedInfoMessage( + 0, correlationId)); + expectedMessages.add(new InfoMessage( new NetworkDumpSwitchData(new SpeakerSwitchView( new SwitchId(swBid.getLong()), new InetSocketAddress(Inet4Address.getByName("127.0.1.2"), 32768), @@ -393,7 +396,7 @@ public class SwitchTrackingServiceTest extends EasyMockSupport { new SpeakerSwitchPortView(3, SpeakerSwitchPortView.State.UP), new SpeakerSwitchPortView(4, SpeakerSwitchPortView.State.UP), new SpeakerSwitchPortView(5, SpeakerSwitchPortView.State.DOWN)))), - 0, correlationId, 1, 2, "1")); + 0, correlationId)); assertEquals(expectedMessages, producedMessages); }

['src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/switchmanager/SwitchTrackingService.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/kafka/RecordHandler.java', 'src-java/base-topology/base-messaging/src/main/java/org/openkilda/messaging/info/ChunkedInfoMessage.java', 'src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/switchmanager/SwitchTrackingServiceTest.java']

{'.java': 4}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3852/3821

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3821

https://github.com/telstra/open-kilda/pull/3852

https://github.com/telstra/open-kilda/pull/3852

close

System is unable to create a protected flow with max_latency strategy

1. Given a topology, that has at least 2 non-overlapping paths 2. Try creating a protected flow with max_latency strategy and non-zero max_latency ``` { "flow_id" : "protected_flow_max_lat", "source" : { "switch_id" : "00:00:00:00:00:00:00:01", "port_number" : 13, "vlan_id" : 2043 }, "destination" : { "switch_id" : "00:00:00:00:00:00:00:02", "port_number" : 13, "vlan_id" : 4014 }, "maximum_bandwidth" : 123, "max_latency": 11, "path_computation_strategy": "max_latency", "allocate_protected_path": true } ``` **Expected:** System is able to create such flow if there are at least 2 paths that match the max_latency SLA **Actual:** System not able to create such flow, no matter how big max_latency is specified note: special case with `max_latency: 0` works fine autotest that reveals the issue is available

511f17febcd951b12758c9e5d88432a705d50c53

ce5d744a3bd50085d4d81817857415af17c70212

https://github.com/telstra/open-kilda/compare/511f17febcd951b12758c9e5d88432a705d50c53...ce5d744a3bd50085d4d81817857415af17c70212

diff --git a/src-java/kilda-pce/src/main/java/org/openkilda/pce/AvailableNetworkFactory.java b/src-java/kilda-pce/src/main/java/org/openkilda/pce/AvailableNetworkFactory.java index 29a4b0225..def399f25 100644 --- a/src-java/kilda-pce/src/main/java/org/openkilda/pce/AvailableNetworkFactory.java +++ b/src-java/kilda-pce/src/main/java/org/openkilda/pce/AvailableNetworkFactory.java @@ -16,6 +16,7 @@ package org.openkilda.pce; import org.openkilda.model.Flow; +import org.openkilda.model.FlowPath; import org.openkilda.model.Isl; import org.openkilda.model.PathId; import org.openkilda.pce.exception.RecoverableException; @@ -88,7 +89,7 @@ public class AvailableNetworkFactory { flowPaths.forEach(pathId -> flowPathRepository.findById(pathId) .ifPresent(flowPath -> { - network.processDiversitySegments(flowPath.getSegments()); + network.processDiversitySegments(flowPath.getSegments(), flow); network.processDiversitySegmentsWithPop(flowPath.getSegments()); })); } @@ -96,6 +97,11 @@ public class AvailableNetworkFactory { return network; } + private boolean isPrimaryPath(Flow flow, FlowPath flowPath) { + return flowPath.getPathId().equals(flow.getForwardPathId()) + || flowPath.getPathId().equals(flow.getReversePathId()); + } + private Collection<Isl> getAvailableIsls(BuildStrategy buildStrategy, Flow flow) { if (buildStrategy == BuildStrategy.COST) { Collection<Isl> isls = flow.isIgnoreBandwidth() diff --git a/src-java/kilda-pce/src/main/java/org/openkilda/pce/impl/AvailableNetwork.java b/src-java/kilda-pce/src/main/java/org/openkilda/pce/impl/AvailableNetwork.java index b33692c2f..c7c4936ef 100644 --- a/src-java/kilda-pce/src/main/java/org/openkilda/pce/impl/AvailableNetwork.java +++ b/src-java/kilda-pce/src/main/java/org/openkilda/pce/impl/AvailableNetwork.java @@ -15,6 +15,9 @@ package org.openkilda.pce.impl; +import static com.google.common.collect.Sets.newHashSet; + +import org.openkilda.model.Flow; import org.openkilda.model.Isl; import org.openkilda.model.PathSegment; import org.openkilda.model.Switch; @@ -88,15 +91,17 @@ public class AvailableNetwork { /** * Adds diversity weights into {@link AvailableNetwork} based on passed path segments and configuration. */ - public void processDiversitySegments(List<PathSegment> segments) { + public void processDiversitySegments(List<PathSegment> segments, Flow flow) { + Set<SwitchId> terminatingSwitches = newHashSet(flow.getSrcSwitchId(), flow.getDestSwitchId()); for (PathSegment segment : segments) { Node srcNode = getSwitch(segment.getSrcSwitchId()); Node dstNode = getSwitch(segment.getDestSwitchId()); - if (dstNode != null) { + if (dstNode != null && !terminatingSwitches.contains(dstNode.getSwitchId())) { dstNode.increaseDiversityGroupUseCounter(); } - if (srcNode != null && segment.getSeqId() == 0) { + + if (srcNode != null && segment.getSeqId() == 0 && !terminatingSwitches.contains(srcNode.getSwitchId())) { srcNode.increaseDiversityGroupUseCounter(); } diff --git a/src-java/kilda-pce/src/test/java/org/openkilda/pce/AvailableNetworkFactoryTest.java b/src-java/kilda-pce/src/test/java/org/openkilda/pce/AvailableNetworkFactoryTest.java index 2405ccb4d..dd98393a3 100644 --- a/src-java/kilda-pce/src/test/java/org/openkilda/pce/AvailableNetworkFactoryTest.java +++ b/src-java/kilda-pce/src/test/java/org/openkilda/pce/AvailableNetworkFactoryTest.java @@ -142,6 +142,8 @@ public class AvailableNetworkFactoryTest { flow.setSrcSwitch(switchA); flow.setDestSwitch(switchC); flow.setGroupId(GROUP_ID); + flow.setForwardPathId(new PathId("forward_path_id")); + flow.setReversePathId(new PathId("reverse_path_id")); when(config.getNetworkStrategy()).thenReturn(BuildStrategy.COST.name()); when(islRepository.findActiveWithAvailableBandwidth(flow.getBandwidth(), flow.getEncapsulationType())) @@ -150,8 +152,6 @@ public class AvailableNetworkFactoryTest { when(flowPathRepository.findPathIdsByFlowGroupId(GROUP_ID)) .thenReturn(Lists.newArrayList(FORWARD_PATH_ID, REVERSE_PATH_ID)); - - AvailableNetwork availableNetwork = availableNetworkFactory.getAvailableNetwork(flow, Collections.emptyList()); assertEquals(2, availableNetwork.getSwitch(switchB.getSwitchId()).getDiversityGroupUseCounter()); } diff --git a/src-java/kilda-pce/src/test/java/org/openkilda/pce/impl/AvailableNetworkTest.java b/src-java/kilda-pce/src/test/java/org/openkilda/pce/impl/AvailableNetworkTest.java index 1a0938a94..aaf1b703b 100644 --- a/src-java/kilda-pce/src/test/java/org/openkilda/pce/impl/AvailableNetworkTest.java +++ b/src-java/kilda-pce/src/test/java/org/openkilda/pce/impl/AvailableNetworkTest.java @@ -21,6 +21,7 @@ import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import org.openkilda.model.Flow; import org.openkilda.model.FlowPath; import org.openkilda.model.Isl; import org.openkilda.model.IslConfig; @@ -58,6 +59,12 @@ public class AvailableNetworkTest { private static final SwitchId SRC_SWITCH = new SwitchId("00:00:00:22:3d:6c:00:b8"); private static final SwitchId DST_SWITCH = new SwitchId("00:00:00:22:3d:5a:04:87"); + private static final Flow DUMMY_FLOW = Flow.builder() + .flowId("flow-id") + .srcSwitch(Switch.builder().switchId(new SwitchId("1")).build()) + .destSwitch(Switch.builder().switchId(new SwitchId("2")).build()) + .build(); + @Test public void shouldNotAllowDuplicates() { AvailableNetwork network = new AvailableNetwork(); @@ -149,9 +156,8 @@ public class AvailableNetworkTest { addLink(network, DST_SWITCH, SRC_SWITCH, 2, 1, cost, 5); addLink(network, DST_SWITCH, SRC_SWITCH, 1, 3, cost, 5); - network.processDiversitySegments( - asList(buildPathWithSegment(SRC_SWITCH, DST_SWITCH, 3, 1, 0), - buildPathWithSegment(DST_SWITCH, SRC_SWITCH, 1, 3, 0))); + network.processDiversitySegments(singletonList(buildPathSegment(SRC_SWITCH, DST_SWITCH, 3, 1, 0)), DUMMY_FLOW); + network.processDiversitySegments(singletonList(buildPathSegment(DST_SWITCH, SRC_SWITCH, 1, 3, 0)), DUMMY_FLOW); network.reduceByWeight(weightFunction); assertThat(network.getSwitch(SRC_SWITCH).getOutgoingLinks(), Matchers.hasSize(1)); @@ -271,8 +277,8 @@ public class AvailableNetworkTest { network.processDiversitySegmentsWithPop( - asList(buildPathWithSegment(SWITCH_1, SWITCH_3, 2, 1, 0), - buildPathWithSegment(SWITCH_3, SWITCH_5, 2, 2, 1))); + asList(buildPathSegment(SWITCH_1, SWITCH_3, 2, 1, 0), + buildPathSegment(SWITCH_3, SWITCH_5, 2, 2, 1))); for (Edge edge : network.edges) { long currentWeight = weightFunction.apply(edge).toLong(); assertEquals(cost, currentWeight); @@ -329,7 +335,7 @@ public class AvailableNetworkTest { addLink(network, SRC_SWITCH, DST_SWITCH, 7, 60, 10, 3); network.processDiversitySegments( - singletonList(buildPathWithSegment(SRC_SWITCH, DST_SWITCH, 7, 60, 0))); + singletonList(buildPathSegment(SRC_SWITCH, DST_SWITCH, 7, 60, 0)), DUMMY_FLOW); Node srcSwitch = network.getSwitch(SRC_SWITCH); @@ -338,13 +344,35 @@ public class AvailableNetworkTest { assertEquals(1, edge.getDestSwitch().getDiversityGroupUseCounter()); } + @Test + public void shouldFillEmptyDiversityWeightsForTerminatingSwitch() { + AvailableNetwork network = new AvailableNetwork(); + addLink(network, SRC_SWITCH, DST_SWITCH, 7, 60, 10, 3); + + Flow flow = Flow.builder() + .flowId("flow-id") + .srcSwitch(Switch.builder().switchId(SRC_SWITCH).build()) + .destSwitch(Switch.builder().switchId(DST_SWITCH).build()) + .build(); + + network.processDiversitySegments( + singletonList(buildPathSegment(SRC_SWITCH, DST_SWITCH, 7, 60, 0)), flow); + + Node srcSwitch = network.getSwitch(SRC_SWITCH); + + Edge edge = srcSwitch.getOutgoingLinks().iterator().next(); + assertEquals(1, edge.getDiversityGroupUseCounter()); + assertEquals(0, edge.getDestSwitch().getDiversityGroupUseCounter()); + assertEquals(0, edge.getSrcSwitch().getDiversityGroupUseCounter()); + } + @Test public void shouldFillDiversityWeightsTransit() { AvailableNetwork network = new AvailableNetwork(); addLink(network, SRC_SWITCH, DST_SWITCH, 7, 60, 10, 3); network.processDiversitySegments( - singletonList(buildPathWithSegment(SRC_SWITCH, DST_SWITCH, 7, 60, 1))); + singletonList(buildPathSegment(SRC_SWITCH, DST_SWITCH, 7, 60, 1)), DUMMY_FLOW); Node srcSwitch = network.getSwitch(SRC_SWITCH); @@ -368,8 +396,8 @@ public class AvailableNetworkTest { addLink(network, switchB, switchC, 2, 2, 10, 3); addLink(network, switchC, switchD, 3, 3, 10, 3); network.processDiversitySegments(asList( - buildPathWithSegment(switchA, switchB, 1, 1, 0), - buildPathWithSegment(switchC, switchD, 3, 3, 0))); + buildPathSegment(switchA, switchB, 1, 1, 0), + buildPathSegment(switchC, switchD, 3, 3, 0)), DUMMY_FLOW); Node nodeB = network.getSwitch(switchB); @@ -386,7 +414,7 @@ public class AvailableNetworkTest { addLink(network, SRC_SWITCH, DST_SWITCH, 7, 60, 10, 3); network.processDiversitySegments( - singletonList(buildPathWithSegment(SRC_SWITCH, DST_SWITCH, 1, 2, 0))); + singletonList(buildPathSegment(SRC_SWITCH, DST_SWITCH, 1, 2, 0)), DUMMY_FLOW); Node srcSwitch = network.getSwitch(SRC_SWITCH); @@ -420,7 +448,7 @@ public class AvailableNetworkTest { network.addLink(isl); } - private PathSegment buildPathWithSegment(SwitchId srcDpid, SwitchId dstDpid, int srcPort, int dstPort, int seqId) { + private PathSegment buildPathSegment(SwitchId srcDpid, SwitchId dstDpid, int srcPort, int dstPort, int seqId) { return buildPathWithSegment(srcDpid, dstDpid, srcPort, dstPort, null, null, seqId); }

['src-java/kilda-pce/src/main/java/org/openkilda/pce/impl/AvailableNetwork.java', 'src-java/kilda-pce/src/test/java/org/openkilda/pce/impl/AvailableNetworkTest.java', 'src-java/kilda-pce/src/main/java/org/openkilda/pce/AvailableNetworkFactory.java', 'src-java/kilda-pce/src/test/java/org/openkilda/pce/AvailableNetworkFactoryTest.java']

{'.java': 4}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3834/3754

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3754

https://github.com/telstra/open-kilda/pull/3834

https://github.com/telstra/open-kilda/pull/3834

close

GRPC: any error leads to InternalServerError instead of showing actual error

**Step to reproduce:** send a request with an invalid body to a grpc endpoint for examle: ``` curl --location --request PUT '<address_grpc_speaker>/api/v1/noviflow/<ip_address_of_switch>/remotelogserver' \\ --header 'Accept: application/json;charset=UTF-8' \\ --header 'Content-Type: application/json' \\ --header 'Authorization: <credentials>' \\ --data-raw '{ "ip_address": "1.1.1.1111", "port": 10514 }' ``` **Actual result:** 500 InternalServerError ``` {... "error-code": -1, "error-message": "Internal service error" }{... "status": 500, "error": "Internal Server Error", "exception": "java.util.concurrent.CompletionException", "message": "org.openkilda.grpc.speaker.exception.GrpcRequestFailureException: Invalid hostname,please provide valid hostname.", "path": "/api/v1/noviflow/<ip_address_of_switch>/remotelogserver" } ``` **Expected result:** The system should return `400 Bad Request`.

2da2d480b4a66301ca2e834944eb03fed36b2adf

3b7cddd66c7a7d1e3cb42fd928c19b45efbdf9a4

https://github.com/telstra/open-kilda/compare/2da2d480b4a66301ca2e834944eb03fed36b2adf...3b7cddd66c7a7d1e3cb42fd928c19b45efbdf9a4

diff --git a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/client/GrpcResponseObserver.java b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/client/GrpcResponseObserver.java index 142980f87..baa3c9caa 100644 --- a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/client/GrpcResponseObserver.java +++ b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/client/GrpcResponseObserver.java @@ -66,8 +66,6 @@ public class GrpcResponseObserver<V> implements StreamObserver<V> { @Override public void onError(Throwable throwable) { - log.warn(String.format("Error occurred during sending of GRPC request %s on switch %s", - operation, switchAddress), throwable); future.completeExceptionally(throwable); } diff --git a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java index fbc287ece..976105b18 100644 --- a/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java +++ b/src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java @@ -21,6 +21,7 @@ import org.openkilda.grpc.speaker.exception.GrpcRequestFailureException; import org.openkilda.messaging.error.ErrorType; import org.openkilda.messaging.error.GrpcMessageError; +import io.grpc.StatusRuntimeException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -29,15 +30,14 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import java.net.SocketException; -import java.util.concurrent.CompletionException; - @ControllerAdvice public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { - @ExceptionHandler(GrpcRequestFailureException.class) - protected ResponseEntity<Object> handleGrpcRequestExeption(GrpcRequestFailureException ex, - WebRequest request) { + /** + * Exception handler. + */ + @ExceptionHandler + public ResponseEntity<Object> handleException(GrpcRequestFailureException ex, WebRequest request) { HttpStatus status; switch (ex.getErrorType()) { @@ -58,28 +58,12 @@ public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { return makeExceptionalResponse(ex, makeErrorPayload(ex.getCode(), ex.getMessage()), status, request); } - @ExceptionHandler(CompletionException.class) - protected ResponseEntity<Object> handleCompletionExceptions(CompletionException wrapper, WebRequest request) { - ResponseEntity<Object> response; - try { - throw wrapper.getCause(); - } catch (SocketException e) { - GrpcMessageError body = makeErrorPayload(-1, format("Communication failure - %s", e.getMessage())); - response = makeExceptionalResponse(e, body, HttpStatus.INTERNAL_SERVER_ERROR, request); - } catch (Exception e) { - GrpcMessageError body = makeErrorPayload(-1, ErrorType.INTERNAL_ERROR.toString()); - response = makeExceptionalResponse( - e, body, HttpStatus.INTERNAL_SERVER_ERROR, request); - } catch (Throwable e) { - GrpcMessageError body = makeErrorPayload(-1, ErrorType.INTERNAL_ERROR.toString()); - response = new ResponseEntity<>(body, new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR); - } - return response; + @ExceptionHandler + public ResponseEntity<Object> handleException(StatusRuntimeException ex, WebRequest request) { + GrpcMessageError body = makeErrorPayload(-1, format("Communication failure - %s", ex.getMessage())); + return makeExceptionalResponse(ex, body, HttpStatus.INTERNAL_SERVER_ERROR, request); } - /** - * {@inheritDoc} - */ @Override protected ResponseEntity<Object> handleExceptionInternal(Exception exception, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { @@ -90,7 +74,7 @@ public class GrpcExceptionHandler extends ResponseEntityExceptionHandler { private ResponseEntity<Object> makeExceptionalResponse( Exception ex, GrpcMessageError body, HttpStatus status, WebRequest request) { - logger.error(format("Produce error response: %s", body), ex); + logger.error(format("Produce error response: %s", body)); return super.handleExceptionInternal(ex, body, new HttpHeaders(), status, request); }

['src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/client/GrpcResponseObserver.java', 'src-java/grpc-speaker/grpc-service/src/main/java/org/openkilda/grpc/speaker/utils/GrpcExceptionHandler.java']

{'.java': 2}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3812/3797

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3797

https://github.com/telstra/open-kilda/pull/3812

https://github.com/telstra/open-kilda/pull/3812

closes

Server42: stats app leaks memory if no server42 flows were created

After ~1h, if no server42 flows are created, the `server42-stats` container runs out of memory. Steps: 1. Start kilda and just leave it for hour+. Do not create any flows 2. call `docker logs server42-stats` [server42_stats_oom.zip](https://github.com/telstra/open-kilda/files/5416162/server42_stats_oom.zip) **Expected:** stats app works just fine **Actual:** java.lang.OutOfMemoryError: Java heap space

a31b5d5a851c6e69c0dccf11ab5325f2743841f3

f772902e4eb13632bd3ca8fdfa50539e22281725

https://github.com/telstra/open-kilda/compare/a31b5d5a851c6e69c0dccf11ab5325f2743841f3...f772902e4eb13632bd3ca8fdfa50539e22281725

diff --git a/src-java/server42/server42-control-server-stub/src/main/java/org/openkilda/server42/control/serverstub/StatsServer.java b/src-java/server42/server42-control-server-stub/src/main/java/org/openkilda/server42/control/serverstub/StatsServer.java index 7a5200d52..873ee1998 100644 --- a/src-java/server42/server42-control-server-stub/src/main/java/org/openkilda/server42/control/serverstub/StatsServer.java +++ b/src-java/server42/server42-control-server-stub/src/main/java/org/openkilda/server42/control/serverstub/StatsServer.java @@ -87,8 +87,10 @@ public class StatsServer extends Thread { } } - if (!flows.isEmpty()) { - server.send(flowBucketBuilder.build().toByteArray()); + server.send(flowBucketBuilder.build().toByteArray()); + if (flows.isEmpty()) { + log.info("send ping"); + } else { log.info("send stats"); } diff --git a/src-java/server42/server42-stats/src/main/java/org/openkilda/server42/stats/zeromq/StatsCollector.java b/src-java/server42/server42-stats/src/main/java/org/openkilda/server42/stats/zeromq/StatsCollector.java index 133e55d5f..5337f7216 100644 --- a/src-java/server42/server42-stats/src/main/java/org/openkilda/server42/stats/zeromq/StatsCollector.java +++ b/src-java/server42/server42-stats/src/main/java/org/openkilda/server42/stats/zeromq/StatsCollector.java @@ -73,7 +73,10 @@ public class StatsCollector extends Thread { sessionId = RandomStringUtils.randomAlphanumeric(8); log.info("started with session id {}", sessionId); while (!isInterrupted()) { - try (Socket server = context.createSocket(ZMQ.PULL)) { + + Socket server = null; + try { + server = context.createSocket(ZMQ.PULL); server.setReceiveTimeOut(1000); server.connect(connectEndpoint); log.info("connect to {}", connectEndpoint); @@ -90,11 +93,13 @@ public class StatsCollector extends Thread { log.debug("stats received"); handleInput(recv); } - } catch (org.zeromq.ZMQException ex) { log.error(ex.toString()); } finally { log.info("disconnected"); + if (server != null) { + context.destroySocket(server); + } } } }

['src-java/server42/server42-control-server-stub/src/main/java/org/openkilda/server42/control/serverstub/StatsServer.java', 'src-java/server42/server42-stats/src/main/java/org/openkilda/server42/stats/zeromq/StatsCollector.java']

{'.java': 2}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3743/3744

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3744

https://github.com/telstra/open-kilda/pull/3743

https://github.com/telstra/open-kilda/pull/3743

close

BFD session status is not updated on db

`bfd_session_status` field hasn't been updated in db for isl on any commands.

4734f2f67cc5d5047a3d94dcf3b5a9e45f1db765

d780c52ba403e80463aaa286874693f163279e14

https://github.com/telstra/open-kilda/compare/4734f2f67cc5d5047a3d94dcf3b5a9e45f1db765...d780c52ba403e80463aaa286874693f163279e14

diff --git a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/DiscoveryBfdMonitor.java b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/DiscoveryBfdMonitor.java index d0d9cee25..d6093c143 100644 --- a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/DiscoveryBfdMonitor.java +++ b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/DiscoveryBfdMonitor.java @@ -72,7 +72,7 @@ public class DiscoveryBfdMonitor extends DiscoveryMonitor<IslEndpointBfdStatus> update = new IslEndpointBfdStatus(true, BfdSessionStatus.DOWN); break; case BFD_KILL: - update = new IslEndpointBfdStatus(false, null, true); + update = new IslEndpointBfdStatus(false, null); break; case BFD_FAIL: update = new IslEndpointBfdStatus(false, BfdSessionStatus.FAIL); @@ -89,10 +89,7 @@ public class DiscoveryBfdMonitor extends DiscoveryMonitor<IslEndpointBfdStatus> @Override public void actualFlush(Endpoint endpoint, Isl persistentView) { - IslEndpointBfdStatus bfdStatus = discoveryData.get(endpoint); - if (bfdStatus.isForceReset() || bfdStatus.getStatus() != null) { - persistentView.setBfdSessionStatus(bfdStatus.getStatus()); - } + persistentView.setBfdSessionStatus(discoveryData.get(endpoint).getStatus()); } /** diff --git a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/IslFsm.java b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/IslFsm.java index 00843d0de..007d0d5e6 100644 --- a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/IslFsm.java +++ b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/IslFsm.java @@ -316,11 +316,17 @@ public final class IslFsm extends AbstractBaseFsm<IslFsm, IslFsmState, IslFsmEve for (DiscoveryMonitor<?> entry : monitorsByPriority) { entry.load(start, isl); } + + fixUpPersistentData(isl); } else { log.debug("There is no persistent ISL data {} ==> {} (do not load monitors state)", start, end); } } + private void fixUpPersistentData(Isl link) { + link.setBfdSessionStatus(null); + } + private void sendInstallMultiTable(IIslCarrier carrier) { final Endpoint source = reference.getSource(); final Endpoint dest = reference.getDest(); diff --git a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/model/IslEndpointBfdStatus.java b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/model/IslEndpointBfdStatus.java index 3d7a12001..50a25460c 100644 --- a/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/model/IslEndpointBfdStatus.java +++ b/src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/model/IslEndpointBfdStatus.java @@ -18,22 +18,18 @@ package org.openkilda.wfm.topology.network.model; import org.openkilda.model.BfdSessionStatus; import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; import lombok.Value; @Value +@EqualsAndHashCode(exclude = {"enabled"}) @AllArgsConstructor public class IslEndpointBfdStatus { boolean enabled; BfdSessionStatus status; - boolean forceReset; - public IslEndpointBfdStatus() { this(false, null); } - - public IslEndpointBfdStatus(boolean enabled, BfdSessionStatus status) { - this(enabled, status, false); - } } diff --git a/src-java/network-topology/network-storm-topology/src/test/java/org/openkilda/wfm/topology/network/service/NetworkIslServiceTest.java b/src-java/network-topology/network-storm-topology/src/test/java/org/openkilda/wfm/topology/network/service/NetworkIslServiceTest.java index 48182facb..3ba8f3db7 100644 --- a/src-java/network-topology/network-storm-topology/src/test/java/org/openkilda/wfm/topology/network/service/NetworkIslServiceTest.java +++ b/src-java/network-topology/network-storm-topology/src/test/java/org/openkilda/wfm/topology/network/service/NetworkIslServiceTest.java @@ -34,6 +34,7 @@ import org.openkilda.config.provider.PropertiesBasedConfigurationProvider; import org.openkilda.messaging.command.reroute.RerouteAffectedFlows; import org.openkilda.messaging.info.discovery.RemoveIslDefaultRulesResult; import org.openkilda.messaging.info.event.IslStatusUpdateNotification; +import org.openkilda.model.BfdSessionStatus; import org.openkilda.model.FeatureToggles; import org.openkilda.model.Isl; import org.openkilda.model.IslDownReason; @@ -691,6 +692,52 @@ public class NetworkIslServiceTest { verify(dashboardLogger).onIslDown(reference); } + @Test + public void resetBfdFailOnStart() { + testBfdStatusReset(BfdSessionStatus.FAIL); + } + + @Test + public void resetBfdUpOnStart() { + testBfdStatusReset(BfdSessionStatus.UP); + } + + private void testBfdStatusReset(BfdSessionStatus initialStatus) { + setupIslStorageStub(); + + final Instant start = clock.adjust(Duration.ofSeconds(1)); + Isl alphaToBeta = makeIsl(endpointAlpha1, endpointBeta2, false) + .bfdSessionStatus(initialStatus) + .build(); + islStorage.save(alphaToBeta); + islStorage.save( + makeIsl(endpointBeta2, endpointAlpha1, false) + .bfdSessionStatus(initialStatus) + .build()); + + clock.adjust(Duration.ofSeconds(1)); + + IslReference reference = new IslReference(endpointAlpha1, endpointBeta2); + service.islSetupFromHistory(reference.getSource(), reference, alphaToBeta); + + Optional<Isl> potential = islStorage.lookup(reference.getSource(), reference.getDest()); + + Assert.assertTrue(potential.isPresent()); + Isl link = potential.get(); + Assert.assertNull(link.getBfdSessionStatus()); + + potential = islStorage.lookup(reference.getDest(), reference.getSource()); + Assert.assertTrue(potential.isPresent()); + link = potential.get(); + Assert.assertNull(link.getBfdSessionStatus()); + + service.bfdStatusUpdate(reference.getSource(), reference, BfdStatusUpdate.UP); + verifyBfdStatus(reference, BfdSessionStatus.UP, null); + + service.bfdStatusUpdate(reference.getDest(), reference, BfdStatusUpdate.UP); + verifyBfdStatus(reference, BfdSessionStatus.UP, BfdSessionStatus.UP); + } + private IslReference prepareBfdEnabledIsl() { IslReference reference = prepareActiveIsl(); @@ -748,6 +795,24 @@ public class NetworkIslServiceTest { return reference; } + private void verifyBfdStatus(IslReference reference, BfdSessionStatus leftToRight, BfdSessionStatus rightToLeft) { + Optional<Isl> potential = islStorage.lookup(reference.getSource(), reference.getDest()); + Assert.assertTrue(potential.isPresent()); + verifyBfdStatus(potential.get(), leftToRight); + + potential = islStorage.lookup(reference.getDest(), reference.getSource()); + Assert.assertTrue(potential.isPresent()); + verifyBfdStatus(potential.get(), rightToLeft); + } + + private void verifyBfdStatus(Isl link, BfdSessionStatus status) { + if (status != null) { + Assert.assertEquals(status, link.getBfdSessionStatus()); + } else { + Assert.assertNull(link.getBfdSessionStatus()); + } + } + private void verifyIslBandwidthUpdate(long expectedForward, long expectedReverse) { Isl forward = lookupIsl(endpointAlpha1, endpointBeta2); Assert.assertEquals(expectedForward, forward.getMaxBandwidth());

['src-java/network-topology/network-storm-topology/src/test/java/org/openkilda/wfm/topology/network/service/NetworkIslServiceTest.java', 'src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/DiscoveryBfdMonitor.java', 'src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/model/IslEndpointBfdStatus.java', 'src-java/network-topology/network-storm-topology/src/main/java/org/openkilda/wfm/topology/network/controller/isl/IslFsm.java']

{'.java': 4}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3711/3673

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3673

https://github.com/telstra/open-kilda/pull/3711

https://github.com/telstra/open-kilda/pull/3711

close

Flow endpoint with server42-enabled switch has rule discrepancies

Create a flow with at least one endpoint being a server42-enabled switch. Validate the switch **Expected:** no rule discrepancies, all rules appear in 'proper' section **Actual:** `EXCLUSION_FLOW` type rule appears in 'missing' section, `SERVER_42_INGRESS` type rule appears in 'excess' section - rules are not getting synchronized via sync switch api - also reproduces during switch update or partial update

91cb45cdded45ac97c503f619581bd4c52711617

1ec84f602ce1d3c0cbd37381af3cb486f8a3cab1

https://github.com/telstra/open-kilda/compare/91cb45cdded45ac97c503f619581bd4c52711617...1ec84f602ce1d3c0cbd37381af3cb486f8a3cab1

diff --git a/src-java/kilda-model/src/main/java/org/openkilda/model/cookie/Cookie.java b/src-java/kilda-model/src/main/java/org/openkilda/model/cookie/Cookie.java index ddcd2ba7b..3a434feba 100644 --- a/src-java/kilda-model/src/main/java/org/openkilda/model/cookie/Cookie.java +++ b/src-java/kilda-model/src/main/java/org/openkilda/model/cookie/Cookie.java @@ -91,7 +91,7 @@ public class Cookie extends CookieBase implements Comparable<Cookie> { } /** - * Conver existing {@link Cookie} instance into {@link CookieBuilder}. + * Convert existing {@link Cookie} instance into {@link CookieBuilder}. */ public CookieBuilder toBuilder() { return new CookieBuilder() diff --git a/src-java/kilda-persistence-neo4j/src/main/java/org/openkilda/persistence/SimpleConversionCallback.java b/src-java/kilda-persistence-neo4j/src/main/java/org/openkilda/persistence/SimpleConversionCallback.java index 95d8c2cf3..f5ae80be3 100644 --- a/src-java/kilda-persistence-neo4j/src/main/java/org/openkilda/persistence/SimpleConversionCallback.java +++ b/src-java/kilda-persistence-neo4j/src/main/java/org/openkilda/persistence/SimpleConversionCallback.java @@ -88,7 +88,31 @@ class SimpleConversionCallback implements ConversionCallback { throw new PersistenceException("Unable to locate appropriate converter for null-valued target type and " + value); } - // Look up for a converter with corresponding entity and graph classes. + // Look up for a converter with exact entity and graph classes. + for (Map.Entry<ParameterizedType, Class<? extends AttributeConverter>> converter : converters.entrySet()) { + Type[] genericTypes = converter.getKey().getActualTypeArguments(); + Class entityClass = (Class) genericTypes[0]; + Class graphClass = (Class) genericTypes[1]; + + if (targetType.equals(entityClass) && graphClass.equals(value.getClass())) { + try { + return (T) converter.getValue().newInstance().toEntityAttribute(value); + } catch (InstantiationException | IllegalAccessException ex) { + throw new PersistenceException("Unable to instantiate the converter " + + converter.getValue().getSimpleName(), ex); + } + } + + if (targetType.equals(graphClass) && entityClass.equals(value.getClass())) { + try { + return (T) converter.getValue().newInstance().toGraphProperty(value); + } catch (InstantiationException | IllegalAccessException ex) { + throw new PersistenceException("Unable to instantiate the converter " + + converter.getValue().getSimpleName(), ex); + } + } + } + // Look up for a converter with assignable entity and graph classes. for (Map.Entry<ParameterizedType, Class<? extends AttributeConverter>> converter : converters.entrySet()) { Type[] genericTypes = converter.getKey().getActualTypeArguments(); Class entityClass = (Class) genericTypes[0]; @@ -98,7 +122,7 @@ class SimpleConversionCallback implements ConversionCallback { try { return (T) converter.getValue().newInstance().toEntityAttribute(value); } catch (InstantiationException | IllegalAccessException ex) { - throw new PersistenceException("Unable to instaniate the converter " + throw new PersistenceException("Unable to instantiate the converter " + converter.getValue().getSimpleName(), ex); } } @@ -107,7 +131,7 @@ class SimpleConversionCallback implements ConversionCallback { try { return (T) converter.getValue().newInstance().toGraphProperty(value); } catch (InstantiationException | IllegalAccessException ex) { - throw new PersistenceException("Unable to instaniate the converter " + throw new PersistenceException("Unable to instantiate the converter " + converter.getValue().getSimpleName(), ex); } } diff --git a/src-java/kilda-persistence-neo4j/src/test/java/org/openkilda/persistence/SimpleConversionCallbackTest.java b/src-java/kilda-persistence-neo4j/src/test/java/org/openkilda/persistence/SimpleConversionCallbackTest.java index 80ced2aa2..8be2fda21 100644 --- a/src-java/kilda-persistence-neo4j/src/test/java/org/openkilda/persistence/SimpleConversionCallbackTest.java +++ b/src-java/kilda-persistence-neo4j/src/test/java/org/openkilda/persistence/SimpleConversionCallbackTest.java @@ -18,6 +18,9 @@ package org.openkilda.persistence; import static org.junit.Assert.assertEquals; import org.openkilda.model.SwitchId; +import org.openkilda.model.cookie.FlowSegmentCookie; +import org.openkilda.persistence.converters.CookieConverter; +import org.openkilda.persistence.converters.ExclusionCookieConverter; import org.openkilda.persistence.converters.SwitchIdConverter; import org.junit.Test; @@ -55,5 +58,20 @@ public class SimpleConversionCallbackTest { // then assertEquals(entity, actualEntity); } + + @Test + public void shouldUseExactTypeConverterWhenMultipleAvailable() { + // given + SimpleConversionCallback conversionCallback = + new SimpleConversionCallback(Arrays.asList(CookieConverter.class, + ExclusionCookieConverter.class)); + long graphObject = 1L; + + //when + FlowSegmentCookie cookie = conversionCallback.convert(FlowSegmentCookie.class, graphObject); + + // then + assertEquals(cookie.getClass(), FlowSegmentCookie.class); + } }

['src-java/kilda-persistence-neo4j/src/main/java/org/openkilda/persistence/SimpleConversionCallback.java', 'src-java/kilda-persistence-neo4j/src/test/java/org/openkilda/persistence/SimpleConversionCallbackTest.java', 'src-java/kilda-model/src/main/java/org/openkilda/model/cookie/Cookie.java']

{'.java': 3}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3578/3255

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3255

https://github.com/telstra/open-kilda/pull/3578

https://github.com/telstra/open-kilda/pull/3578

closes

Flow path cannot be removed when it goes through a non-existing ISL

**Steps:** given: A busy environment with reroutes happening. An ISL with flows going though it 1. Call port down on one end of ISL 2. As soon as isl is marked as FAILED delete the ISL using NB API 3. Check existing flow paths. Repeat above steps until you get a flow path that still use the removed ISL **Problem:** Flow leaves excess flow paths during reroutes due to following errors ``` Flow perfload_28Feb133820_640_onion6002 error - CompleteFlowPathRemovalAction failed: ISL 00:00:b2:81:f7:c9:1f:55_4 - 00:00:cc:2e:48:4f:a9:6c_2 not found to be updated ``` ``` Flow perfload_28Feb133820_640_onion6002 error - Failed to remove paths : Failed to remove paths: "perfload_28Feb133820_640_onion6002_31b20347-2fab-4fe8-8b06-43ab00cf9b27", "perfload_28Feb133820_640_onion6002_103977e2-f365-430b-b622-a313a859bcde" ```

c941444489a6381a1ab00d6bbb216871c4ecebfe

9f723a2d6550567660a0effd9a456c4bf2bb601a

https://github.com/telstra/open-kilda/compare/c941444489a6381a1ab00d6bbb216871c4ecebfe...9f723a2d6550567660a0effd9a456c4bf2bb601a

diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/actions/BaseFlowPathRemovalAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/actions/BaseFlowPathRemovalAction.java index db6f7ba2f..25215eb92 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/actions/BaseFlowPathRemovalAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/actions/BaseFlowPathRemovalAction.java @@ -20,6 +20,7 @@ import static java.lang.String.format; import org.openkilda.model.Flow; import org.openkilda.model.FlowPath; import org.openkilda.model.SwitchId; +import org.openkilda.persistence.PersistenceException; import org.openkilda.persistence.PersistenceManager; import org.openkilda.persistence.repositories.IslRepository; import org.openkilda.wfm.share.history.model.FlowDumpData; @@ -73,7 +74,12 @@ public abstract class BaseFlowPathRemovalAction<T extends FlowProcessingFsm<T, S dstSwitch, dstPort); log.debug("Updating ISL {}_{} - {}_{} with used bandwidth {}", srcSwitch, srcPort, dstSwitch, dstPort, usedBandwidth); - islRepository.updateAvailableBandwidth(srcSwitch, srcPort, dstSwitch, dstPort, usedBandwidth); + try { + islRepository.updateAvailableBandwidth(srcSwitch, srcPort, dstSwitch, dstPort, usedBandwidth); + } catch (PersistenceException e) { + log.warn(format("Couldn't update ISL %s_%d - %s_%d with used bandwidth %d. %s", + srcSwitch, srcPort, dstSwitch, dstPort, usedBandwidth, e.getMessage()), e); + } } protected void saveRemovalActionWithDumpToHistory(T stateMachine, Flow flow, FlowPath flowPath) {

['src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/common/actions/BaseFlowPathRemovalAction.java']

{'.java': 1}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

telstra/open-kilda/3448/3446

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3446

https://github.com/telstra/open-kilda/pull/3448

https://github.com/telstra/open-kilda/pull/3448

close

flowDeleteV2 is leaving excess meter on Centec switch

**Steps to reproduce:** 1. create a flow on a Centec switch; 2. delete the flow; **Actual result:** excess meter on a Centec switch after deleting the flow **Expected result:** system shouldn't leave excess meter

17f2f05087d4abeaecfed9ba417602399343eddd

d375ebb43d325c6f3d6c365efd4ac83e29082afa

https://github.com/telstra/open-kilda/compare/17f2f05087d4abeaecfed9ba417602399343eddd...d375ebb43d325c6f3d6c365efd4ac83e29082afa

diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentInstallCommand.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentInstallCommand.java index 01c2f9873..d9ec2d829 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentInstallCommand.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentInstallCommand.java @@ -64,6 +64,10 @@ public class IngressFlowSegmentInstallCommand extends IngressFlowSegmentCommand if (encapsulation.getType() == FlowEncapsulationType.VXLAN) { required.add(SwitchFeature.NOVIFLOW_COPY_FIELD); } + if (metadata.isMultiTable()) { + required.add(SwitchFeature.MULTI_TABLE); + } + return required; } diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentRemoveCommand.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentRemoveCommand.java index 6b08beffd..8c9c5e5d2 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentRemoveCommand.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentRemoveCommand.java @@ -26,6 +26,7 @@ import org.openkilda.model.FlowEndpoint; import org.openkilda.model.FlowTransitEncapsulation; import org.openkilda.model.MeterConfig; import org.openkilda.model.MeterId; +import org.openkilda.model.SwitchFeature; import org.openkilda.model.SwitchId; import com.fasterxml.jackson.annotation.JsonProperty; @@ -70,7 +71,7 @@ public class IngressFlowSegmentRemoveCommand extends IngressFlowSegmentCommand { @Override protected List<OFFlowMod> makeIngressModMessages(MeterId effectiveMeterId) { List<OFFlowMod> ofMessages = super.makeIngressModMessages(effectiveMeterId); - if (rulesContext != null) { + if (getSwitchFeatures().contains(SwitchFeature.MULTI_TABLE) && rulesContext != null) { if (rulesContext.isRemoveCustomerCatchRule()) { ofMessages.add(getFlowModFactory().makeCustomerPortSharedCatchMessage()); } diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowInstallCommand.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowInstallCommand.java index b75325dec..22b8f9322 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowInstallCommand.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowInstallCommand.java @@ -25,12 +25,14 @@ import org.openkilda.messaging.MessageContext; import org.openkilda.model.FlowEndpoint; import org.openkilda.model.MeterConfig; import org.openkilda.model.MeterId; +import org.openkilda.model.SwitchFeature; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.projectfloodlight.openflow.protocol.OFFlowMod; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; @@ -79,6 +81,16 @@ public class OneSwitchFlowInstallCommand extends OneSwitchFlowCommand { return ofMessages; } + @Override + protected Set<SwitchFeature> getRequiredFeatures() { + Set<SwitchFeature> required = super.getRequiredFeatures(); + if (metadata.isMultiTable()) { + required.add(SwitchFeature.MULTI_TABLE); + } + + return required; + } + @Override protected SegmentAction getSegmentAction() { return SegmentAction.INSTALL; diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowRemoveCommand.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowRemoveCommand.java index 63509bbc5..796d6204f 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowRemoveCommand.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowRemoveCommand.java @@ -25,6 +25,7 @@ import org.openkilda.messaging.MessageContext; import org.openkilda.model.FlowEndpoint; import org.openkilda.model.MeterConfig; import org.openkilda.model.MeterId; +import org.openkilda.model.SwitchFeature; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -65,7 +66,7 @@ public class OneSwitchFlowRemoveCommand extends OneSwitchFlowCommand { @Override protected List<OFFlowMod> makeIngressModMessages(MeterId effectiveMeterId) { List<OFFlowMod> ofMessages = super.makeIngressModMessages(effectiveMeterId); - if (rulesContext != null) { + if (getSwitchFeatures().contains(SwitchFeature.MULTI_TABLE) && rulesContext != null) { if (rulesContext.isRemoveCustomerCatchRule()) { ofMessages.add(getFlowModFactory().makeCustomerPortSharedCatchMessage()); } diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressFlowModFactory.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressFlowModFactory.java index 1746cf321..622f21e01 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressFlowModFactory.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressFlowModFactory.java @@ -26,7 +26,6 @@ import org.openkilda.model.SwitchFeature; import org.openkilda.model.cookie.Cookie; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import lombok.AccessLevel; import lombok.Getter; @@ -35,7 +34,6 @@ import org.projectfloodlight.openflow.protocol.OFFactory; import org.projectfloodlight.openflow.protocol.OFFlowMod; import org.projectfloodlight.openflow.protocol.OFFlowModFlags; import org.projectfloodlight.openflow.protocol.instruction.OFInstruction; -import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMetadata; import org.projectfloodlight.openflow.protocol.match.MatchField; import org.projectfloodlight.openflow.types.EthType; import org.projectfloodlight.openflow.types.OFPort; @@ -109,8 +107,7 @@ public abstract class IngressFlowModFactory { .setMatch(of.buildMatch() .setExact(MatchField.IN_PORT, OFPort.of(endpoint.getPortNumber())) .build()) - .setInstructions(ImmutableList.of( - of.instructions().gotoTable(TableId.of(SwitchManager.PRE_INGRESS_TABLE_ID)))) + .setInstructions(makeCustomerPortSharedCatchInstructions()) .build(); } @@ -121,12 +118,6 @@ public abstract class IngressFlowModFactory { */ public OFFlowMod makeLldpInputCustomerFlowMessage() { FlowEndpoint endpoint = command.getEndpoint(); - RoutingMetadata metadata = RoutingMetadata.builder().lldpFlag(true).build(switchFeatures); - OFInstructionWriteMetadata writeMetadata = of.instructions().buildWriteMetadata() - .setMetadata(metadata.getValue()) - .setMetadataMask(metadata.getMask()) - .build(); - return flowModBuilderFactory.makeBuilder(of, SwitchManager.INPUT_TABLE_ID) .setPriority(SwitchManager.LLDP_INPUT_CUSTOMER_PRIORITY) .setCookie(U64.of(Cookie.encodeLldpInputCustomer(endpoint.getPortNumber()))) @@ -135,9 +126,8 @@ public abstract class IngressFlowModFactory { .setExact(MatchField.IN_PORT, OFPort.of(endpoint.getPortNumber())) .setExact(MatchField.ETH_TYPE, EthType.LLDP) .build()) - .setInstructions(ImmutableList.of( - of.instructions().gotoTable(TableId.of(SwitchManager.PRE_INGRESS_TABLE_ID)), - writeMetadata)) + .setInstructions(makeConnectedDevicesMatchInstructions( + RoutingMetadata.builder().lldpFlag(true).build(switchFeatures))) .build(); } @@ -148,12 +138,6 @@ public abstract class IngressFlowModFactory { */ public OFFlowMod makeArpInputCustomerFlowMessage() { FlowEndpoint endpoint = command.getEndpoint(); - RoutingMetadata metadata = RoutingMetadata.builder().arpFlag(true).build(switchFeatures); - OFInstructionWriteMetadata writeMetadata = of.instructions().buildWriteMetadata() - .setMetadata(metadata.getValue()) - .setMetadataMask(metadata.getMask()) - .build(); - return flowModBuilderFactory.makeBuilder(of, SwitchManager.INPUT_TABLE_ID) .setPriority(SwitchManager.ARP_INPUT_CUSTOMER_PRIORITY) .setCookie(U64.of(Cookie.encodeArpInputCustomer(endpoint.getPortNumber()))) @@ -162,9 +146,8 @@ public abstract class IngressFlowModFactory { .setExact(MatchField.IN_PORT, OFPort.of(endpoint.getPortNumber())) .setExact(MatchField.ETH_TYPE, EthType.ARP) .build()) - .setInstructions(ImmutableList.of( - of.instructions().gotoTable(TableId.of(SwitchManager.PRE_INGRESS_TABLE_ID)), - writeMetadata)) + .setInstructions(makeConnectedDevicesMatchInstructions( + RoutingMetadata.builder().arpFlag(true).build(switchFeatures))) .build(); } @@ -177,4 +160,8 @@ public abstract class IngressFlowModFactory { } protected abstract List<OFInstruction> makeForwardMessageInstructions(OFFactory of, MeterId effectiveMeterId); + + protected abstract List<OFInstruction> makeCustomerPortSharedCatchInstructions(); + + protected abstract List<OFInstruction> makeConnectedDevicesMatchInstructions(RoutingMetadata metadata); } diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressInstallFlowModFactory.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressInstallFlowModFactory.java index 14469d0bc..364ad82ed 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressInstallFlowModFactory.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressInstallFlowModFactory.java @@ -19,9 +19,11 @@ import org.openkilda.floodlight.command.flow.ingress.IngressFlowSegmentBase; import org.openkilda.floodlight.switchmanager.SwitchManager; import org.openkilda.floodlight.utils.OfAdapter; import org.openkilda.floodlight.utils.OfFlowModBuilderFactory; +import org.openkilda.floodlight.utils.metadata.RoutingMetadata; import org.openkilda.model.MeterId; import org.openkilda.model.SwitchFeature; +import com.google.common.collect.ImmutableList; import net.floodlightcontroller.core.IOFSwitch; import org.projectfloodlight.openflow.protocol.OFFactory; import org.projectfloodlight.openflow.protocol.action.OFAction; @@ -60,6 +62,22 @@ public abstract class IngressInstallFlowModFactory extends IngressFlowModFactory return instructions; } + @Override + protected List<OFInstruction> makeCustomerPortSharedCatchInstructions() { + return ImmutableList.of( + of.instructions().gotoTable(TableId.of(SwitchManager.PRE_INGRESS_TABLE_ID))); + } + + @Override + protected List<OFInstruction> makeConnectedDevicesMatchInstructions(RoutingMetadata metadata) { + return ImmutableList.of( + of.instructions().gotoTable(TableId.of(SwitchManager.PRE_INGRESS_TABLE_ID)), + of.instructions().buildWriteMetadata() + .setMetadata(metadata.getValue()) + .setMetadataMask(metadata.getMask()) + .build()); + } + protected abstract List<OFAction> makeTransformActions(); protected abstract List<OFInstruction> makeMetadataInstructions(); diff --git a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressRemoveFlowModFactory.java b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressRemoveFlowModFactory.java index aca3f6cbf..201b59309 100644 --- a/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressRemoveFlowModFactory.java +++ b/src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressRemoveFlowModFactory.java @@ -17,6 +17,7 @@ package org.openkilda.floodlight.command.flow.ingress.of; import org.openkilda.floodlight.command.flow.ingress.IngressFlowSegmentBase; import org.openkilda.floodlight.utils.OfFlowModBuilderFactory; +import org.openkilda.floodlight.utils.metadata.RoutingMetadata; import org.openkilda.model.MeterId; import org.openkilda.model.SwitchFeature; @@ -39,4 +40,14 @@ public abstract class IngressRemoveFlowModFactory extends IngressFlowModFactory protected List<OFInstruction> makeForwardMessageInstructions(OFFactory of, MeterId effectiveMeterId) { return Collections.emptyList(); } + + @Override + protected List<OFInstruction> makeCustomerPortSharedCatchInstructions() { + return Collections.emptyList(); + } + + @Override + protected List<OFInstruction> makeConnectedDevicesMatchInstructions(RoutingMetadata metadata) { + return Collections.emptyList(); + } } diff --git a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/command/flow/ingress/IngressCommandInstallTest.java b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/command/flow/ingress/IngressCommandInstallTest.java index 79af6f74e..d5351a824 100644 --- a/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/command/flow/ingress/IngressCommandInstallTest.java +++ b/src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/command/flow/ingress/IngressCommandInstallTest.java @@ -21,7 +21,9 @@ import org.openkilda.floodlight.command.flow.FlowSegmentReport; import org.openkilda.floodlight.error.SwitchErrorResponseException; import org.openkilda.floodlight.error.SwitchOperationException; import org.openkilda.floodlight.error.UnsupportedSwitchOperationException; +import org.openkilda.model.SwitchFeature; +import net.floodlightcontroller.core.IOFSwitch; import org.junit.Assert; import org.junit.Test; import org.projectfloodlight.openflow.protocol.OFBadRequestCode; @@ -34,9 +36,16 @@ import org.projectfloodlight.openflow.protocol.instruction.OFInstructionMeter; import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteActions; import java.util.List; +import java.util.Set; import java.util.concurrent.CompletableFuture; abstract class IngressCommandInstallTest extends IngressCommandTest { + @Override + protected void switchFeaturesSetup(IOFSwitch target, Set<SwitchFeature> features) { + features.add(SwitchFeature.MULTI_TABLE); + super.switchFeaturesSetup(target, features); + } + @Test public void noMeterRequested() throws Exception { IngressFlowSegmentBase command = makeCommand(endpointIngressOneVlan, null, makeMetadata());

['src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowInstallCommand.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressRemoveFlowModFactory.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/OneSwitchFlowRemoveCommand.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressFlowModFactory.java', 'src-java/floodlight-service/floodlight-modules/src/test/java/org/openkilda/floodlight/command/flow/ingress/IngressCommandInstallTest.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentRemoveCommand.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/IngressFlowSegmentInstallCommand.java', 'src-java/floodlight-service/floodlight-modules/src/main/java/org/openkilda/floodlight/command/flow/ingress/of/IngressInstallFlowModFactory.java']

{'.java': 8}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

serg-delft/andy/107/106

serg-delft

andy

https://github.com/SERG-Delft/andy/issues/106

https://github.com/SERG-Delft/andy/pull/107

https://github.com/SERG-Delft/andy/pull/107

closes

assertThatExceptionOfType is not counted as an assertion by code check

`assertThatExceptionOfType` is not considered an assertion by the TestMethodsHaveAssertions code check: https://github.com/cse1110/andy/blob/main/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java This assertion method as well as all other AssertJ methods that have been missed should be added to this code check.

fb70989e22d025c48335b1ed9683f5cc1397a247

b2d05bbbcb506cc0bafc56f5766a6d8cc1572b16

https://github.com/serg-delft/andy/compare/fb70989e22d025c48335b1ed9683f5cc1397a247...b2d05bbbcb506cc0bafc56f5766a6d8cc1572b16

diff --git a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java index 523423e..76fa129 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java +++ b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java @@ -39,6 +39,13 @@ public class TestMethodsHaveAssertions extends WithinTestMethod { // assertj add("assertThat"); add("assertThatThrownBy"); + add("assertThatExceptionOfType"); + add("assertThatCode"); + add("assertThatIllegalArgumentException"); + add("assertThatIllegalStateException"); + add("assertThatIOException"); + add("assertThatNullPointerException"); + add("assertThatObject"); }};

['src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java']

{'.java': 1}

Java

{'Java': 1238634, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Makefile': 12592, 'Dockerfile': 1722, 'NASL': 1620, 'Shell': 63}

MIT License

telstra/open-kilda/3284/3277

telstra

open-kilda

https://github.com/telstra/open-kilda/issues/3277

https://github.com/telstra/open-kilda/pull/3284

https://github.com/telstra/open-kilda/pull/3284

closes

multiTable: intentional rerouteFlow via APIv2 is leavling excess rule

**Steps to reproduce:** * enable singleTable mode on all switches; * create a flow via APIv2; * enable multiTable mode on all switches; * make other path more preferable; * init flow reroute via APIv2 (`"/api/v2/flows/{flow_id}/reroute"`); **Actual result:** Flow is rerouted, but excess rule appeared on involved switches **Expected result:** no excess rule when reroute is completed

06c990975456ed0382915e5f97cea4cf4bee3381

fbfbd5432017cd6b33321bb78a57a2dc05f57ce1

https://github.com/telstra/open-kilda/compare/06c990975456ed0382915e5f97cea4cf4bee3381...fbfbd5432017cd6b33321bb78a57a2dc05f57ce1

diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/FlowRerouteFsm.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/FlowRerouteFsm.java index 2b1efece2..928b34ad7 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/FlowRerouteFsm.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/FlowRerouteFsm.java @@ -60,6 +60,7 @@ import org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.UpdateFlowStatusAct import org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.ValidateFlowAction; import org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.ValidateIngressRulesAction; import org.openkilda.wfm.topology.flowhs.fsm.reroute.actions.ValidateNonIngressRulesAction; +import org.openkilda.wfm.topology.flowhs.model.RequestedFlow; import org.openkilda.wfm.topology.flowhs.service.FlowRerouteHubCarrier; import lombok.Getter; @@ -84,6 +85,7 @@ public final class FlowRerouteFsm extends FlowPathSwappingFsm<FlowRerouteFsm, St private boolean rerouteProtected; private boolean effectivelyDown; + private RequestedFlow originalFlow; private FlowStatus originalFlowStatus; private FlowEncapsulationType originalEncapsulationType; diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/RemoveOldRulesAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/RemoveOldRulesAction.java index 2d0f31b54..7412adbc3 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/RemoveOldRulesAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/RemoveOldRulesAction.java @@ -27,6 +27,7 @@ import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteContext; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm.Event; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm.State; +import org.openkilda.wfm.topology.flowhs.mapper.RequestedFlowMapper; import org.openkilda.wfm.topology.flowhs.service.FlowCommandBuilder; import org.openkilda.wfm.topology.flowhs.service.FlowCommandBuilderFactory; @@ -54,18 +55,22 @@ public class RemoveOldRulesAction extends FlowProcessingAction<FlowRerouteFsm, S Collection<FlowSegmentRequestFactory> factories = new ArrayList<>(); + Flow flow = RequestedFlowMapper.INSTANCE.toFlow(stateMachine.getOriginalFlow()); + if (stateMachine.getOldPrimaryForwardPath() != null && stateMachine.getOldPrimaryReversePath() != null) { FlowPath oldForward = getFlowPath(stateMachine.getOldPrimaryForwardPath()); + oldForward.setFlow(flow); FlowPath oldReverse = getFlowPath(stateMachine.getOldPrimaryReversePath()); - Flow flow = oldForward.getFlow(); + oldReverse.setFlow(flow); factories.addAll(commandBuilder.buildAll( stateMachine.getCommandContext(), flow, oldForward, oldReverse)); } if (stateMachine.getOldProtectedForwardPath() != null && stateMachine.getOldProtectedReversePath() != null) { FlowPath oldForward = getFlowPath(stateMachine.getOldProtectedForwardPath()); + oldForward.setFlow(flow); FlowPath oldReverse = getFlowPath(stateMachine.getOldProtectedReversePath()); - Flow flow = oldForward.getFlow(); + oldReverse.setFlow(flow); factories.addAll(commandBuilder.buildAllExceptIngress( stateMachine.getCommandContext(), flow, oldForward, oldReverse)); } diff --git a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/ValidateFlowAction.java b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/ValidateFlowAction.java index 017b3cf12..e3291ce8f 100644 --- a/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/ValidateFlowAction.java +++ b/src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/ValidateFlowAction.java @@ -39,6 +39,7 @@ import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteContext; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm.Event; import org.openkilda.wfm.topology.flowhs.fsm.reroute.FlowRerouteFsm.State; +import org.openkilda.wfm.topology.flowhs.mapper.RequestedFlowMapper; import lombok.extern.slf4j.Slf4j; @@ -70,7 +71,7 @@ public class ValidateFlowAction extends NbTrackableAction<FlowRerouteFsm, State, dashboardLogger.onFlowPathReroute(flowId, affectedIsl, context.isForceReroute()); Flow flow = persistenceManager.getTransactionManager().doInTransaction(() -> { - Flow foundFlow = getFlow(flowId, FetchStrategy.NO_RELATIONS); + Flow foundFlow = getFlow(flowId, FetchStrategy.DIRECT_RELATIONS); if (foundFlow.getStatus() == FlowStatus.IN_PROGRESS) { throw new FlowProcessingException(ErrorType.REQUEST_INVALID, format("Flow %s is in progress now", flowId)); @@ -79,6 +80,7 @@ public class ValidateFlowAction extends NbTrackableAction<FlowRerouteFsm, State, stateMachine.setOriginalFlowStatus(foundFlow.getStatus()); stateMachine.setOriginalEncapsulationType(foundFlow.getEncapsulationType()); stateMachine.setRecreateIfSamePath(!foundFlow.isActive() || context.isForceReroute()); + stateMachine.setOriginalFlow(RequestedFlowMapper.INSTANCE.toRequestedFlow(foundFlow)); flowRepository.updateStatus(foundFlow.getFlowId(), FlowStatus.IN_PROGRESS); return foundFlow;

['src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/ValidateFlowAction.java', 'src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/FlowRerouteFsm.java', 'src-java/flowhs-topology/flowhs-storm-topology/src/main/java/org/openkilda/wfm/topology/flowhs/fsm/reroute/actions/RemoveOldRulesAction.java']

{'.java': 3}

Java

{'Java': 16533357, 'Groovy': 2440542, 'TypeScript': 876184, 'Python': 375764, 'JavaScript': 369015, 'HTML': 366643, 'CSS': 234005, 'C++': 89798, 'Shell': 61998, 'Dockerfile': 30647, 'Makefile': 20530, 'Gherkin': 5609, 'CMake': 4314, 'Jinja': 1187}

Apache License 2.0

wiiiiam278/huskhomes/392/391

wiiiiam278

huskhomes

https://github.com/WiIIiam278/HuskHomes/issues/391

https://github.com/WiIIiam278/HuskHomes/pull/392

https://github.com/WiIIiam278/HuskHomes/pull/392

fixes

Local online user resolution on teleport from username targets by closest match prevents a global exact match

Attempting username resolution against a user that has the partial username of another (i.e requesting a teleport to `APP`, while another user of the name `APPLE` is present on the network) will cause unintended outcomes. Referencing the example, this can result in the use `APPLE` being teleported to INSTEAD of the user `APP`.

b1bd44ac642352ac3c982767a18d0c74a4219146

a11cf17bb1b163b502b2e03d308bb566995d5fc1

https://github.com/wiiiiam278/huskhomes/compare/b1bd44ac642352ac3c982767a18d0c74a4219146...a11cf17bb1b163b502b2e03d308bb566995d5fc1

diff --git a/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java b/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java index b849e815..d255ecd3 100644 --- a/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java +++ b/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java @@ -202,7 +202,6 @@ public class BukkitPluginTests { Assertions.assertFalse(plugin.getValidator().isValidName(name)); } - // test descriptions @DisplayName("Test Validator Accepts Valid Descriptions") @ParameterizedTest(name = "Valid Description: \\"{0}\\"") @ValueSource(strings = { @@ -366,7 +365,6 @@ public class BukkitPluginTests { } - // home tests, like warps but with a user parameter (owner) as well as name and position and a test for changing home privacy @Nested @DisplayName("Home Tests") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/common/src/main/java/net/william278/huskhomes/HuskHomes.java b/common/src/main/java/net/william278/huskhomes/HuskHomes.java index 3ad6f382..b8c6fb40 100644 --- a/common/src/main/java/net/william278/huskhomes/HuskHomes.java +++ b/common/src/main/java/net/william278/huskhomes/HuskHomes.java @@ -78,6 +78,31 @@ public interface HuskHomes extends TaskRunner, EventDispatcher, SafetyResolver { @NotNull List<OnlineUser> getOnlineUsers(); + /** + * Finds a local {@link OnlineUser} by their name. Auto-completes partially typed names for the closest match + * + * @param playerName the name of the player to find + * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found + */ + default Optional<OnlineUser> getOnlineUser(@NotNull String playerName) { + return getOnlineUserExact(playerName) + .or(() -> getOnlineUsers().stream() + .filter(user -> user.getUsername().toLowerCase().startsWith(playerName.toLowerCase())) + .findFirst()); + } + + /** + * Finds a local {@link OnlineUser} by their name. + * + * @param playerName the name of the player to find + * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found + */ + default Optional<OnlineUser> getOnlineUserExact(@NotNull String playerName) { + return getOnlineUsers().stream() + .filter(user -> user.getUsername().equalsIgnoreCase(playerName)) + .findFirst(); + } + @NotNull Set<SavedUser> getSavedUsers(); @@ -111,22 +136,6 @@ public interface HuskHomes extends TaskRunner, EventDispatcher, SafetyResolver { log(Level.INFO, "Successfully initialized " + name); } - /** - * Finds a local {@link OnlineUser} by their name. Auto-completes partially typed names for the closest match - * - * @param playerName the name of the player to find - * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found - */ - @NotNull - default Optional<OnlineUser> findOnlinePlayer(@NotNull String playerName) { - return getOnlineUsers().stream() - .filter(user -> user.getUsername().equalsIgnoreCase(playerName)) - .findFirst() - .or(() -> getOnlineUsers().stream() - .filter(user -> user.getUsername().toLowerCase().startsWith(playerName.toLowerCase())) - .findFirst()); - } - /** * The plugin {@link Settings} loaded from file * diff --git a/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java b/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java index cc3b17b1..0fd59cc6 100644 --- a/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java +++ b/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java @@ -50,7 +50,7 @@ public class RtpCommand extends Command implements UserListTabProvider { @Override public void execute(@NotNull CommandUser executor, @NotNull String[] args) { - final Optional<OnlineUser> optionalTeleporter = args.length >= 1 ? plugin.findOnlinePlayer(args[0]) + final Optional<OnlineUser> optionalTeleporter = args.length >= 1 ? plugin.getOnlineUser(args[0]) : executor instanceof OnlineUser ? Optional.of((OnlineUser) executor) : Optional.empty(); if (optionalTeleporter.isEmpty()) { if (args.length == 0) { diff --git a/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java b/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java index 427efb84..5bb3d77c 100644 --- a/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java +++ b/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java @@ -145,7 +145,7 @@ public class RequestsManager { @NotNull TeleportRequest.Type type) throws IllegalArgumentException { final long expiry = Instant.now().getEpochSecond() + plugin.getSettings().getTeleportRequestExpiryTime(); final TeleportRequest request = new TeleportRequest(requester, type, expiry); - final Optional<OnlineUser> localTarget = plugin.findOnlinePlayer(targetUser); + final Optional<OnlineUser> localTarget = plugin.getOnlineUser(targetUser); if (localTarget.isPresent()) { if (localTarget.get().equals(requester)) { throw new IllegalArgumentException("Cannot send a teleport request to yourself"); @@ -282,7 +282,7 @@ public class RequestsManager { .ifPresent(recipient::sendMessage); // Find the requester and inform them of the response - final Optional<OnlineUser> localRequester = plugin.findOnlinePlayer(request.getRequesterName()); + final Optional<OnlineUser> localRequester = plugin.getOnlineUser(request.getRequesterName()); if (localRequester.isPresent()) { handleLocalRequestResponse(localRequester.get(), request); } else if (plugin.getSettings().doCrossServer()) { diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Target.java b/common/src/main/java/net/william278/huskhomes/teleport/Target.java index a5eda39b..9cd7a031 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Target.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Target.java @@ -21,8 +21,17 @@ package net.william278.huskhomes.teleport; import org.jetbrains.annotations.NotNull; +/** + * Represents a target; a player name or a location that will be teleported <i>to</i>. + */ public interface Target { + /** + * Create a {@link Target} from a player name + * + * @param target the player name + * @return the target + */ @NotNull static Target username(@NotNull String target) { return new Username(target); diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java b/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java index 527cd104..351fb54d 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java @@ -35,6 +35,11 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +/** + * Represents the process of a {@link Teleportable} being teleported to a {@link Target}. + * + * @see Teleport#builder(HuskHomes) + */ public class Teleport { protected final HuskHomes plugin; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java b/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java index fe1a9b6f..c6291fe8 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java @@ -26,6 +26,9 @@ import org.jetbrains.annotations.NotNull; import java.util.List; +/** + * A builder for {@link Teleport} and {@link TimedTeleport} objects. + */ public class TeleportBuilder { private final HuskHomes plugin; private OnlineUser executor; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java b/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java index b379cad5..547d53da 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java @@ -90,6 +90,7 @@ public class TeleportRequest { /** * The user making the request */ + @NotNull public String getRequesterName() { return requesterName; } diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java b/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java index 759b38bb..e71f87f0 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java @@ -20,9 +20,22 @@ package net.william278.huskhomes.teleport; import org.jetbrains.annotations.NotNull; +import net.william278.huskhomes.user.OnlineUser; +/** + * Represents a teleporter; the person performing the teleport. + * <p> + * Can be represented as an {@link OnlineUser} locally or as a {@link Username username} reference + * that needs to be resolved first. + */ public interface Teleportable { + /** + * Create a {@link Teleportable} from a player name + * + * @param teleporter the player name + * @return the teleportable + */ @NotNull static Teleportable username(@NotNull String teleporter) { return new Username(teleporter); diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java b/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java index cedf12b9..287501cd 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java @@ -30,6 +30,11 @@ import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +/** + * Represents a {@link Teleport} that has an associated warmup time; the teleport will not be performed until the + * warmup time has elapsed, during which the user must not move or take damage. + * @see Teleport#builder(HuskHomes) + */ public class TimedTeleport extends Teleport { public static final String BYPASS_PERMISSION = "huskhomes.bypass_teleport_warmup"; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Username.java b/common/src/main/java/net/william278/huskhomes/teleport/Username.java index 646e61e5..af9ce00b 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Username.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Username.java @@ -25,11 +25,30 @@ import org.jetbrains.annotations.NotNull; import java.util.Optional; +/** + * Represents the username of a player who may or may not be online, either locally as an {@link OnlineUser}, + * or on a different server. + * + * @param name The name of the player + */ public record Username(@NotNull String name) implements Teleportable, Target { + /** + * Search for a local {@link OnlineUser} by their name. + * + * @param plugin The instance of {@link HuskHomes} + * @return An {@link Optional} containing the {@link OnlineUser} if found + * @throws TeleportationException If the user is not found + * @implNote If a user by the name provided is on the {@link HuskHomes#getPlayerList() player list}, then this + * method will search for the user by exact name. + * <p> + * Otherwise, the lookup will first attempt to find the user by exact name, and if that fails, it will search for + * the closest name match. + */ @NotNull - public Optional<OnlineUser> findLocally(@NotNull HuskHomes plugin) throws TeleportationException { - return plugin.findOnlinePlayer(name); + public Optional<OnlineUser> findLocally(@NotNull HuskHomes plugin) { + return plugin.getPlayerList(true).stream().anyMatch(listedName -> listedName.equalsIgnoreCase(name)) + ? plugin.getOnlineUserExact(name) : plugin.getOnlineUser(name); } }

['common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java', 'common/src/main/java/net/william278/huskhomes/teleport/Username.java', 'common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java', 'common/src/main/java/net/william278/huskhomes/command/RtpCommand.java', 'common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java', 'common/src/main/java/net/william278/huskhomes/HuskHomes.java', 'common/src/main/java/net/william278/huskhomes/teleport/Target.java', 'common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java', 'common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java', 'bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java', 'common/src/main/java/net/william278/huskhomes/teleport/Teleport.java']

{'.java': 11}

Java

{'Java': 1018468, 'Shell': 392}

Apache License 2.0

korpling/annis/337/336

korpling

annis

https://github.com/korpling/ANNIS/issues/336

https://github.com/korpling/ANNIS/pull/337

https://github.com/korpling/ANNIS/pull/337#issuecomment-46556611

closes

Existence of directory is not checked when saving corpus properties

By default ANNIS (service) saves corpus properties in the directory `.annis/data` under the user's home directory. It does not ensure that the directory exists, nor do the installation instructions for public servers give any suggestion to create it. So the first time a user attempts to import a corpus, a `FileNotFoundException` is raised and the corpus.properties file is not saved. The fix is trivial.

fa8c590fa111f81868e19edc5d824b6ded036afa

757e6f1ce8960926ddee2aec19c1d524766b0ab9

https://github.com/korpling/annis/compare/fa8c590fa111f81868e19edc5d824b6ded036afa...757e6f1ce8960926ddee2aec19c1d524766b0ab9

diff --git a/annis-service/src/main/java/annis/dao/SpringAnnisDao.java b/annis-service/src/main/java/annis/dao/SpringAnnisDao.java index 7841746c1..99005e534 100644 --- a/annis-service/src/main/java/annis/dao/SpringAnnisDao.java +++ b/annis-service/src/main/java/annis/dao/SpringAnnisDao.java @@ -336,6 +336,17 @@ public class SpringAnnisDao extends SimpleJdbcDaoSupport implements AnnisDao, File dir = getRealDataDir(); + if (!dir.exists()) + { + if (dir.mkdirs()) + { + log.info("Created directory " + dir); + } + else + { + log.error("Directory " + dir + " doesn't exist and cannot be created"); + } + } if (fileName == null) {

['annis-service/src/main/java/annis/dao/SpringAnnisDao.java']

{'.java': 1}

Java

{'Java': 1687873, 'CSS': 1227164, 'JavaScript': 799395, 'HTML': 359647, 'Python': 342188, 'SCSS': 13834, 'Shell': 4730, 'ANTLR': 1996, 'Makefile': 1509}

Apache License 2.0

metafacture/metafacture-core/441/440

metafacture

metafacture-core

https://github.com/metafacture/metafacture-core/issues/440

https://github.com/metafacture/metafacture-core/pull/441

https://github.com/metafacture/metafacture-core/pull/441

resolves

Do not trim control field values in MARCXML handler.

Originally introduced in 5bdcd5d, this breaks positional access (`<substring>`) to control field data elements. > For fixed-length fields with various kinds of coded information, specific data elements are positionally defined. _— [MARC 21 Bibliographic - Control Fields](https://www.loc.gov/marc/bibliographic/bd00x.html)_ Related to #233.

89793c7c68999118dc625a18082e8c1f1ed5c1ca

df6a86256da3fc47b4ac1e4c8fbe9a5b953dbbc8

https://github.com/metafacture/metafacture-core/compare/89793c7c68999118dc625a18082e8c1f1ed5c1ca...df6a86256da3fc47b4ac1e4c8fbe9a5b953dbbc8

diff --git a/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlHandler.java b/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlHandler.java index a79ecce6..76340b66 100644 --- a/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlHandler.java +++ b/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlHandler.java @@ -126,7 +126,7 @@ else if (DATAFIELD.equals(localName)) { getReceiver().endEntity(); } else if (CONTROLFIELD.equals(localName)) { - getReceiver().literal(currentTag, builder.toString().trim()); + getReceiver().literal(currentTag, builder.toString()); } else if (RECORD.equals(localName) && checkNamespace(uri)) { getReceiver().endRecord(); diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlHandlerTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlHandlerTest.java index 3902a604..8a9f8c86 100644 --- a/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlHandlerTest.java +++ b/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlHandlerTest.java @@ -77,6 +77,20 @@ public void shouldFindTagAttributeAtSecondPositionInControlFieldElement() verify(receiver).literal("001", fieldValue); } + @Test + public void issue440_shouldNotRemoveWhitespaceFromControlFields() throws SAXException { + final AttributesImpl attributes = new AttributesImpl(); + attributes.addAttribute(NAMESPACE, "tag", "tag", "CDATA", "008"); + + final String fieldValue = " t20202020au |||||||||||| ||||ger d"; + + marcXmlHandler.startElement(NAMESPACE, CONTROLFIELD, "", attributes); + marcXmlHandler.characters(fieldValue.toCharArray(), 0, fieldValue.length()); + marcXmlHandler.endElement(NAMESPACE, CONTROLFIELD, ""); + + verify(receiver).literal("008", fieldValue); + } + @Test public void issue233ShouldNotRemoveWhitespaceFromLeader() throws SAXException {

['metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlHandler.java', 'metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlHandlerTest.java']

{'.java': 2}

Java

{'Java': 2061460, 'GAP': 9719, 'Shell': 5031, 'Batchfile': 2118, 'JavaScript': 97}

Apache License 2.0

cse1110/andy/101/99

cse1110

andy

https://github.com/SERG-Delft/andy/issues/99

https://github.com/SERG-Delft/andy/pull/101

https://github.com/SERG-Delft/andy/pull/101

closes

Score of 100/100 is possible even if not everything is completed

Grades >= 99.5 get rounded up to 100. This is an edge case: any grade between 99 and 100 should be rounded down to 99, otherwise students may get confused and think that they have completed an exercise even if they haven't actually passed everything. For example: ``` Status: Done Andy v0.27.1-85578d2 (2022-04-25T09:29:42+0000) [...] --- Assessment Branch coverage: 20/21 (overall weight=0.10) Mutation coverage: 27/27 (overall weight=0.30) Code checks: 0/0 (overall weight=0.00) Meta tests: 17/17 (overall weight=0.60) Final grade: 100/100 Super congrats! [...] ``` Note the number of covered branches - only 20 out of 21 branches are covered, but due to the low weight of the branch coverage score, this branch is worth less than 0.5/100, so the final score becomes 99.5/100, which Andy incorrectly rounds up to 100/100.

b1d07f8e5a7703f30f1719afbe5b9166c68e0f23

1a2e3182b0b8552063485a3a0ccf1ea1d0b931b9

https://github.com/cse1110/andy/compare/b1d07f8e5a7703f30f1719afbe5b9166c68e0f23...1a2e3182b0b8552063485a3a0ccf1ea1d0b931b9

diff --git a/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java b/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java index d6ccdc3..6e71536 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java +++ b/src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java @@ -24,6 +24,11 @@ public class GradeCalculator { if(finalGrade < 0 || finalGrade > 100) throw new RuntimeException("Invalid grade calculation"); + // Grades between 99.5 and 100 should be rounded down to 99 instead of up + if (finalGrade == 100 && hasIncompleteComponents(gradeValues, weights)) { + finalGrade = 99; + } + return finalGrade; } @@ -79,4 +84,16 @@ public class GradeCalculator { return (float)checksPassed / totalChecks; } + /** + * @param gradeValues the grade values + * @param weights the weights + * @return whether any of the components with positive weight are incomplete + */ + private boolean hasIncompleteComponents(GradeValues gradeValues, GradeWeight weights) { + return weights.getBranchCoverageWeight() > 0.0f && gradeValues.getCoveredBranches() < gradeValues.getTotalBranches() || + weights.getMutationCoverageWeight() > 0.0f && gradeValues.getDetectedMutations() < gradeValues.getTotalMutations() || + weights.getMetaTestsWeight() > 0.0f && gradeValues.getMetaTestsPassed() < gradeValues.getTotalMetaTests() || + weights.getCodeChecksWeight() > 0.0f && gradeValues.getChecksPassed() < gradeValues.getTotalChecks(); + } + } diff --git a/src/test/java/unit/grade/GradeCalculatorTest.java b/src/test/java/unit/grade/GradeCalculatorTest.java index d834ba6..2d340ec 100644 --- a/src/test/java/unit/grade/GradeCalculatorTest.java +++ b/src/test/java/unit/grade/GradeCalculatorTest.java @@ -3,6 +3,7 @@ package unit.grade; import nl.tudelft.cse1110.andy.grade.GradeCalculator; import nl.tudelft.cse1110.andy.grade.GradeValues; import nl.tudelft.cse1110.andy.grade.GradeWeight; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -81,4 +82,52 @@ public class GradeCalculatorTest { of(25, 25, 55, 55, 100, 100, 2, 5, 94) // 0.4*1 + 0.3*1 + 0.2*1 + 0.1*(2/5) = 0.94 --> 94 ); } + + /* + * Test where the grade is between 99.5 and 100, should be rounded down to 99 and not + * rounded up to 100, as 100 should only be achievable if everything + * with a positive weight is fully completed. + */ + @Test + void withGradeBetween99And100() { + GradeWeight weights = new GradeWeight(0.1f, 0.3f, 0.6f, 0.0f); + + GradeValues grades = new GradeValues(); + grades.setBranchGrade(20, 21); + grades.setMutationGrade(27, 27); + grades.setMetaGrade(17, 17); + grades.setCheckGrade(0, 0); + + int finalGrade = new GradeCalculator().calculateFinalGrade(grades, weights); + + assertThat(finalGrade).isEqualTo(99); + } + + @ParameterizedTest + @MethodSource("zeroWeights") + void withZeroWeights(int coveredBranches, int totalBranches, + int detectedMutations, int totalMutations, + int metaTestsPassed, int totalMetaTests, + int checksPassed, int totalChecks, int expectedGrade) { + + GradeWeight weights = new GradeWeight(0.4f, 0.0f, 0.5f, 0.1f); + + GradeValues grades = new GradeValues(); + grades.setBranchGrade(coveredBranches, totalBranches); + grades.setMutationGrade(detectedMutations, totalMutations); + grades.setMetaGrade(metaTestsPassed, totalMetaTests); + grades.setCheckGrade(checksPassed, totalChecks); + + int finalGrade = new GradeCalculator().calculateFinalGrade(grades, weights); + + assertThat(finalGrade).isEqualTo(expectedGrade); + } + + private static Stream<Arguments> zeroWeights() { + return Stream.of( + of(25, 25, 2, 55, 100, 100, 5, 5, 100), // 0.4*1 + 0*(2/55) + 0.5*1 + 0.1*1 = 1.0 --> 100 + of(25, 25, 2, 55, 100, 100, 4, 5, 98), // 0.4*1 + 0*(2/55) + 0.5*1 + 0.1*(4/5) = 0.98 --> 98 + of(25, 25, 55, 55, 100, 100, 4, 5, 98) // 0.4*1 + 0*1 + 0.5*1 + 0.1*(4/5) = 0.98 --> 98 + ); + } }

['src/main/java/nl/tudelft/cse1110/andy/grade/GradeCalculator.java', 'src/test/java/unit/grade/GradeCalculatorTest.java']

{'.java': 2}

Java

{'Java': 1190111, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Python': 2949}

MIT License

cse1110/andy/86/83

cse1110

andy

https://github.com/SERG-Delft/andy/issues/83

https://github.com/SERG-Delft/andy/pull/86

https://github.com/SERG-Delft/andy/pull/86

fixes

Overload Andy constructor

Overload the Andy constructor in order to preserve backward compatibility after the changes introduced in #70 as those changes break the Maven plugin

28faca02fe2c80e58ca06a01390cf6007fb96f32

86803722431cb76859ee539f530eeeb82c7047ee

https://github.com/cse1110/andy/compare/28faca02fe2c80e58ca06a01390cf6007fb96f32...86803722431cb76859ee539f530eeeb82c7047ee

diff --git a/src/main/java/nl/tudelft/cse1110/andy/Andy.java b/src/main/java/nl/tudelft/cse1110/andy/Andy.java index 1aaef12..342db50 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/Andy.java +++ b/src/main/java/nl/tudelft/cse1110/andy/Andy.java @@ -33,10 +33,18 @@ public class Andy { this.metaData = metaData; } + public Andy(Action action, String workDir, String outputDir, List<String> librariesToBeIncluded, ResultWriter writer) { + this(action, workDir, outputDir, librariesToBeIncluded, writer, SubmissionMetaData.empty()); + } + public Andy(Action action, String workDir, String outputDir, ResultWriter writer, SubmissionMetaData metaData) { this(action, workDir, outputDir, null, writer, metaData); } + public Andy(Action action, String workDir, String outputDir, ResultWriter writer) { + this(action, workDir, outputDir, null, writer); + } + public void run() { Context ctx = buildContext(); diff --git a/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java b/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java index f25a358..5eb64de 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java +++ b/src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java @@ -10,4 +10,8 @@ public class SubmissionMetaData { this.studentId = studentId; this.exercise = exercise; } + + public static SubmissionMetaData empty() { + return new SubmissionMetaData(null, null, null); + } } \\ No newline at end of file

['src/main/java/nl/tudelft/cse1110/andy/Andy.java', 'src/main/java/nl/tudelft/cse1110/andy/writer/weblab/SubmissionMetaData.java']

{'.java': 2}

Java

{'Java': 1190111, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Python': 2949}

MIT License

cse1110/andy/112/111

cse1110

andy

https://github.com/SERG-Delft/andy/issues/111

https://github.com/SERG-Delft/andy/pull/112

https://github.com/SERG-Delft/andy/pull/112

closes

Assessing time message phrasing is incorrect

https://github.com/cse1110/andy/blob/4e53516cc38247149e281646700dd116d8167323/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java#L194 The word `question` should be replaced with `solution`.

e3095a639b2fff45a2df509a5fa1293fd005ed39

5b839c6ad771c0355b651748778840fd9edb9262

https://github.com/cse1110/andy/compare/e3095a639b2fff45a2df509a5fa1293fd005ed39...5b839c6ad771c0355b651748778840fd9edb9262

diff --git a/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java b/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java index cad447d..52c9b6d 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java +++ b/src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java @@ -191,7 +191,7 @@ public class StandardResultWriter implements ResultWriter { if(modeActionSelector(ctx)!=null) l(String.format("\\nAndy is running in %s mode and took %.1f seconds to assess your solution.", modeActionSelector(ctx).getMode().toString(), timeInSeconds)); else - l(String.format("\\nAndy took %.1f seconds to assess your question.", timeInSeconds)); + l(String.format("\\nAndy took %.1f seconds to assess your solution.", timeInSeconds)); } private void printMetaTestResults(Context ctx, MetaTestsResult metaTests) {

['src/main/java/nl/tudelft/cse1110/andy/writer/standard/StandardResultWriter.java']

{'.java': 1}

Java

{'Java': 1190111, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Python': 2949}

MIT License

cse1110/andy/110/109

cse1110

andy

https://github.com/SERG-Delft/andy/issues/109

https://github.com/SERG-Delft/andy/pull/110

https://github.com/SERG-Delft/andy/pull/110

closes

`assertNull` is not considered an assertion by code check

`assertNull` is not considered an assertion by the TestMethodsHaveAssertions code check: https://github.com/cse1110/andy/blob/main/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java This assertion method as well as other JUnit methods that have been missed should be added to this code check.

8932a6199da9c6e5760e646fe4ebbdd4b96baa55

594ae60cd6d906ca3f8c8373cf29c7630cb192ed

https://github.com/cse1110/andy/compare/8932a6199da9c6e5760e646fe4ebbdd4b96baa55...594ae60cd6d906ca3f8c8373cf29c7630cb192ed

diff --git a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java index 76fa129..06db6b4 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java +++ b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java @@ -35,6 +35,14 @@ public class TestMethodsHaveAssertions extends WithinTestMethod { add("assertTrue"); add("assertFalse"); add("assertThrows"); + add("assertNull"); + add("assertArrayEquals"); + add("assertDoesNotThrow"); + add("assertIterableEquals"); + add("assertLinesMatch"); + add("assertNotNull"); + add("assertNotSame"); + add("assertSame"); // assertj add("assertThat");

['src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java']

{'.java': 1}

Java

{'Java': 1190111, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Python': 2949}

MIT License

metafacture/metafacture-core/344/343

metafacture

metafacture-core

https://github.com/metafacture/metafacture-core/issues/343

https://github.com/metafacture/metafacture-core/pull/344

https://github.com/metafacture/metafacture-core/pull/344

fixes

JSON-LD keywords in input data break _else pass-through in morph

Somehow data input field names like `@id`, `@graph` end up in morph feedback/recursion and are missing in the output. This came up in https://gitlab.com/oersi/oersi-etl/-/issues/29#note_453341447 and I've implemented a fix for metafacture-fix in https://github.com/metafacture/metafacture-fix/commit/f4dc31dbb3a1aae86cfef9811f4f074f1ab87a61. I'll branch off from https://github.com/metafacture/metafacture-core/pull/342 to add a test case for metamorph.

89a3b261f6cd34e9d65c8e28b35e45c6d5165df1

15c29d9f5ebd25bcae78eaa84fc6f9e351d4fab2

https://github.com/metafacture/metafacture-core/compare/89a3b261f6cd34e9d65c8e28b35e45c6d5165df1...15c29d9f5ebd25bcae78eaa84fc6f9e351d4fab2

diff --git a/metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java b/metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java index 43dd9a17..e38b9d05 100644 --- a/metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java +++ b/metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java @@ -338,11 +338,11 @@ else if (fallbackReceiver != null) { elseNestedEntityStarted = true; } - send(currentLiteralName, value, fallbackReceiver); + send(escapeFeedbackChar(currentLiteralName), value, fallbackReceiver); } } else { - send(path, value, fallbackReceiver); + send(escapeFeedbackChar(path), value, fallbackReceiver); } } } @@ -363,6 +363,14 @@ private void send(final String path, final String value, final List<NamedValueRe } } + private boolean startsWithFeedbackChar(final String name) { + return name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR; + } + + private String escapeFeedbackChar(final String name) { + return name == null ? null : (startsWithFeedbackChar(name) ? ESCAPE_CHAR : "") + name; + } + /** * @param streamReceiver * the outputHandler to set @@ -388,7 +396,7 @@ public void receive(final String name, final String value, final NamedValueSourc "encountered literal with name='null'. This indicates a bug in a function or a collector."); } - if (name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR) { + if (startsWithFeedbackChar(name)) { dispatch(name, value, null, false); return; } diff --git a/metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java b/metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java index 6345b8ea..7f551ba1 100644 --- a/metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java +++ b/metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java @@ -106,6 +106,7 @@ private void testElseData(final String elseKeyword) { "</rules>", i -> { i.startRecord("1"); + i.literal("@id", "123"); i.literal("Shikotan", "Aekap"); i.startEntity("Germany"); i.literal("Langeoog", "Moin"); @@ -113,18 +114,21 @@ private void testElseData(final String elseKeyword) { i.literal("Borkum", "Tach"); i.endEntity(); i.startEntity("Germany"); + i.literal("@foo", "bar"); i.literal("Baltrum", "Moin Moin"); i.endEntity(); i.endRecord(); }, o -> { o.get().startRecord("1"); + o.get().literal("@id", "123"); o.get().literal("Shikotan", "Aekap"); o.get().literal("Germany.Langeoog", "Moin"); o.get().startEntity("Germany"); o.get().literal("Hawaii", "Aloha"); o.get().literal("Germany.Borkum", "Tach"); o.get().endEntity(); + o.get().literal("Germany.@foo", "bar"); o.get().literal("Germany.Baltrum", "Moin Moin"); o.get().endRecord(); } @@ -223,8 +227,10 @@ public void shouldHandleUnmatchedLiteralsAndEntitiesInElseNestedSource() { "</rules>", i -> { i.startRecord("1"); + i.literal("@id", "123"); i.literal("Shikotan", "Aekap"); i.startEntity("Germany"); + i.literal("@foo", "bar"); i.literal("Langeoog", "Moin"); i.literal("Baltrum", "Moin Moin"); i.endEntity(); @@ -235,8 +241,10 @@ public void shouldHandleUnmatchedLiteralsAndEntitiesInElseNestedSource() { }, o -> { o.get().startRecord("1"); + o.get().literal("@id", "123"); o.get().literal("Shikotan", "Aekap"); o.get().startEntity("Germany"); + o.get().literal("@foo", "bar"); o.get().literal("Langeoog", "Moin"); o.get().literal("Baltrum", "Moin Moin"); o.get().endEntity();

['metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java', 'metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java']

{'.java': 2}

Java

{'Java': 2061460, 'GAP': 9719, 'Shell': 5031, 'Batchfile': 2118, 'JavaScript': 97}

Apache License 2.0

cse1110/andy/107/106

cse1110

andy

https://github.com/SERG-Delft/andy/issues/106

https://github.com/SERG-Delft/andy/pull/107

https://github.com/SERG-Delft/andy/pull/107

closes

assertThatExceptionOfType is not counted as an assertion by code check

`assertThatExceptionOfType` is not considered an assertion by the TestMethodsHaveAssertions code check: https://github.com/cse1110/andy/blob/main/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java This assertion method as well as all other AssertJ methods that have been missed should be added to this code check.

fb70989e22d025c48335b1ed9683f5cc1397a247

b2d05bbbcb506cc0bafc56f5766a6d8cc1572b16

https://github.com/cse1110/andy/compare/fb70989e22d025c48335b1ed9683f5cc1397a247...b2d05bbbcb506cc0bafc56f5766a6d8cc1572b16

diff --git a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java index 523423e..76fa129 100644 --- a/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java +++ b/src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java @@ -39,6 +39,13 @@ public class TestMethodsHaveAssertions extends WithinTestMethod { // assertj add("assertThat"); add("assertThatThrownBy"); + add("assertThatExceptionOfType"); + add("assertThatCode"); + add("assertThatIllegalArgumentException"); + add("assertThatIllegalStateException"); + add("assertThatIOException"); + add("assertThatNullPointerException"); + add("assertThatObject"); }};

['src/main/java/nl/tudelft/cse1110/andy/codechecker/checks/TestMethodsHaveAssertions.java']

{'.java': 1}

Java

{'Java': 1190111, 'JavaScript': 110694, 'HTML': 97754, 'CSS': 91695, 'TypeScript': 22968, 'Python': 2949}

MIT License

kaotoio/kaoto-backend/730/728

kaotoio

kaoto-backend

https://github.com/KaotoIO/kaoto-backend/issues/728

https://github.com/KaotoIO/kaoto-backend/pull/730

https://github.com/KaotoIO/kaoto-backend/pull/730

fixes

[BUG] Documentation GitHub workflow is broken: Invalid miniclass definition: DSLSpecification

**Describe the bug** ``` > @ docs-api /home/runner/work/kaoto-backend/kaoto-backend > leafdoc -t leafdoc-templates/plain -o docs/index.html -c "🐱" leafdoc-templates/index.leafdoc */src/main/java/ -e true -x .java Invalid miniclass definition: DSLSpecification Error: No class/namespace set when parsing through: null 🐱method identifier: String Returns the identifier of the supported language. This must be unique on the whole Kaoto instance and relates the deployments and parsers services with the DSL specification. file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:371 if (!currentNamespace.supersections.hasOwnProperty(dt)) { ^ TypeError: Cannot read property 'supersections' of undefined at Leafdoc.addStr (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:371:28) at Leafdoc.addBuffer (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:193:15) at Leafdoc.addFile (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:185:15) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:174:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) at Leafdoc.addDir (file:///home/runner/work/kaoto-backend/kaoto-backend/node_modules/leafdoc/src/leafdoc.mjs:169:10) ``` **To Reproduce** Steps to reproduce the behavior: 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' 4. See error **Expected behavior** Documentation GitHub action working **Logs** If applicable, add logs to help explain your problem. **Environment (please complete the following information):** **Additional context** failure was relatively hidden because another job is failign for a long time and so there was a red cross on all commit of main branch for a very long time https://github.com/KaotoIO/kaoto-backend/issues/530

411a91e0d79e895c5ded32c5a6fe0340cc059d43

bf66b8331811247fb1204a36f2531062125b3b69

https://github.com/kaotoio/kaoto-backend/compare/411a91e0d79e895c5ded32c5a6fe0340cc059d43...bf66b8331811247fb1204a36f2531062125b3b69

diff --git a/services-interfaces/src/main/java/io/kaoto/backend/api/service/dsl/DSLSpecification.java b/services-interfaces/src/main/java/io/kaoto/backend/api/service/dsl/DSLSpecification.java index c55d9cbc..45ce3198 100644 --- a/services-interfaces/src/main/java/io/kaoto/backend/api/service/dsl/DSLSpecification.java +++ b/services-interfaces/src/main/java/io/kaoto/backend/api/service/dsl/DSLSpecification.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.function.Predicate; /** - * 🐱miniclass DSLSpecification + * 🐱class DSLSpecification * <p> * <p> * 🐱section

['services-interfaces/src/main/java/io/kaoto/backend/api/service/dsl/DSLSpecification.java']

{'.java': 1}

Java

{'Java': 1180804, 'Handlebars': 15423, 'Shell': 10824, 'HTML': 5156}

Apache License 2.0

ballerina-platform/ballerina-distribution/358/350

ballerina-platform

ballerina-distribution

https://github.com/ballerina-platform/ballerina-distribution/issues/350

https://github.com/ballerina-platform/ballerina-distribution/pull/358

https://github.com/ballerina-platform/ballerina-distribution/pull/358

fixes

Language server launcher scripts does not have executable permission when pulling the distribution using the updater tool

**Description:** Please note $title for jballerina-1.1.0-beta distribution, which affects the IntelliJ plugin and ends up as a language server initialization failure. **Suggested Labels:** <!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels--> **Suggested Assignees:** <!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees--> **Affected Product Version:** - OS - Ubuntu 18.04.3 LTS - Ballerina version - jBallerina 1.1.0-beta - Language specification 2019R3 - Command 1.1.0-alpha **OS, DB, other environment details and versions:** **Steps to reproduce:** **Related Issues:** <!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->

854a3b36c452dbf22c1bd42eaf1a26cff124326c

db982268b7b50e85fdcb62b1b85994d857c9884a

https://github.com/ballerina-platform/ballerina-distribution/compare/854a3b36c452dbf22c1bd42eaf1a26cff124326c...db982268b7b50e85fdcb62b1b85994d857c9884a

diff --git a/ballerina-command/src/main/java/org/ballerinalang/command/util/OSUtils.java b/ballerina-command/src/main/java/org/ballerinalang/command/util/OSUtils.java index cb69e524f..11042ee6b 100644 --- a/ballerina-command/src/main/java/org/ballerinalang/command/util/OSUtils.java +++ b/ballerina-command/src/main/java/org/ballerinalang/command/util/OSUtils.java @@ -57,14 +57,7 @@ public class OSUtils { * @return name of the file */ public static String getExecutableFileName() { - if (OSUtils.isWindows()) { - return "ballerina.bat"; - } else if (OSUtils.isUnix() || OSUtils.isSolaris()) { - return "ballerina"; - } else if (OSUtils.isMac()) { - return "ballerina"; - } - return null; + return OSUtils.isWindows() ? "ballerina.bat" : "ballerina"; } /** @@ -72,14 +65,23 @@ public class OSUtils { * @return name of the file */ public static String getInstallScriptFileName() { - if (OSUtils.isWindows()) { - return "install.bat"; - } else if (OSUtils.isUnix() || OSUtils.isSolaris()) { - return "install"; - } else if (OSUtils.isMac()) { - return "install"; - } - return null; + return OSUtils.isWindows() ? "install.bat" : "install"; + } + + /** + * Provide file name of debug adapter script for current operating system. + * @return name of the file + */ + public static String getDebugAdapterName() { + return OSUtils.isWindows() ? "debug-adapter-launcher.bat" : "debug-adapter-launcher.sh"; + } + + /** + * Provide file name of language server launcher script for current operating system. + * @return name of the file + */ + public static String getLangServerLauncherName() { + return OSUtils.isWindows() ? "language-server-launcher.bat" : "language-server-launcher.sh"; } public static String getBallerinaVersionFilePath() throws IOException { diff --git a/ballerina-command/src/main/java/org/ballerinalang/command/util/ToolUtil.java b/ballerina-command/src/main/java/org/ballerinalang/command/util/ToolUtil.java index 3dedd5521..b84143acd 100644 --- a/ballerina-command/src/main/java/org/ballerinalang/command/util/ToolUtil.java +++ b/ballerina-command/src/main/java/org/ballerinalang/command/util/ToolUtil.java @@ -385,6 +385,23 @@ public class ToolUtil { addExecutablePermissionToFile(new File(distPath + File.separator + distribution + File.separator + "bin" + File.separator + OSUtils.getExecutableFileName())); + + + String langServerPath = distPath + File.separator + distribution + File.separator + "lib" + + File.separator + "tools"; + File launcherServer = new File(langServerPath + File.separator + "lang-server" + + File.separator + "launcher" + File.separator + OSUtils.getLangServerLauncherName()); + File debugAdpater = new File(langServerPath + File.separator + "debug-adapter" + + File.separator + "launcher" + File.separator + OSUtils.getDebugAdapterName()); + + if (debugAdpater.exists()) { + addExecutablePermissionToFile(debugAdpater); + } + + if (launcherServer.exists()) { + addExecutablePermissionToFile(launcherServer); + } + new File(zipFileLocation).delete(); } finally { conn.disconnect();

['ballerina-command/src/main/java/org/ballerinalang/command/util/ToolUtil.java', 'ballerina-command/src/main/java/org/ballerinalang/command/util/OSUtils.java']

{'.java': 2}

Java

{'Java': 300258, 'Ballerina': 216591, 'Shell': 16993, 'Batchfile': 5737}

Apache License 2.0

wiiiiam278/huskhomes2/392/391

wiiiiam278

huskhomes2

https://github.com/WiIIiam278/HuskHomes/issues/391

https://github.com/WiIIiam278/HuskHomes/pull/392

https://github.com/WiIIiam278/HuskHomes/pull/392

fixes

Local online user resolution on teleport from username targets by closest match prevents a global exact match

Attempting username resolution against a user that has the partial username of another (i.e requesting a teleport to `APP`, while another user of the name `APPLE` is present on the network) will cause unintended outcomes. Referencing the example, this can result in the use `APPLE` being teleported to INSTEAD of the user `APP`.

b1bd44ac642352ac3c982767a18d0c74a4219146

a11cf17bb1b163b502b2e03d308bb566995d5fc1

https://github.com/wiiiiam278/huskhomes2/compare/b1bd44ac642352ac3c982767a18d0c74a4219146...a11cf17bb1b163b502b2e03d308bb566995d5fc1

diff --git a/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java b/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java index b849e815..d255ecd3 100644 --- a/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java +++ b/bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java @@ -202,7 +202,6 @@ public class BukkitPluginTests { Assertions.assertFalse(plugin.getValidator().isValidName(name)); } - // test descriptions @DisplayName("Test Validator Accepts Valid Descriptions") @ParameterizedTest(name = "Valid Description: \\"{0}\\"") @ValueSource(strings = { @@ -366,7 +365,6 @@ public class BukkitPluginTests { } - // home tests, like warps but with a user parameter (owner) as well as name and position and a test for changing home privacy @Nested @DisplayName("Home Tests") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/common/src/main/java/net/william278/huskhomes/HuskHomes.java b/common/src/main/java/net/william278/huskhomes/HuskHomes.java index 3ad6f382..b8c6fb40 100644 --- a/common/src/main/java/net/william278/huskhomes/HuskHomes.java +++ b/common/src/main/java/net/william278/huskhomes/HuskHomes.java @@ -78,6 +78,31 @@ public interface HuskHomes extends TaskRunner, EventDispatcher, SafetyResolver { @NotNull List<OnlineUser> getOnlineUsers(); + /** + * Finds a local {@link OnlineUser} by their name. Auto-completes partially typed names for the closest match + * + * @param playerName the name of the player to find + * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found + */ + default Optional<OnlineUser> getOnlineUser(@NotNull String playerName) { + return getOnlineUserExact(playerName) + .or(() -> getOnlineUsers().stream() + .filter(user -> user.getUsername().toLowerCase().startsWith(playerName.toLowerCase())) + .findFirst()); + } + + /** + * Finds a local {@link OnlineUser} by their name. + * + * @param playerName the name of the player to find + * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found + */ + default Optional<OnlineUser> getOnlineUserExact(@NotNull String playerName) { + return getOnlineUsers().stream() + .filter(user -> user.getUsername().equalsIgnoreCase(playerName)) + .findFirst(); + } + @NotNull Set<SavedUser> getSavedUsers(); @@ -111,22 +136,6 @@ public interface HuskHomes extends TaskRunner, EventDispatcher, SafetyResolver { log(Level.INFO, "Successfully initialized " + name); } - /** - * Finds a local {@link OnlineUser} by their name. Auto-completes partially typed names for the closest match - * - * @param playerName the name of the player to find - * @return an {@link Optional} containing the {@link OnlineUser} if found, or an empty {@link Optional} if not found - */ - @NotNull - default Optional<OnlineUser> findOnlinePlayer(@NotNull String playerName) { - return getOnlineUsers().stream() - .filter(user -> user.getUsername().equalsIgnoreCase(playerName)) - .findFirst() - .or(() -> getOnlineUsers().stream() - .filter(user -> user.getUsername().toLowerCase().startsWith(playerName.toLowerCase())) - .findFirst()); - } - /** * The plugin {@link Settings} loaded from file * diff --git a/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java b/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java index cc3b17b1..0fd59cc6 100644 --- a/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java +++ b/common/src/main/java/net/william278/huskhomes/command/RtpCommand.java @@ -50,7 +50,7 @@ public class RtpCommand extends Command implements UserListTabProvider { @Override public void execute(@NotNull CommandUser executor, @NotNull String[] args) { - final Optional<OnlineUser> optionalTeleporter = args.length >= 1 ? plugin.findOnlinePlayer(args[0]) + final Optional<OnlineUser> optionalTeleporter = args.length >= 1 ? plugin.getOnlineUser(args[0]) : executor instanceof OnlineUser ? Optional.of((OnlineUser) executor) : Optional.empty(); if (optionalTeleporter.isEmpty()) { if (args.length == 0) { diff --git a/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java b/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java index 427efb84..5bb3d77c 100644 --- a/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java +++ b/common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java @@ -145,7 +145,7 @@ public class RequestsManager { @NotNull TeleportRequest.Type type) throws IllegalArgumentException { final long expiry = Instant.now().getEpochSecond() + plugin.getSettings().getTeleportRequestExpiryTime(); final TeleportRequest request = new TeleportRequest(requester, type, expiry); - final Optional<OnlineUser> localTarget = plugin.findOnlinePlayer(targetUser); + final Optional<OnlineUser> localTarget = plugin.getOnlineUser(targetUser); if (localTarget.isPresent()) { if (localTarget.get().equals(requester)) { throw new IllegalArgumentException("Cannot send a teleport request to yourself"); @@ -282,7 +282,7 @@ public class RequestsManager { .ifPresent(recipient::sendMessage); // Find the requester and inform them of the response - final Optional<OnlineUser> localRequester = plugin.findOnlinePlayer(request.getRequesterName()); + final Optional<OnlineUser> localRequester = plugin.getOnlineUser(request.getRequesterName()); if (localRequester.isPresent()) { handleLocalRequestResponse(localRequester.get(), request); } else if (plugin.getSettings().doCrossServer()) { diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Target.java b/common/src/main/java/net/william278/huskhomes/teleport/Target.java index a5eda39b..9cd7a031 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Target.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Target.java @@ -21,8 +21,17 @@ package net.william278.huskhomes.teleport; import org.jetbrains.annotations.NotNull; +/** + * Represents a target; a player name or a location that will be teleported <i>to</i>. + */ public interface Target { + /** + * Create a {@link Target} from a player name + * + * @param target the player name + * @return the target + */ @NotNull static Target username(@NotNull String target) { return new Username(target); diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java b/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java index 527cd104..351fb54d 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Teleport.java @@ -35,6 +35,11 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +/** + * Represents the process of a {@link Teleportable} being teleported to a {@link Target}. + * + * @see Teleport#builder(HuskHomes) + */ public class Teleport { protected final HuskHomes plugin; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java b/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java index fe1a9b6f..c6291fe8 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java @@ -26,6 +26,9 @@ import org.jetbrains.annotations.NotNull; import java.util.List; +/** + * A builder for {@link Teleport} and {@link TimedTeleport} objects. + */ public class TeleportBuilder { private final HuskHomes plugin; private OnlineUser executor; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java b/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java index b379cad5..547d53da 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java @@ -90,6 +90,7 @@ public class TeleportRequest { /** * The user making the request */ + @NotNull public String getRequesterName() { return requesterName; } diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java b/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java index 759b38bb..e71f87f0 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java @@ -20,9 +20,22 @@ package net.william278.huskhomes.teleport; import org.jetbrains.annotations.NotNull; +import net.william278.huskhomes.user.OnlineUser; +/** + * Represents a teleporter; the person performing the teleport. + * <p> + * Can be represented as an {@link OnlineUser} locally or as a {@link Username username} reference + * that needs to be resolved first. + */ public interface Teleportable { + /** + * Create a {@link Teleportable} from a player name + * + * @param teleporter the player name + * @return the teleportable + */ @NotNull static Teleportable username(@NotNull String teleporter) { return new Username(teleporter); diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java b/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java index cedf12b9..287501cd 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java @@ -30,6 +30,11 @@ import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +/** + * Represents a {@link Teleport} that has an associated warmup time; the teleport will not be performed until the + * warmup time has elapsed, during which the user must not move or take damage. + * @see Teleport#builder(HuskHomes) + */ public class TimedTeleport extends Teleport { public static final String BYPASS_PERMISSION = "huskhomes.bypass_teleport_warmup"; diff --git a/common/src/main/java/net/william278/huskhomes/teleport/Username.java b/common/src/main/java/net/william278/huskhomes/teleport/Username.java index 646e61e5..af9ce00b 100644 --- a/common/src/main/java/net/william278/huskhomes/teleport/Username.java +++ b/common/src/main/java/net/william278/huskhomes/teleport/Username.java @@ -25,11 +25,30 @@ import org.jetbrains.annotations.NotNull; import java.util.Optional; +/** + * Represents the username of a player who may or may not be online, either locally as an {@link OnlineUser}, + * or on a different server. + * + * @param name The name of the player + */ public record Username(@NotNull String name) implements Teleportable, Target { + /** + * Search for a local {@link OnlineUser} by their name. + * + * @param plugin The instance of {@link HuskHomes} + * @return An {@link Optional} containing the {@link OnlineUser} if found + * @throws TeleportationException If the user is not found + * @implNote If a user by the name provided is on the {@link HuskHomes#getPlayerList() player list}, then this + * method will search for the user by exact name. + * <p> + * Otherwise, the lookup will first attempt to find the user by exact name, and if that fails, it will search for + * the closest name match. + */ @NotNull - public Optional<OnlineUser> findLocally(@NotNull HuskHomes plugin) throws TeleportationException { - return plugin.findOnlinePlayer(name); + public Optional<OnlineUser> findLocally(@NotNull HuskHomes plugin) { + return plugin.getPlayerList(true).stream().anyMatch(listedName -> listedName.equalsIgnoreCase(name)) + ? plugin.getOnlineUserExact(name) : plugin.getOnlineUser(name); } }

['common/src/main/java/net/william278/huskhomes/teleport/TeleportRequest.java', 'common/src/main/java/net/william278/huskhomes/teleport/Username.java', 'common/src/main/java/net/william278/huskhomes/manager/RequestsManager.java', 'common/src/main/java/net/william278/huskhomes/command/RtpCommand.java', 'common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java', 'common/src/main/java/net/william278/huskhomes/HuskHomes.java', 'common/src/main/java/net/william278/huskhomes/teleport/Target.java', 'common/src/main/java/net/william278/huskhomes/teleport/Teleportable.java', 'common/src/main/java/net/william278/huskhomes/teleport/TeleportBuilder.java', 'bukkit/src/test/java/net/william278/huskhomes/BukkitPluginTests.java', 'common/src/main/java/net/william278/huskhomes/teleport/Teleport.java']

{'.java': 11}

Java

{'Java': 919259, 'Shell': 392}

Apache License 2.0

ita-social-projects/greencity/5164/4465

ita-social-projects

greencity

https://github.com/ita-social-projects/GreenCity/issues/4465

https://github.com/ita-social-projects/GreenCity/pull/5164

https://github.com/ita-social-projects/GreenCity/pull/5164

fixed

[Event] User is able to edit ended event.

**Environment:** macOS Monterey 12.4 Safari 15.5 **Reproducible:** always **Build found:** 22.07.22 **Steps to reproduce** 1. Sign in Green City project. 2. Create event. 3. Open the event page when it ends. **Actual result** The "Edit" link is present and the user is able to edit the event. **Expected result** There is no "Edit" link. **User story and test case links** E.g.: "User story #3195 [Test case](https://jira.softserve.academy/browse/GC-3161)" **Labels to be added** "Bug", Priority ("priority: medium "), Severity ("severity: major").

206f90b844331a97c5255f1e813d46bf243c26f1

268b72df6808ee78a785fdc95da2093331a1cf9b

https://github.com/ita-social-projects/greencity/compare/206f90b844331a97c5255f1e813d46bf243c26f1...268b72df6808ee78a785fdc95da2093331a1cf9b

diff --git a/service/src/main/java/greencity/service/EventServiceImpl.java b/service/src/main/java/greencity/service/EventServiceImpl.java index a4e4641ac..23a4afbd0 100644 --- a/service/src/main/java/greencity/service/EventServiceImpl.java +++ b/service/src/main/java/greencity/service/EventServiceImpl.java @@ -223,7 +223,7 @@ public class EventServiceImpl implements EventService { throw new BadRequestException(ErrorMessage.USER_HAS_NO_PERMISSION); } - if (!toUpdate.isOpen()) { + if (findLastEventDateTime(toUpdate).isBefore(ZonedDateTime.now())) { throw new BadRequestException(ErrorMessage.EVENT_IS_FINISHED); } diff --git a/service/src/test/java/greencity/ModelUtils.java b/service/src/test/java/greencity/ModelUtils.java index ad92087d0..feff3b22b 100644 --- a/service/src/test/java/greencity/ModelUtils.java +++ b/service/src/test/java/greencity/ModelUtils.java @@ -1740,12 +1740,29 @@ public class ModelUtils { event.setTitle("Title"); List<EventDateLocation> dates = new ArrayList<>(); dates.add(new EventDateLocation(1L, event, - ZonedDateTime.of(2000, 1, 1, 1, 1, 1, 1, ZoneId.systemDefault()), - ZonedDateTime.of(2000, 2, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + ZonedDateTime.of(2098, 1, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + ZonedDateTime.of(2099, 2, 1, 1, 1, 1, 1, ZoneId.systemDefault()), new Coordinates(45.45, 45.45, "Ua Address", "En Address"), null)); dates.add(new EventDateLocation(2L, event, - ZonedDateTime.of(2002, 1, 1, 1, 1, 1, 1, ZoneId.systemDefault()), - ZonedDateTime.of(2002, 2, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + ZonedDateTime.of(2099, 1, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + ZonedDateTime.of(2100, 2, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + new Coordinates(45.45, 45.45, "Ua Address", "En Address"), null)); + event.setDates(dates); + event.setTags(List.of(getEventTag())); + event.setTitleImage(AppConstant.DEFAULT_HABIT_IMAGE); + return event; + } + + public static Event getEventWithFinishedDate() { + Event event = new Event(); + event.setDescription("Description"); + event.setId(1L); + event.setOrganizer(getUser()); + event.setTitle("Title"); + List<EventDateLocation> dates = new ArrayList<>(); + dates.add(new EventDateLocation(1L, event, + ZonedDateTime.of(2000, 1, 1, 1, 1, 1, 1, ZoneId.systemDefault()), + ZonedDateTime.of(2001, 2, 1, 1, 1, 1, 1, ZoneId.systemDefault()), new Coordinates(45.45, 45.45, "Ua Address", "En Address"), null)); event.setDates(dates); event.setTags(List.of(getEventTag())); diff --git a/service/src/test/java/greencity/service/EventServiceImplTest.java b/service/src/test/java/greencity/service/EventServiceImplTest.java index 896917989..b811299ac 100644 --- a/service/src/test/java/greencity/service/EventServiceImplTest.java +++ b/service/src/test/java/greencity/service/EventServiceImplTest.java @@ -21,7 +21,6 @@ import greencity.repository.EventRepo; import lombok.SneakyThrows; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.provider.EnumSource; import org.mockito.InjectMocks; import org.mockito.Mock; import org.modelmapper.ModelMapper; @@ -115,8 +114,7 @@ class EventServiceImplTest { @Test void updateFinishedEvent() { - Event actualEvent = ModelUtils.getEvent(); - actualEvent.setOpen(false); + Event actualEvent = ModelUtils.getEventWithFinishedDate(); UpdateEventDto eventToUpdateDto = ModelUtils.getUpdateEventDto(); String userEmail = ModelUtils.getUser().getEmail(); @@ -589,7 +587,7 @@ class EventServiceImplTest { @Test void rateEvent() { - Event event = ModelUtils.getEvent(); + Event event = ModelUtils.getEventWithFinishedDate(); User user = ModelUtils.getAttenderUser(); event.setAttenders(Set.of(user)); when(eventRepo.findById(any())).thenReturn(Optional.of(event));

['service/src/test/java/greencity/ModelUtils.java', 'service/src/main/java/greencity/service/EventServiceImpl.java', 'service/src/test/java/greencity/service/EventServiceImplTest.java']

{'.java': 3}

Java

{'Java': 2701205, 'HTML': 429257, 'JavaScript': 135338, 'CSS': 59705, 'PLpgSQL': 5721, 'Go': 2336, 'Dockerfile': 111, 'Procfile': 110}

MIT License

apache/camel-k-runtime/302/301

apache

camel-k-runtime

https://github.com/apache/camel-k-runtime/issues/301

https://github.com/apache/camel-k-runtime/pull/302

https://github.com/apache/camel-k-runtime/pull/302

fix

Can't get response from platform HTTP

Getting error whenever I try to read some binary content from a rest endpoint: ``` Error executing reactive work due to You must set the Content-Length header to be the total size of the message body BEFORE sending any data if you are not using HTTP chunked encoding. ``` I'm working on a fix

a0db7e1926e6b046072ed63efe917d29f27ef526

80665b0cdb5249938566ec117145a8c11556b1e5

https://github.com/apache/camel-k-runtime/compare/a0db7e1926e6b046072ed63efe917d29f27ef526...80665b0cdb5249938566ec117145a8c11556b1e5

diff --git a/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/engine/RuntimePlatformHttpConsumer.java b/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/engine/RuntimePlatformHttpConsumer.java index 300fe915..bb448643 100644 --- a/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/engine/RuntimePlatformHttpConsumer.java +++ b/camel-k-runtime-http/src/main/java/org/apache/camel/k/http/engine/RuntimePlatformHttpConsumer.java @@ -200,6 +200,14 @@ public class RuntimePlatformHttpConsumer extends DefaultConsumer { ExchangeHelper.setFailureHandled(exchange); } + // set the content-length if it can be determined, or chunked encoding + final Integer length = determineContentLength(exchange, body); + if (length != null) { + response.putHeader("Content-Length", String.valueOf(length)); + } else { + response.setChunked(true); + } + // set the content type in the response. final String contentType = MessageHelper.getContentType(message); if (contentType != null) { @@ -209,6 +217,15 @@ public class RuntimePlatformHttpConsumer extends DefaultConsumer { return body; } + static Integer determineContentLength(Exchange camelExchange, Object body) { + if (body instanceof byte[]) { + return ((byte[]) body).length; + } else if (body instanceof ByteBuffer) { + return ((ByteBuffer) body).remaining(); + } + return null; + } + /* * Copied from org.apache.camel.http.common.DefaultHttpBinding.determineResponseCode(Exchange, Object) * If DefaultHttpBinding.determineResponseCode(Exchange, Object) is moved to a module without the servlet-api

['camel-k-runtime-http/src/main/java/org/apache/camel/k/http/engine/RuntimePlatformHttpConsumer.java']

{'.java': 1}

Java

{'Java': 379701, 'Groovy': 14549, 'Shell': 9051, 'Kotlin': 870, 'JavaScript': 857}

Apache License 2.0

ita-social-projects/greencity/2920/2908

ita-social-projects

greencity

https://github.com/ita-social-projects/GreenCity/issues/2908

https://github.com/ita-social-projects/GreenCity/pull/2920

https://github.com/ita-social-projects/GreenCity/pull/2920

fix

[GreenCity] Fix bug in CustomShoppingListItemController

**Fix bug in CustomShoppingListItemController:** `/custom/shopping-list-items/{userId}/custom-shopping-list-items` Bug occurs when user tries to update items' status.

2c72e67aa4c134b5bc076362f262e24c740f9ceb

23d958cadb924448e6d0f79633f2a3fec4739de4

https://github.com/ita-social-projects/greencity/compare/2c72e67aa4c134b5bc076362f262e24c740f9ceb...23d958cadb924448e6d0f79633f2a3fec4739de4

diff --git a/core/src/main/java/greencity/controller/CustomShoppingListItemController.java b/core/src/main/java/greencity/controller/CustomShoppingListItemController.java index fade95927..549d72cdf 100644 --- a/core/src/main/java/greencity/controller/CustomShoppingListItemController.java +++ b/core/src/main/java/greencity/controller/CustomShoppingListItemController.java @@ -105,7 +105,8 @@ public class CustomShoppingListItemController { @ApiResponse(code = 200, message = HttpStatuses.OK), @ApiResponse(code = 303, message = HttpStatuses.SEE_OTHER), @ApiResponse(code = 400, message = HttpStatuses.BAD_REQUEST), - @ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED) + @ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED), + @ApiResponse(code = 404, message = HttpStatuses.BAD_REQUEST) }) @PatchMapping("/{userId}/custom-shopping-list-items") public ResponseEntity<CustomShoppingListItemResponseDto> updateItemStatus(@PathVariable @CurrentUserId Long userId, diff --git a/service-api/src/main/java/greencity/constant/ErrorMessage.java b/service-api/src/main/java/greencity/constant/ErrorMessage.java index 6ddfcfb5b..d3a948d14 100644 --- a/service-api/src/main/java/greencity/constant/ErrorMessage.java +++ b/service-api/src/main/java/greencity/constant/ErrorMessage.java @@ -145,6 +145,7 @@ public final class ErrorMessage { public static final String ACHIEVEMENT_NOT_FOUND_BY_ID = "The name does not exist by this id: "; public static final String PAGE_INDEX_IS_MORE_THAN_TOTAL_PAGES = "Page index is more than total pages: "; public static final String MULTIPART_FILE_BAD_REQUEST = "Bad inputed image string : "; + public static final String INCORRECT_INPUT_ITEM_STATUS = "Incorrect input status to update item."; private ErrorMessage() { } diff --git a/service/src/main/java/greencity/service/CustomShoppingListItemServiceImpl.java b/service/src/main/java/greencity/service/CustomShoppingListItemServiceImpl.java index 7a9bb02ee..0dc1e1e00 100644 --- a/service/src/main/java/greencity/service/CustomShoppingListItemServiceImpl.java +++ b/service/src/main/java/greencity/service/CustomShoppingListItemServiceImpl.java @@ -12,6 +12,7 @@ import greencity.entity.Habit; import greencity.entity.User; import greencity.entity.UserShoppingListItem; import greencity.enums.ShoppingListItemStatus; +import greencity.exception.exceptions.BadRequestException; import greencity.exception.exceptions.CustomShoppingListItemNotSavedException; import greencity.exception.exceptions.NotFoundException; import greencity.repository.CustomShoppingListItemRepo; @@ -139,22 +140,22 @@ public class CustomShoppingListItemServiceImpl implements CustomShoppingListItem @Transactional @Override public CustomShoppingListItemResponseDto updateItemStatus(Long userId, Long itemId, String itemStatus) { - CustomShoppingListItemResponseDto customShoppingListItemResponseDto = null; CustomShoppingListItem customShoppingListItem = customShoppingListItemRepo.findByUserIdAndItemId(userId, itemId); - if (itemStatus.equals(ShoppingListItemStatus.DONE.toString())) { + if (customShoppingListItem == null) { + throw new NotFoundException(CUSTOM_SHOPPING_LIST_ITEM_NOT_FOUND_BY_ID); + } + if (itemStatus.equalsIgnoreCase(ShoppingListItemStatus.DONE.name())) { customShoppingListItem.setStatus(ShoppingListItemStatus.DONE); - customShoppingListItemRepo.save(customShoppingListItem); - customShoppingListItemResponseDto = - modelMapper.map(customShoppingListItem, CustomShoppingListItemResponseDto.class); + return modelMapper.map(customShoppingListItemRepo.save(customShoppingListItem), + CustomShoppingListItemResponseDto.class); } - if (itemStatus.equals(ShoppingListItemStatus.ACTIVE.toString())) { + if (itemStatus.equalsIgnoreCase(ShoppingListItemStatus.ACTIVE.name())) { customShoppingListItem.setStatus(ShoppingListItemStatus.ACTIVE); - customShoppingListItemRepo.save(customShoppingListItem); - customShoppingListItemResponseDto = - modelMapper.map(customShoppingListItem, CustomShoppingListItemResponseDto.class); + return modelMapper.map(customShoppingListItemRepo.save(customShoppingListItem), + CustomShoppingListItemResponseDto.class); } - return customShoppingListItemResponseDto; + throw new BadRequestException(ErrorMessage.INCORRECT_INPUT_ITEM_STATUS); } /** diff --git a/service/src/test/java/greencity/service/CustomShoppingListItemServiceImplTest.java b/service/src/test/java/greencity/service/CustomShoppingListItemServiceImplTest.java index 3b151fb93..a0e9e12cb 100644 --- a/service/src/test/java/greencity/service/CustomShoppingListItemServiceImplTest.java +++ b/service/src/test/java/greencity/service/CustomShoppingListItemServiceImplTest.java @@ -2,6 +2,7 @@ package greencity.service; import greencity.ModelUtils; import greencity.client.RestClient; +import greencity.constant.ErrorMessage; import greencity.dto.shoppinglistitem.BulkSaveCustomShoppingListItemDto; import greencity.dto.shoppinglistitem.CustomShoppingListItemResponseDto; import greencity.dto.shoppinglistitem.CustomShoppingListItemSaveRequestDto; @@ -13,6 +14,7 @@ import greencity.enums.EmailNotification; import greencity.enums.Role; import greencity.enums.ShoppingListItemStatus; import greencity.enums.UserStatus; +import greencity.exception.exceptions.BadRequestException; import greencity.exception.exceptions.CustomShoppingListItemNotSavedException; import greencity.exception.exceptions.NotFoundException; import greencity.repository.CustomShoppingListItemRepo; @@ -243,7 +245,14 @@ class CustomShoppingListItemServiceImplTest { when(customShoppingListItemRepo.save(customShoppingListItem1)).thenReturn(customShoppingListItem1); when(modelMapper.map(customShoppingListItem1, CustomShoppingListItemResponseDto.class)).thenReturn(test1); assertEquals(test1, customShoppingListItemService.updateItemStatus(12L, 2L, "ACTIVE")); - + when(customShoppingListItemRepo.findByUserIdAndItemId(any(), anyLong())).thenReturn(null); + Exception thrown1 = assertThrows(NotFoundException.class, + () -> customShoppingListItemService.updateItemStatus(64L, 1L, "DONE")); + assertEquals(thrown1.getMessage(), ErrorMessage.CUSTOM_SHOPPING_LIST_ITEM_NOT_FOUND_BY_ID); + when(customShoppingListItemRepo.findByUserIdAndItemId(12L, 2L)).thenReturn(customShoppingListItem1); + Exception thrown2 = assertThrows(BadRequestException.class, + () -> customShoppingListItemService.updateItemStatus(12L, 2L, "NOTDONE")); + assertEquals(thrown2.getMessage(), ErrorMessage.INCORRECT_INPUT_ITEM_STATUS); } @Test

['service/src/test/java/greencity/service/CustomShoppingListItemServiceImplTest.java', 'service/src/main/java/greencity/service/CustomShoppingListItemServiceImpl.java', 'service-api/src/main/java/greencity/constant/ErrorMessage.java', 'core/src/main/java/greencity/controller/CustomShoppingListItemController.java']

{'.java': 4}

Java

{'Java': 2701205, 'HTML': 429257, 'JavaScript': 135338, 'CSS': 59705, 'PLpgSQL': 5721, 'Go': 2336, 'Dockerfile': 111, 'Procfile': 110}

MIT License

ita-social-projects/greencity/4717/4667

ita-social-projects

greencity

https://github.com/ita-social-projects/GreenCity/issues/4667

https://github.com/ita-social-projects/GreenCity/pull/4717

https://github.com/ita-social-projects/GreenCity/pull/4717

fixed

[API][Add a comment]Adding a comment to an existing event

**Environment:** All. **Reproducible:** always. **Build found:** 23.10.2022 **Preconditions** 1.Open Postman. 2.The user is authorised. 3.Event added **Steps to reproduce** 1. Apply the POST method by using request URL https://greencity.testgreencity.ga/events/comments/{eventId} 2.Fill the request "body"e.g. { "text": "string" } 3. Perform the request. **Actual result** Status Code : 500 Internal Server Error **Expected result** Status Code : 201 Created "body" is : { "text": "string" } **User story and test case links** "User story #3208" **Labels to be added** "Bug", Priority ("Medium"), Severity ("Medium"), Type ("Functional"), "API" (for back-end bugs).

189891be7af9b3055f84c1ad6bcdb30f7144b1da

f01fc0d0d6c6fc2ca8de4797b2a3b83dcb8b2526

https://github.com/ita-social-projects/greencity/compare/189891be7af9b3055f84c1ad6bcdb30f7144b1da...f01fc0d0d6c6fc2ca8de4797b2a3b83dcb8b2526

diff --git a/core/src/main/java/greencity/controller/EventCommentController.java b/core/src/main/java/greencity/controller/EventCommentController.java index 966639acd..f35963543 100644 --- a/core/src/main/java/greencity/controller/EventCommentController.java +++ b/core/src/main/java/greencity/controller/EventCommentController.java @@ -47,7 +47,7 @@ public class EventCommentController { @ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED), @ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND), }) - @PostMapping("{eventId}") + @PostMapping("/{eventId}") public ResponseEntity<AddEventCommentDtoResponse> save(@PathVariable Long eventId, @Valid @RequestBody AddEventCommentDtoRequest request, @ApiIgnore @CurrentUser UserVO user) { diff --git a/service-api/src/main/java/greencity/client/RestClient.java b/service-api/src/main/java/greencity/client/RestClient.java index ff0236948..a8f0850b4 100644 --- a/service-api/src/main/java/greencity/client/RestClient.java +++ b/service-api/src/main/java/greencity/client/RestClient.java @@ -379,7 +379,7 @@ public class RestClient { * @author Inna Yashna */ public void sendNewEventComment(EventCommentForSendEmailDto message) { - HttpHeaders headers = new HttpHeaders(); + HttpHeaders headers = setHeader(); headers.setContentType(MediaType.APPLICATION_JSON); HttpEntity<EventCommentForSendEmailDto> entity = new HttpEntity<>(message, headers); restTemplate.exchange(greenCityUserServerAddress diff --git a/service-api/src/test/java/greencity/client/RestClientTest.java b/service-api/src/test/java/greencity/client/RestClientTest.java index 4f2ced9b2..1b553944a 100644 --- a/service-api/src/test/java/greencity/client/RestClientTest.java +++ b/service-api/src/test/java/greencity/client/RestClientTest.java @@ -337,8 +337,11 @@ class RestClientTest { void sendNewEventComment() { EventCommentForSendEmailDto message = ModelUtils.getEventCommentForSendEmailDto(); HttpHeaders httpHeaders = new HttpHeaders(); + String accessToken = "accessToken"; httpHeaders.setContentType(MediaType.APPLICATION_JSON); + httpHeaders.set(AUTHORIZATION, accessToken); HttpEntity<EventCommentForSendEmailDto> entity = new HttpEntity<>(message, httpHeaders); + when(httpServletRequest.getHeader(AUTHORIZATION)).thenReturn(accessToken); when(restTemplate.exchange(greenCityUserServerAddress + RestTemplateLinks.ADD_EVENT_COMMENT, HttpMethod.POST, entity, Object.class)) .thenReturn(ResponseEntity.ok(Object)); diff --git a/service/src/main/java/greencity/service/EventCommentServiceImpl.java b/service/src/main/java/greencity/service/EventCommentServiceImpl.java index 8bb8a050c..207fdb17e 100644 --- a/service/src/main/java/greencity/service/EventCommentServiceImpl.java +++ b/service/src/main/java/greencity/service/EventCommentServiceImpl.java @@ -5,10 +5,7 @@ import greencity.constant.ErrorMessage; import greencity.dto.PageableDto; import greencity.dto.event.EventAuthorDto; import greencity.dto.event.EventVO; -import greencity.dto.eventcomment.AddEventCommentDtoRequest; -import greencity.dto.eventcomment.AddEventCommentDtoResponse; -import greencity.dto.eventcomment.EventCommentDto; -import greencity.dto.eventcomment.EventCommentForSendEmailDto; +import greencity.dto.eventcomment.*; import greencity.dto.user.UserVO; import greencity.entity.User; import greencity.entity.event.Event; @@ -58,6 +55,7 @@ public class EventCommentServiceImpl implements EventCommentService { eventComment.setEvent(modelMapper.map(eventVO, Event.class)); AddEventCommentDtoResponse addEventCommentDtoResponse = modelMapper.map( eventCommentRepo.save(eventComment), AddEventCommentDtoResponse.class); + addEventCommentDtoResponse.setAuthor(modelMapper.map(userVO, EventCommentAuthorDto.class)); sendEmailDto(addEventCommentDtoResponse); return addEventCommentDtoResponse; } diff --git a/service/src/test/java/greencity/service/EventCommentServiceImplTest.java b/service/src/test/java/greencity/service/EventCommentServiceImplTest.java index 673a69259..b81d83988 100644 --- a/service/src/test/java/greencity/service/EventCommentServiceImplTest.java +++ b/service/src/test/java/greencity/service/EventCommentServiceImplTest.java @@ -8,6 +8,7 @@ import greencity.dto.event.EventAuthorDto; import greencity.dto.event.EventVO; import greencity.dto.eventcomment.AddEventCommentDtoRequest; import greencity.dto.eventcomment.AddEventCommentDtoResponse; +import greencity.dto.eventcomment.EventCommentAuthorDto; import greencity.dto.eventcomment.EventCommentDto; import greencity.dto.user.UserVO; import greencity.entity.User; @@ -68,10 +69,12 @@ class EventCommentServiceImplTest { AddEventCommentDtoRequest addEventCommentDtoRequest = ModelUtils.getAddEventCommentDtoRequest(); EventComment eventComment = ModelUtils.getEventComment(); EventAuthorDto eventAuthorDto = ModelUtils.getEventAuthorDto(); + EventCommentAuthorDto eventCommentAuthorDto = ModelUtils.getEventCommentAuthorDto(); when(eventService.findById(anyLong())).thenReturn(eventVO); when(eventCommentRepo.save(any(EventComment.class))).then(AdditionalAnswers.returnsFirstArg()); when(eventCommentRepo.findById(anyLong())).thenReturn(Optional.of(eventComment)); + when(modelMapper.map(userVO, EventCommentAuthorDto.class)).thenReturn(eventCommentAuthorDto); when(modelMapper.map(user, EventAuthorDto.class)).thenReturn(eventAuthorDto); when(modelMapper.map(userVO, User.class)).thenReturn(user); when(modelMapper.map(eventVO, Event.class)).thenReturn(event);

['service-api/src/main/java/greencity/client/RestClient.java', 'service/src/test/java/greencity/service/EventCommentServiceImplTest.java', 'service-api/src/test/java/greencity/client/RestClientTest.java', 'core/src/main/java/greencity/controller/EventCommentController.java', 'service/src/main/java/greencity/service/EventCommentServiceImpl.java']

{'.java': 5}

Java

{'Java': 2701205, 'HTML': 429257, 'JavaScript': 135338, 'CSS': 59705, 'PLpgSQL': 5721, 'Go': 2336, 'Dockerfile': 111, 'Procfile': 110}

MIT License

ably/ably-java/914/913

ably

ably-java

https://github.com/ably/ably-java/issues/913

https://github.com/ably/ably-java/pull/914

https://github.com/ably/ably-java/pull/914

fixes

Released channel re-added to the channel map after DETACHED message

If you call channels.release(), that removes the channel from the channel map and detaches it. However, the protocol messaged for DETACHED returning to us re-adds the channel to the channel map (via a call to channels.get()), therefore undoing the release action. One way to fix this would be to not re-add the channel when processing DETACHED if its not there.

94ecb6fada26982aaa698f3291f150f344eb2cd4

42d89759da3fd4b91d9069df3c49609b890afa2c

https://github.com/ably/ably-java/compare/94ecb6fada26982aaa698f3291f150f344eb2cd4...42d89759da3fd4b91d9069df3c49609b890afa2c

diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java index 666521af..ffb33d42 100644 --- a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java +++ b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java @@ -217,8 +217,12 @@ public class AblyRealtime extends AblyRest { @Override public void onMessage(ProtocolMessage msg) { String channelName = msg.channel; - Channel channel; - synchronized(this) { channel = channels.get(channelName); } + Channel channel = null; + synchronized(this) { + if (channels.containsKey(channelName)) { + channel = channels.get(channelName); + } + } if(channel == null) { Log.e(TAG, "Received channel message for non-existent channel"); return; diff --git a/lib/src/test/java/io/ably/lib/test/common/Helpers.java b/lib/src/test/java/io/ably/lib/test/common/Helpers.java index bc6cc8fe..2dce9b10 100644 --- a/lib/src/test/java/io/ably/lib/test/common/Helpers.java +++ b/lib/src/test/java/io/ably/lib/test/common/Helpers.java @@ -632,24 +632,56 @@ public class Helpers { * Wait for a given number of messages */ public void waitForRecv() { - waitForRecv(1); + waitForRecv(1, 6000000); } public void waitForSend() { - waitForSend(1); + waitForSend(1, 6000000); + } + public void waitForRecv(int count) { + waitForRecv(count, 6000000); + } + public void waitForSend(int count) { + waitForSend(count, 6000000); } /** * Wait for a given number of messages * @param count */ - public synchronized void waitForRecv(int count) { + public synchronized void waitForRecv(int count, long timeoutInMillis) { + long timeoutAt = System.currentTimeMillis() + timeoutInMillis; while(receivedMessages.size() < count) { - try { wait(); } catch(InterruptedException e) {} + synchronized (this) { + try { + if (System.currentTimeMillis() > timeoutAt || receivedMessages.size() >= count) { + break; + } + + wait(); + } catch(InterruptedException e) {} + } + } + + if (receivedMessages.size() < count) { + throw new AssertionError("Did not receive expected number of messages"); } } - public synchronized void waitForSend(int count) { + public synchronized void waitForSend(int count, long timeoutInMillis) { + long timeoutAt = System.currentTimeMillis() + timeoutInMillis; while(sentMessages.size() < count) { - try { wait(); } catch(InterruptedException e) {} + synchronized (this) { + try { + if (System.currentTimeMillis() > timeoutAt || sentMessages.size() >= count) { + break; + } + + wait(); + } catch(InterruptedException e) {} + } + } + + if (sentMessages.size() < count) { + throw new AssertionError("Did not send expected number of messages"); } } diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java index b7391033..46ddaaac 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java @@ -2007,6 +2007,41 @@ public class RealtimeChannelTest extends ParameterizedTest { } } + /* + * Checks that the DETACHED message sent by the server when a channel is released is dropped. + */ + @Test + public void detach_message_to_released_channel_is_dropped() throws AblyException { + AblyRealtime ably = null; + long oldRealtimeTimeout = Defaults.realtimeRequestTimeout; + final String channelName = "detach_message_to_released_channel_is_dropped"; + + try { + DebugOptions opts = createOptions(testVars.keys[0].keyStr); + Helpers.RawProtocolMonitor monitor = Helpers.RawProtocolMonitor.createReceiver(ProtocolMessage.Action.detached); + opts.protocolListener = monitor; + + /* Make test faster */ + Defaults.realtimeRequestTimeout = 1000; + opts.channelRetryTimeout = 1000; + + ably = new AblyRealtime(opts); + Channel channel = ably.channels.get(channelName); + channel.attach(); + (new ChannelWaiter(channel)).waitFor(ChannelState.attached); + + // Listen for detach messages and release the channel + ably.channels.release(channelName); + monitor.waitForRecv(1, 10000); + + assertFalse(ably.channels.containsKey("messages_to_non_existent_channels_are_dropped")); + } finally { + if (ably != null) + ably.close(); + Defaults.realtimeRequestTimeout = oldRealtimeTimeout; + } + } + class DetachingProtocolListener implements DebugOptions.RawProtocolListener { public Channel theChannel;

['lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java', 'lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java', 'lib/src/test/java/io/ably/lib/test/common/Helpers.java']

{'.java': 3}

Java

{'Java': 2119819, 'Shell': 2346, 'HTML': 1161, 'Groovy': 753, 'JavaScript': 178}

Apache License 2.0

ably/ably-java/927/926

ably

ably-java

https://github.com/ably/ably-java/issues/926

https://github.com/ably/ably-java/pull/927

https://github.com/ably/ably-java/pull/927

fixes

equals() for TokenDetails is broken

Following is how `equals` has been implemented for `TokenDetails` ``` @Override public boolean equals(Object obj) { TokenDetails details = (TokenDetails)obj; return equalNullableStrings(this.token, details.token) & equalNullableStrings(this.capability, details.capability) & equalNullableStrings(this.clientId, details.clientId) & (this.issued == details.issued) & (this.expires == details.expires); } ``` This implementation doesn't take into account when obj is null or not the type of token details. **Expected** Return false when obj is null or a different type Spotted: Flutter plugin Stream writer does this check when writing types to streams ``` protected void writeValue(@NonNull ByteArrayOutputStream stream, @Nullable Object value) { if (value == null || value.equals(null)) { stream.write(NULL); ```

99a4ca601093e5a25fe017cccd152aa9bbe405e7

565aed9d39b94e7f7f789b30ec471e10cfbba77f

https://github.com/ably/ably-java/compare/99a4ca601093e5a25fe017cccd152aa9bbe405e7...565aed9d39b94e7f7f789b30ec471e10cfbba77f

diff --git a/lib/src/main/java/io/ably/lib/rest/Auth.java b/lib/src/main/java/io/ably/lib/rest/Auth.java index e1c068b6..dc3fa9fc 100644 --- a/lib/src/main/java/io/ably/lib/rest/Auth.java +++ b/lib/src/main/java/io/ably/lib/rest/Auth.java @@ -6,6 +6,7 @@ import java.security.GeneralSecurityException; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Objects; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -358,6 +359,8 @@ public class Auth { */ @Override public boolean equals(Object obj) { + if (!(obj instanceof TokenDetails)) return false; + TokenDetails details = (TokenDetails)obj; return equalNullableStrings(this.token, details.token) & equalNullableStrings(this.capability, details.capability) & @@ -366,7 +369,12 @@ public class Auth { (this.expires == details.expires); } -} + @Override + public int hashCode() { + return Objects.hash(token, capability, clientId, issued, expires); + } + + } /** * Defines the properties of an Ably Token.

['lib/src/main/java/io/ably/lib/rest/Auth.java']

{'.java': 1}

Java

{'Java': 2119819, 'Shell': 2346, 'HTML': 1161, 'Groovy': 753, 'JavaScript': 178}

Apache License 2.0

marklogic/java-client-api/869/867

marklogic

java-client-api

https://github.com/marklogic/java-client-api/issues/867

https://github.com/marklogic/java-client-api/pull/869

https://github.com/marklogic/java-client-api/pull/869

fix

rowRecord.getString("firstName") returns ...OkHttpServices$OkHttpServiceResult@4dd663d5

Where I expected to get the value of the firstName column extracted by xpath, I'm getting an OkHttpServiceResult object, which has an undesirable toString. Notice the "firstName: com.marklogic.client.impl.OkHttpServices$OkHttpServiceResult@1b2283a" in the output below. Can you help me see what I'm doing wrong? With the following Java: ``` import com.fasterxml.jackson.core.JsonParser.Feature; import com.fasterxml.jackson.databind.ObjectMapper; import com.marklogic.client.DatabaseClient; import com.marklogic.client.DatabaseClientFactory; import com.marklogic.client.DatabaseClientFactory.DigestAuthContext; import com.marklogic.client.document.DocumentManager; import com.marklogic.client.expression.PlanBuilder; import com.marklogic.client.expression.PlanBuilder.Plan; import com.marklogic.client.io.DocumentMetadataHandle; import com.marklogic.client.row.RowManager; import com.marklogic.client.row.RowRecord; import com.marklogic.client.type.CtsReferenceExpr; import com.marklogic.client.type.PlanExprCol; import java.util.HashMap; public class Optic2 { public static void main(String[] args) throws Exception { DatabaseClient client = DatabaseClientFactory.newClient("engrlab-129-192.engrlab.marklogic.com", 8000, new DigestAuthContext("admin", "admin")); DocumentManager docMgr = client.newDocumentManager(); ObjectMapper mapper = new ObjectMapper() .configure(Feature.ALLOW_SINGLE_QUOTES, true); docMgr.writeAs("/optic/test/musician1.json", mapper.readTree( "{'musician':{" + " 'lastName':'Armstrong', 'firstName':'Louis', 'dob':'1901-08-04', 'instrument':['trumpet', 'vocal']" + "}}")); docMgr.writeAs("/optic/test/musician2.json", mapper.readTree( "{'musician':{" + " 'lastName':'Byron', 'firstName':'Don', 'dob':'1958-11-08', 'instrument':['clarinet', 'saxophone']" + "}}")); docMgr.writeAs("/optic/test/musician3.json", mapper.readTree( "{'musician':{" + " 'lastName':'Coltrane', 'firstName':'John', 'dob':'1926-09-23', 'instrument':['saxophone']" + "}}")); docMgr.writeAs("/optic/test/musician4.json", mapper.readTree( "{'musician':{" + " 'lastName':'Davis', 'firstName':'Miles', 'dob':'1926-05-26', 'instrument':['trumpet']" + "}}")); RowManager rowMgr = client.newRowManager(); PlanBuilder p = rowMgr.newPlanBuilder(); HashMap<String,CtsReferenceExpr> uriLexicon = new HashMap<String,CtsReferenceExpr>(); uriLexicon.put("uri", p.cts.uriReference()); String[] uris = new String[] {"/optic/test/musician1.json", "/optic/test/musician2.json", "/optic/test/musician3.json" }; PlanExprCol[] columns = new PlanExprCol[] {p.as("firstName", p.xpath("doc", "/musician/firstName"))}; Plan plan = p.fromLexicons(uriLexicon) .where(p.cts.documentQuery(p.xs.stringSeq(uris))) .joinDoc(p.col("doc"), p.col("uri")) .select(columns); for (RowRecord row: rowMgr.resultRows(plan)) { System.out.println("firstName: " + row.getString("firstName") + ", uri: " + row.getString("uri")); } } } ``` I get the following output: ``` 09:34:41.599 [main] DEBUG c.m.client.impl.OkHttpServices - Connecting to engrlab-129-192.engrlab.marklogic.com at 8000 as admin 09:34:45.563 [main] INFO c.m.client.impl.DocumentManagerImpl - Writing content for /optic/test/musician1.json 09:34:45.575 [main] DEBUG c.m.client.impl.OkHttpServices - Sending /optic/test/musician1.json document in transaction null 09:34:46.059 [main] INFO c.m.client.impl.DocumentManagerImpl - Writing content for /optic/test/musician2.json 09:34:46.059 [main] DEBUG c.m.client.impl.OkHttpServices - Sending /optic/test/musician2.json document in transaction null 09:34:46.207 [main] INFO c.m.client.impl.DocumentManagerImpl - Writing content for /optic/test/musician3.json 09:34:46.207 [main] DEBUG c.m.client.impl.OkHttpServices - Sending /optic/test/musician3.json document in transaction null 09:34:46.350 [main] INFO c.m.client.impl.DocumentManagerImpl - Writing content for /optic/test/musician4.json 09:34:46.351 [main] DEBUG c.m.client.impl.OkHttpServices - Sending /optic/test/musician4.json document in transaction null 09:34:47.150 [main] DEBUG c.m.client.impl.OkHttpServices - Posting rows firstName: com.marklogic.client.impl.OkHttpServices$OkHttpServiceResult@1b2283a, uri: /optic/test/musician1.json firstName: com.marklogic.client.impl.OkHttpServices$OkHttpServiceResult@a637e7, uri: /optic/test/musician2.json firstName: com.marklogic.client.impl.OkHttpServices$OkHttpServiceResult@1e7aac8, uri: /optic/test/musician3.json ``` And the following HTTP wire trace for the optic query: ``` POST /v1/rows?output=object&column-types=rows&node-columns=reference&row-format=json HTTP/1.1 ML-Agent-ID: java Accept: multipart/mixed; boundary=60571458-ff42-4838-8518-8daf9382c4e5 Authorization: Digest username="admin", realm="public", nonce="35c963f0f9cc36:giWRHfuTfU3ag/QKF6Z3eA==", uri="/v1/rows?output=object&column-types=rows&node-columns=reference&row-format=json", response="649bf6fd6f0155494696de6d47b2b32a", qop=auth, nc=00000005, cnonce="5456ce49757347d8", algorithm=MD5, opaque="760201d04a9987db" Content-Type: application/json Transfer-Encoding: chunked Host: engrlab-129-192.engrlab.marklogic.com:8000 Connection: Keep-Alive Accept-Encoding: gzip User-Agent: okhttp/3.9.0 40c {"$optic":{"ns":"op", "fn":"operators", "args":[{"ns":"op", "fn":"from-lexicons", "args":[{"uri":{"ns":"cts", "fn":"uri-reference", "args":[]}}]}, {"ns":"op", "fn":"where", "args":[{"ns":"cts", "fn":"document-query", "args":[[{"ns":"xs", "fn":"string", "args":["/optic/test/musician1.json"]}, {"ns":"xs", "fn":"string", "args":["/optic/test/musician2.json"]}, {"ns":"xs", "fn":"string", "args":["/optic/test/musician3.json"]}]]}]}, {"ns":"op", "fn":"join-doc", "args":[{"ns":"op", "fn":"col", "args":[{"ns":"xs", "fn":"string", "args":["doc"]}]}, {"ns":"op", "fn":"col", "args":[{"ns":"xs", "fn":"string", "args":["uri"]}]}]}, {"ns":"op", "fn":"select", "args":[[{"ns":"op", "fn":"col", "args":[{"ns":"xs", "fn":"string", "args":["uri"]}]}, {"ns":"op", "fn":"as", "args":[{"ns":"op", "fn":"col", "args":[{"ns":"xs", "fn":"string", "args":["firstName"]}]}, {"ns":"op", "fn":"xpath", "args":[{"ns":"op", "fn":"col", "args":[{"ns":"xs", "fn":"string", "args":["doc"]}]}, {"ns":"xs", "fn":"string", "args":["/musician/firstName"]}]}]}]]}]}} 0 HTTP/1.1 200 OK ML-Effective-Timestamp: 15139604854019900 Content-type: multipart/mixed; boundary=60571458-ff42-4838-8518-8daf9382c4e5 Server: MarkLogic Content-Length: 1473 Connection: Keep-Alive Keep-Alive: timeout=5 --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: application/json; charset=utf-8 Content-Disposition: inline; kind=columns {"columns":[{"name":"uri"},{"name":"firstName"}]} --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: application/json; charset=utf-8 Content-Disposition: inline; kind=row {"uri":{"type":"xs:string","value":"/optic/test/musician1.json"},"firstName":{"type":"cid","value":"cid:firstName[0]"}} --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: text/plain; charset=utf-8 Content-ID: <firstName[0]> Content-Disposition: inline; kind=row-attachment Louis --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: application/json; charset=utf-8 Content-Disposition: inline; kind=row {"uri":{"type":"xs:string","value":"/optic/test/musician2.json"},"firstName":{"type":"cid","value":"cid:firstName[1]"}} --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: text/plain; charset=utf-8 Content-ID: <firstName[1]> Content-Disposition: inline; kind=row-attachment Don --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: application/json; charset=utf-8 Content-Disposition: inline; kind=row {"uri":{"type":"xs:string","value":"/optic/test/musician3.json"},"firstName":{"type":"cid","value":"cid:firstName[2]"}} --60571458-ff42-4838-8518-8daf9382c4e5 Content-Type: text/plain; charset=utf-8 Content-ID: <firstName[2]> Content-Disposition: inline; kind=row-attachment John --60571458-ff42-4838-8518-8daf9382c4e5-- ```

1a1bec5be196f44ca587eaaac81ca47ac37592db

73f9710113ea8a55899a11f8a1ac50d9f3de84d8

https://github.com/marklogic/java-client-api/compare/1a1bec5be196f44ca587eaaac81ca47ac37592db...73f9710113ea8a55899a11f8a1ac50d9f3de84d8

diff --git a/src/main/java/com/marklogic/client/impl/RowManagerImpl.java b/src/main/java/com/marklogic/client/impl/RowManagerImpl.java index 4b81e3ee8..f2fd3f4b2 100644 --- a/src/main/java/com/marklogic/client/impl/RowManagerImpl.java +++ b/src/main/java/com/marklogic/client/impl/RowManagerImpl.java @@ -50,6 +50,7 @@ import com.marklogic.client.impl.RESTServices.RESTServiceResultIterator; import com.marklogic.client.io.BaseHandle; import com.marklogic.client.io.Format; import com.marklogic.client.io.InputStreamHandle; +import com.marklogic.client.io.StringHandle; import com.marklogic.client.io.XMLStreamReaderHandle; import com.marklogic.client.io.marker.AbstractReadHandle; import com.marklogic.client.io.marker.AbstractWriteHandle; @@ -1094,7 +1095,11 @@ public class RowManagerImpl } @Override public String getString(String columnName) { - return asString(get(columnName)); + try { + return asString(get(columnName)); + } catch(NodeNotAStringException e) { + throw new IllegalArgumentException("value for column \\""+columnName+"\\" not a string"); + } } private boolean asBoolean(String columnName, Object value) { @@ -1139,10 +1144,22 @@ public class RowManagerImpl } throw new IllegalStateException("column "+columnName+" does not have a short value"); } - private String asString(Object value) { + /** + * @throws NodeNotAStringException when the value is a node but not a single text node + * (with content-type "text/plain") + */ + private String asString(Object value) throws NodeNotAStringException { if (value == null || value instanceof String) { return (String) value; } + if (value instanceof RESTServiceResult) { + RESTServiceResult result = (RESTServiceResult) value; + if ( result.getMimetype() != null && result.getMimetype().startsWith("text/plain") ) { + return result.getContent(new StringHandle()).get(); + } else { + throw new NodeNotAStringException(); + } + } return value.toString(); } @@ -1176,27 +1193,27 @@ public class RowManagerImpl } */ - String valueStr = asString(value); + try { + String valueStr = asString(value); - Function<String,? extends XsAnyAtomicTypeVal> factory = getFactory(as); - if (factory != null) { - return as.cast(factory.apply(valueStr)); - } + Function<String,? extends XsAnyAtomicTypeVal> factory = getFactory(as); + if (factory != null) { + return as.cast(factory.apply(valueStr)); + } - // fallback - @SuppressWarnings("unchecked") - Constructor<T> constructor = (Constructor<T>) constructors.get(as); - if (constructor == null) { - try { + // fallback + @SuppressWarnings("unchecked") + Constructor<T> constructor = (Constructor<T>) constructors.get(as); + if (constructor == null) { constructor = as.getConstructor(String.class); - } catch(NoSuchMethodException e) { - throw new IllegalArgumentException("cannot construct "+columnName+" value as class: "+as.getName()); + constructors.put(as, constructor); } - constructors.put(as, constructor); - } - try { return constructor.newInstance(valueStr); + } catch(NodeNotAStringException e) { + throw new IllegalArgumentException("column \\""+columnName+"\\" is a node, not an atomic"); + } catch(NoSuchMethodException e) { + throw new IllegalArgumentException("cannot construct "+columnName+" value as class: "+as.getName()); } catch (InstantiationException e) { throw new MarkLogicBindingException("could not construct value as class: "+as.getName(), e); } catch (IllegalAccessException e) { @@ -1532,4 +1549,7 @@ public class RowManagerImpl return this; } } + + private static class NodeNotAStringException extends Exception { + } } diff --git a/src/test/java/com/marklogic/client/test/RowManagerTest.java b/src/test/java/com/marklogic/client/test/RowManagerTest.java index f23f362ea..bc3ba2f02 100644 --- a/src/test/java/com/marklogic/client/test/RowManagerTest.java +++ b/src/test/java/com/marklogic/client/test/RowManagerTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.LineNumberReader; @@ -451,15 +452,25 @@ public class RowManagerTest { String[] firstName = {"Louis", "Miles"}; int rowNum = 0; + boolean didARowFail = false; for (RowRecord row: rowMgr.resultRows(builtPlan)) { assertEquals("unexpected lastName value in row record "+rowNum, lastName[rowNum], row.getString("lastName")); assertEquals("unexpected firstName value in row record "+rowNum, firstName[rowNum], row.getString("firstName")); - String instruments = row.getContent("instruments", new StringHandle()).get(); + String instruments; + try { + instruments = row.getString("instruments"); + } catch (IllegalArgumentException e ) { + didARowFail = true; + instruments = row.getContentAs("instruments", String.class); + } assertNotNull("null instrucments value in row record "+rowNum, instruments); assertTrue("unexpected instrucments value in row record "+rowNum, instruments.contains("trumpet")); rowNum++; } + if ( didARowFail == false ) { + fail("getString(\\"instruments\\") should throw an exception since some rows return an array"); + } assertEquals("unexpected count of result records", 2, rowNum); } @Test

['src/main/java/com/marklogic/client/impl/RowManagerImpl.java', 'src/test/java/com/marklogic/client/test/RowManagerTest.java']

{'.java': 2}

Java

{'Java': 10343403, 'Kotlin': 164515, 'JavaScript': 67526, 'XQuery': 59700, 'XSLT': 13897, 'Shell': 1820, 'HTML': 374}

Apache License 2.0

marklogic/java-client-api/289/249

marklogic

java-client-api

https://github.com/marklogic/java-client-api/issues/249

https://github.com/marklogic/java-client-api/pull/289

https://github.com/marklogic/java-client-api/pull/289

fixes

DocumentPatchBuilder.replaceValue cannot replace boolean values

This is probably actually a bug in the REST API but I found it in Java. ``` patchBuilder.replaceValue("/accepted", true); patchBuilder.replaceValue("/accepted", new Boolean(true)); ``` Both of these insert a string value into the JSON property rather than a boolean. A workaround is to use replaceFragment patchBuilder.replaceFragment("/accepted", true) but this is a hackish workaround -- it works because the string "true", unquoted, evaluates to a boolean in constructing the patch.

5304c8dfa86ef8053377c0dcd74fbb932dee04c8

2faead09a11cb2b8c35bd6e22797e1f33354d559

https://github.com/marklogic/java-client-api/compare/5304c8dfa86ef8053377c0dcd74fbb932dee04c8...2faead09a11cb2b8c35bd6e22797e1f33354d559

diff --git a/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java b/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java index 37748044c..3c25a176a 100644 --- a/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java +++ b/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java @@ -86,7 +86,8 @@ implements DocumentPatchBuilder String selectPath; Cardinality cardinality; boolean isFragment = true; - String input; + Object input; + String inputAsString; ContentReplaceOperation(String selectPath, Cardinality cardinality, boolean isFragment, Object input ) { @@ -94,15 +95,23 @@ implements DocumentPatchBuilder this.selectPath = selectPath; this.cardinality = cardinality; this.isFragment = isFragment; - this.input = (input instanceof String) ? - (String) input : input.toString(); + this.input = input; + this.inputAsString = null; + if (input != null) { + inputAsString = (input instanceof String) ? (String) input : input.toString(); + } } @Override public void write(JSONStringWriter serializer) { writeStartReplace(serializer, selectPath, cardinality); serializer.writeStartEntry("content"); if (isFragment) { - serializer.writeFragment(input); + serializer.writeFragment(inputAsString); + } else if (input instanceof Boolean) { + serializer.writeBooleanValue(input); + } + else if (input instanceof Number) { + serializer.writeNumberValue(input); } else { serializer.writeStringValue(input); } @@ -115,9 +124,9 @@ implements DocumentPatchBuilder writeStartReplace(out, selectPath, cardinality); if (isFragment) { serializer.writeCharacters(""); // force the tag close - out.getWriter().write(input); + out.getWriter().write(inputAsString); } else { - serializer.writeCharacters(input); + serializer.writeCharacters(inputAsString); } serializer.writeEndElement(); } diff --git a/src/main/java/com/marklogic/client/impl/JSONStringWriter.java b/src/main/java/com/marklogic/client/impl/JSONStringWriter.java index 49913a66b..4af11a02a 100644 --- a/src/main/java/com/marklogic/client/impl/JSONStringWriter.java +++ b/src/main/java/com/marklogic/client/impl/JSONStringWriter.java @@ -153,4 +153,5 @@ public class JSONStringWriter { return out.toString(); } + } diff --git a/src/test/java/com/marklogic/client/test/JSONDocumentTest.java b/src/test/java/com/marklogic/client/test/JSONDocumentTest.java index 80967104e..fe43c5e7e 100644 --- a/src/test/java/com/marklogic/client/test/JSONDocumentTest.java +++ b/src/test/java/com/marklogic/client/test/JSONDocumentTest.java @@ -35,6 +35,7 @@ import org.xml.sax.SAXException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.BooleanNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.marklogic.client.document.DocumentManager.Metadata; import com.marklogic.client.document.DocumentMetadataPatchBuilder.Cardinality; @@ -153,6 +154,9 @@ public class JSONDocumentTest { fragment = mapper.writeValueAsString(fragmentNode); patchBldr.insertFragment("$.[\\"arrayKey\\"]", Position.LAST_CHILD, Cardinality.ZERO_OR_ONE, fragment); + patchBldr.replaceValue("$.booleanKey", true); + patchBldr.replaceValue("$.numberKey2", 2); + patchBldr.replaceValue("$.nullKey", null); DocumentPatchHandle patchHandle = patchBldr.pathLanguage( PathLanguage.JSONPATH).build(); @@ -179,6 +183,10 @@ public class JSONDocumentTest { childNode.put("appendedKey", "appended item"); childArray.add(childNode); expectedNode.set("arrayKey", childArray); + expectedNode.put("booleanKey", true); + expectedNode.put("numberKey2", 2); + expectedNode.putNull("nullKey"); + String docText = docMgr.read(docId, new StringHandle()).get(); assertNotNull("Read null string for patched JSON content", docText); @@ -272,6 +280,9 @@ public class JSONDocumentTest { fragment = mapper.writeValueAsString(fragmentNode); patchBldr.insertFragment("/array-node('arrayKey')", Position.BEFORE, fragment); + patchBldr.replaceValue("/booleanKey", true); + patchBldr.replaceValue("/numberKey2", 2); + patchBldr.replaceValue("/nullKey", null); //patchBldr.replaceApply("/node()/arrayKey/node()[string(.) eq '3']", // patchBldr.call().add(2)); @@ -306,18 +317,19 @@ public class JSONDocumentTest { childNode.put("appendedKey", "appended item"); childArray.add(childNode); expectedNode.set("arrayKey", childArray); + expectedNode.put("booleanKey", true); + expectedNode.put("numberKey2", 2); + expectedNode.putNull("nullKey"); String docText = docMgr.read(docId, new StringHandle()).get(); - + assertNotNull("Read null string for patched JSON content", docText); JsonNode readNode = mapper.readTree(docText); - logger.debug("Before3:" + content); logger.debug("After3:"+docText); logger.debug("Expected3:" + mapper.writeValueAsString(expectedNode)); - - + assertTrue("Patched JSON document without expected result", expectedNode.equals(readNode)); @@ -400,6 +412,9 @@ public class JSONDocumentTest { childNode.put("itemObjectKey", "item object value"); childArray.add(childNode); sourceNode.set("arrayKey", childArray); + sourceNode.put("booleanKey", false); + sourceNode.put("numberKey2", 1); + sourceNode.put("nullKey", 0); return sourceNode; }

['src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java', 'src/main/java/com/marklogic/client/impl/JSONStringWriter.java', 'src/test/java/com/marklogic/client/test/JSONDocumentTest.java']

{'.java': 3}

Java

{'Java': 10343403, 'Kotlin': 164515, 'JavaScript': 67526, 'XQuery': 59700, 'XSLT': 13897, 'Shell': 1820, 'HTML': 374}

Apache License 2.0

ably/ably-java/900/474

ably

ably-java

https://github.com/ably/ably-java/issues/474

https://github.com/ably/ably-java/pull/900

https://github.com/ably/ably-java/pull/900

closes

Lib is not re-sending pending messages on new transport after a resume

Log posted by a customer [here](https://ably-real-time.slack.com/archives/C030C5YLY/p1558623828295800) (cf [conversation](https://app.intercom.io/a/apps/ua39m1ld/inbox/inbox/all/conversations/22156922233)) shows several issues: 1. At one point it disconnects the transport for inactivity at 14:29:08.086Z, 16s after getting a detached from realtime at 14:28:52.151. That shouldn't happen. 1. After it reconnects and resumes, it does not seem to be re-sending messages on the new transport that were pending on the previous transport, as required by RTN15f 1. Related to the previous one: messages called back with a failure due to getting an ack for a higher msgSerial than the pending queue are called back with "Unknown error / 50000 / 500", which could be more informative ┆Issue is synchronized with this [Jira Bug](https://ably.atlassian.net/browse/SDK-430) by [Unito](https://www.unito.io)

63aa2a9784a4eec2b536884a74982dd568ead4bc

07ad898dcfc733fb0cc2a0fc6c9ca56aec93eed3

https://github.com/ably/ably-java/compare/63aa2a9784a4eec2b536884a74982dd568ead4bc...07ad898dcfc733fb0cc2a0fc6c9ca56aec93eed3

diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java index fc441118..4a1f9b02 100644 --- a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java +++ b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java @@ -231,6 +231,20 @@ public class AblyRealtime extends AblyRest { } } + /** + * By spec RTN15c3 + */ + @Override + public void reattachOnResumeFailure() { + for (Map.Entry<String, Channel> channelEntry : map.entrySet()) { + Channel channel = channelEntry.getValue(); + if (channel.state == ChannelState.attaching || channel.state == ChannelState.attached || channel.state == ChannelState.suspended) { + Log.d(TAG, "reAttach(); channel = " + channel.name); + channel.attach(true, null); + } + } + } + private void clear() { map.clear(); } diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java index c36cfabf..9c26cb3b 100644 --- a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java +++ b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java @@ -181,7 +181,7 @@ public abstract class ChannelBase extends EventEmitter<ChannelEvent, ChannelStat this.attach(false, listener); } - private void attach(boolean forceReattach, CompletionListener listener) { + void attach(boolean forceReattach, CompletionListener listener) { clearAttachTimers(); attachWithTimeout(forceReattach, listener); } diff --git a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java index a3e171a2..9286e280 100644 --- a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java +++ b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java @@ -81,6 +81,8 @@ public class ConnectionManager implements ConnectListener { void onMessage(ProtocolMessage msg); void suspendAll(ErrorInfo error, boolean notifyStateChange); Iterable<Channel> values(); + + void reattachOnResumeFailure(); } /*********************************** @@ -1183,44 +1185,48 @@ public class ConnectionManager implements ConnectListener { } private synchronized void onConnected(ProtocolMessage message) { - /* if the returned connection id differs from - * the existing connection id, then this means - * we need to suspend all existing attachments to - * the old connection. - * If realtime did not reply with an error, it - * signifies that this was a result of an earlier - * connection being invalidated due to being stale. - * - * Suspend all channels attached to the previous id; - * this will be reattached in setConnection() */ - ErrorInfo error = message.error; - if(connection.id != null && !message.connectionId.equals(connection.id)) { - /* we need to suspend the original connection */ - if(error == null) { - error = REASON_SUSPENDED; + final ErrorInfo error = message.error; + connection.reason = error; + if (connection.id != null) { // there was a previous connection, so this is a resume and RTN15c applies + Log.d(TAG, "There was a connection resume"); + if(message.connectionId.equals(connection.id)) { + // resume succeeded + if(message.error == null) { + // RTN15c1: no action required wrt channel state + Log.d(TAG, "connection has reconnected and resumed successfully"); + } else { + // RTN15c2: no action required wrt channel state + Log.d(TAG, "connection resume success with non-fatal error: " + error.message); + } + // Add pending messages to the front of queued messages to be sent later + addPendingMessagesToQueuedMessages(false); + } else { + // RTN15c3: resume failed + if (error != null){ + Log.d(TAG, "connection resume failed with error: " + error.message); + }else { // This shouldn't happen but, putting it here for safety + Log.d(TAG, "connection resume failed without error" ); + } + + channels.reattachOnResumeFailure(); + // Add any messages still pending from the previous transport (RTN19a) to the front of queued messages + // however, this time the pending messages have to have newly assigned ` + // msgSerial`s. They can't simply be replayed, as they are in the successful resume case + addPendingMessagesToQueuedMessages(true); } - channels.suspendAll(error, false); } - /* set the new connection id */ - ConnectionDetails connectionDetails = message.connectionDetails; - connection.key = connectionDetails.connectionKey; - if (!message.connectionId.equals(connection.id)) { - /* The connection id has changed. Reset the message serial and the - * pending message queue (which fails the messages currently in - * there). */ - pendingMessages.reset(msgSerial, - new ErrorInfo("Connection resume failed", 500, 50000)); - msgSerial = 0; - } connection.id = message.connectionId; + if(message.connectionSerial != null) { - connection.serial = message.connectionSerial.longValue(); + connection.serial = message.connectionSerial; if (connection.key != null) connection.recoveryKey = connection.key + ":" + message.connectionSerial; } + ConnectionDetails connectionDetails = message.connectionDetails; /* Get any parameters from connectionDetails. */ + connection.key = connectionDetails.connectionKey; //RTN16d maxIdleInterval = connectionDetails.maxIdleInterval; connectionStateTtl = connectionDetails.connectionStateTtl; @@ -1232,12 +1238,39 @@ public class ConnectionManager implements ConnectListener { requestState(transport, new StateIndication(ConnectionState.failed, e.errorInfo)); return; } - /* indicated connected currentState */ setSuspendTime(); requestState(new StateIndication(ConnectionState.connected, error)); } + /** + * Add all pending queued messages to the front of QueuedMessages for them to be sent later + * Spec: RTN19a + * @param resetMessageSerial whether to reset message serial, this will determine whether to reset message serials + * on pending queue, for example when a connection resume failed + */ + private void addPendingMessagesToQueuedMessages(boolean resetMessageSerial) { + // Add messages from pending messages to front of queuedMessages in order to retry them + queuedMessages.addAll(0, pendingMessages.queue); + //rewind start serial back to the first serial since we are clearing the queue + if (!pendingMessages.queue.isEmpty()){ + //Reset current serial to the first pending message on previous queue as we are going to clear the queue now + msgSerial = pendingMessages.queue.get(0).msg.msgSerial; + pendingMessages.resetStartSerial((int) (msgSerial)); + pendingMessages.clearQueue(); + } + + //RTN19a + if (resetMessageSerial){ + pendingMessages.resetStartSerial(0); + msgSerial = 0; //msgSerial will increase in sendImpl when messages are sent + } + } + + public List<QueuedMessage> getPendingMessages() { + return pendingMessages.queue; + } + private synchronized void onDisconnected(ProtocolMessage message) { ErrorInfo reason = message.error; if(reason != null && isTokenError(reason)) { @@ -1718,6 +1751,13 @@ public class ConnectionManager implements ConnectListener { startSerial = 0; } + public void resetStartSerial(int from) { + startSerial = from; + } + + synchronized void clearQueue() { + queue.clear(); + } } /*********************** diff --git a/lib/src/main/java/io/ably/lib/transport/ITransport.java b/lib/src/main/java/io/ably/lib/transport/ITransport.java index 364c03ab..93b426f3 100644 --- a/lib/src/main/java/io/ably/lib/transport/ITransport.java +++ b/lib/src/main/java/io/ably/lib/transport/ITransport.java @@ -122,6 +122,8 @@ public interface ITransport { */ void send(ProtocolMessage msg) throws AblyException; + void receive(ProtocolMessage msg) throws AblyException; + /** * Get connection URL * @return diff --git a/lib/src/main/java/io/ably/lib/transport/WebSocketTransport.java b/lib/src/main/java/io/ably/lib/transport/WebSocketTransport.java index 55b23d68..85284b17 100644 --- a/lib/src/main/java/io/ably/lib/transport/WebSocketTransport.java +++ b/lib/src/main/java/io/ably/lib/transport/WebSocketTransport.java @@ -70,7 +70,7 @@ public class WebSocketTransport implements ITransport { Log.d(TAG, "connect(); wsUri = " + wsUri); synchronized(this) { - wsConnection = new WsClient(URI.create(wsUri)); + wsConnection = new WsClient(URI.create(wsUri), this::receive); if(isTls) { SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init( null, null, null ); @@ -99,6 +99,11 @@ public class WebSocketTransport implements ITransport { } } + @Override + public void receive(ProtocolMessage msg) throws AblyException { + connectionManager.onMessage(this, msg); + } + @Override public void send(ProtocolMessage msg) throws AblyException { Log.d(TAG, "send(); action = " + msg.action); @@ -137,14 +142,21 @@ public class WebSocketTransport implements ITransport { //Gives the chance to child classes to do message pre-processing } + //interface to transfer Protocol message from websocket + interface WebSocketReceiver { + void onMessage(ProtocolMessage protocolMessage) throws AblyException; + } + /************************** * WebSocketHandler methods **************************/ - class WsClient extends WebSocketClient { + class WsClient extends WebSocketClient { + private final WebSocketReceiver receiver; - WsClient(URI serverUri) { + WsClient(URI serverUri, WebSocketReceiver receiver) { super(serverUri); + this.receiver = receiver; } @Override @@ -180,7 +192,7 @@ public class WebSocketTransport implements ITransport { ProtocolMessage msg = ProtocolSerializer.readMsgpack(blob.array()); Log.d(TAG, "onMessage(): msg (binary) = " + msg); WebSocketTransport.this.preProcessReceivedMessage(msg); - connectionManager.onMessage(WebSocketTransport.this, msg); + receiver.onMessage(msg); } catch (AblyException e) { String msg = "Unexpected exception processing received binary message"; Log.e(TAG, msg, e); @@ -194,7 +206,7 @@ public class WebSocketTransport implements ITransport { ProtocolMessage msg = ProtocolSerializer.fromJSON(string); Log.d(TAG, "onMessage(): msg (text) = " + msg); WebSocketTransport.this.preProcessReceivedMessage(msg); - connectionManager.onMessage(WebSocketTransport.this, msg); + receiver.onMessage(msg); } catch (AblyException e) { String msg = "Unexpected exception processing received text message"; Log.e(TAG, msg, e); diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeResumeTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeResumeTest.java index 3277c902..eae88550 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeResumeTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeResumeTest.java @@ -4,12 +4,15 @@ import io.ably.lib.debug.DebugOptions; import io.ably.lib.realtime.AblyRealtime; import io.ably.lib.realtime.Channel; import io.ably.lib.realtime.ChannelState; +import io.ably.lib.realtime.ConnectionEvent; import io.ably.lib.realtime.ConnectionState; +import io.ably.lib.realtime.ConnectionStateListener; import io.ably.lib.test.common.Helpers.ChannelWaiter; import io.ably.lib.test.common.Helpers.CompletionSet; import io.ably.lib.test.common.Helpers.ConnectionWaiter; import io.ably.lib.test.common.Helpers.MessageWaiter; import io.ably.lib.test.common.ParameterizedTest; +import io.ably.lib.test.util.MockWebsocketFactory; import io.ably.lib.types.AblyException; import io.ably.lib.types.ClientOptions; import io.ably.lib.types.ErrorInfo; @@ -20,11 +23,14 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -82,7 +88,7 @@ public class RealtimeResumeTest extends ParameterizedTest { } catch (AblyException e) { e.printStackTrace(); - fail("init0: Unexpected exception instantiating library"); + fail("Unexpected exception: "+e.getMessage()); } finally { if(ably != null) { ably.close(); @@ -572,7 +578,6 @@ public class RealtimeResumeTest extends ParameterizedTest { * round of messages which should be queued and published after * we reconnect the sender. */ - @Ignore("FIXME: fix exception") @Test public void resume_publish_queue() { AblyRealtime receiver = null; @@ -684,6 +689,243 @@ public class RealtimeResumeTest extends ParameterizedTest { } } + /** + * In case of resume success, verify that pending messages are resent. By blocking ack/nacks before sending the + * message while connected and then disconnect, add some more messages + * */ + @Test + public void resume_publish_resend_pending_messages_when_resume_is_successful() { + final long delay = 200; + final String channelName = "resume_publish_queue"; + AblyRealtime sender = null; + try { + final MockWebsocketFactory mockWebsocketFactory = new MockWebsocketFactory(); + String keyStr = testVars.keys[0].keyStr; + DebugOptions senderOptions = createOptions(keyStr); + senderOptions.queueMessages = true; + senderOptions.transportFactory = mockWebsocketFactory; + sender = new AblyRealtime(senderOptions); + final Channel senderChannel = sender.channels.get(channelName); + senderChannel.attach(); + (new ChannelWaiter(senderChannel)).waitFor(ChannelState.attached); + assertEquals( + "The sender's channel should be attached", + senderChannel.state, ChannelState.attached + ); + + MockWebsocketFactory.MockWebsocketTransport transport = mockWebsocketFactory.getCreatedTransport(); + + final CompletionSet senderCompletion = new CompletionSet(); + //send 3 successful messages + for (int i = 0; i < 3; i++) { + senderChannel.publish("non_pending messages" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + + /* wait for the publish callback to be called.*/ + ErrorInfo[] errors = senderCompletion.waitFor(); + assertTrue( + "First completion has errors", + errors.length == 0 + ); + + //assert that messages sent till now are sent with correct size and serials + assertEquals("First round of messages has incorrect size", 3, transport.getPublishedMessages().size()); + + for (int i = 0; i < transport.getPublishedMessages().size(); i++) { + ProtocolMessage protocolMessage = transport.getPublishedMessages().get(i); + assertEquals("Sent serial incorrect", Long.valueOf(i), protocolMessage.msgSerial); + } + + //now clear published messages + transport.clearPublishedMessages(); + + //block ack/nack messages to simulate pending message + mockWebsocketFactory.blockReceive(message -> message.action == ProtocolMessage.Action.ack || + message.action == ProtocolMessage.Action.nack); + + for (int i = 0; i < 3; i++) { + senderChannel.publish("pending_queued_message_" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + assertEquals(sender.connection.connectionManager.getPendingMessages().size(),3); + + final String connectionId = sender.connection.id; + + //now let's disconnect + sender.connection.connectionManager.requestState(ConnectionState.disconnected); + (new ConnectionWaiter(sender.connection)).waitFor(ConnectionState.disconnected); + + //send 3 more messages while disconnected + for (int i = 0; i < 3; i++) { + senderChannel.publish("queued_message_" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + //now let's unblock the ack nacks and reconnect + mockWebsocketFactory.blockReceive(message -> false); + /* reconnect the sender */ + sender.connection.connect(); + (new ConnectionWaiter(sender.connection)).waitFor(ConnectionState.connected); + assertEquals("Connection must be connected", ConnectionState.connected, sender.connection.state); + //make sure connection id is a resume success + assertEquals("Connection id has changed", connectionId, sender.connection.id); + + //replace mock transport + transport = mockWebsocketFactory.getCreatedTransport(); + + /* wait for the publish callback to be called.*/ + ErrorInfo[] senderErrors = senderCompletion.waitFor(); + assertTrue( + "Second round of send has errors", + senderErrors.length == 0 + ); + + assertEquals("Second round of messages has incorrect size", 6, transport.getPublishedMessages().size()); + //make sure they were sent with correct serials + for (int i = 0; i < transport.getPublishedMessages().size(); i++) { + ProtocolMessage protocolMessage = transport.getPublishedMessages().get(i); + assertEquals("Sent serial incorrect", Long.valueOf(i+3), protocolMessage.msgSerial); + } + + //make sure that pending queue is cleared + assertEquals("There are still pending messages in the queue", + sender.connection.connectionManager.getPendingMessages().size(), + 0); + + } catch (AblyException e) { + fail("Unexpected exception: "+e.getMessage()); + } finally { + if (sender != null) { + sender.close(); + } + } + } + + /** + * In case of resume failure verify that messages are being resent + * */ + @Test + public void resume_publish_resend_pending_messages_when_resume_failed() throws AblyException { + final long delay = 200; + final String channelName = "sender_channel"; + final MockWebsocketFactory mockWebsocketFactory = new MockWebsocketFactory(); + final DebugOptions options = createOptions(testVars.keys[0].keyStr); + options.realtimeRequestTimeout = 2000L; + options.transportFactory = mockWebsocketFactory; + try(AblyRealtime ably = new AblyRealtime(options)) { + final long newTtl = 1000L; + final long newIdleInterval = 1000L; + /* We want this greater than newTtl + newIdleInterval */ + final long waitInDisconnectedState = 3000L; + + ably.connection.on(ConnectionEvent.connected, new ConnectionStateListener() { + @Override + public void onConnectionStateChanged(ConnectionStateChange state) { + try { + Field connectionStateField = ably.connection.connectionManager.getClass().getDeclaredField("connectionStateTtl"); + connectionStateField.setAccessible(true); + connectionStateField.setLong(ably.connection.connectionManager, newTtl); + Field maxIdleField = ably.connection.connectionManager.getClass().getDeclaredField("maxIdleInterval"); + maxIdleField.setAccessible(true); + maxIdleField.setLong(ably.connection.connectionManager, newIdleInterval); + } catch (NoSuchFieldException | IllegalAccessException e) { + fail("Unexpected exception in checking connectionStateTtl"); + } + } + }); + + ConnectionWaiter connectionWaiter = new ConnectionWaiter(ably.connection); + connectionWaiter.waitFor(ConnectionState.connected); + + final Channel senderChannel = ably.channels.get(channelName); + senderChannel.attach(); + (new ChannelWaiter(senderChannel)).waitFor(ChannelState.attached); + assertEquals( + "The sender's channel should be attached", + senderChannel.state, ChannelState.attached + ); + + MockWebsocketFactory.MockWebsocketTransport transport = mockWebsocketFactory.getCreatedTransport(); + CompletionSet senderCompletion = new CompletionSet(); + //send 3 successful messages + for (int i = 0; i < 3; i++) { + senderChannel.publish("non_pending messages" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + + /* wait for the publish callback to be called.*/ + ErrorInfo[] errors = senderCompletion.waitFor(); + assertTrue( + "First completion has errors", + errors.length == 0 + ); + + //assert that messages sent till now are sent with correct size and serials + assertEquals("First round of messages has incorrect size", 3, transport.getPublishedMessages().size()); + for (int i = 0; i < transport.getPublishedMessages().size(); i++) { + ProtocolMessage protocolMessage = transport.getPublishedMessages().get(i); + assertEquals("Sent serial incorrect", Long.valueOf(i), protocolMessage.msgSerial); + } + + //block acks nacks before send + mockWebsocketFactory.blockReceive(message -> message.action == ProtocolMessage.Action.ack || + message.action == ProtocolMessage.Action.nack); + for (int i = 0; i < 3; i++) { + senderChannel.publish("pending_queued_message_" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + + final String firstConnectionId = ably.connection.id; + + /* suppress automatic retries by the connection manager and disconnect */ + try { + Method method = ably.connection.connectionManager.getClass().getDeclaredMethod("disconnectAndSuppressRetries"); + method.setAccessible(true); + method.invoke(ably.connection.connectionManager); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + fail("Unexpected exception in suppressing retries"); + } + connectionWaiter.waitFor(ConnectionState.disconnected); + assertEquals("Disconnected state was not reached", ConnectionState.disconnected, ably.connection.state); + + //send some more messages while disconnected + for (int i = 0; i < 3; i++) { + senderChannel.publish("queued_message_" + i, "Test pending queued messages " + i, + senderCompletion.add()); + } + //now let's unblock the ack nacks and reconnect + mockWebsocketFactory.blockReceive(message -> false); + /* Wait for the connection to go stale, then reconnect */ + try { + Thread.sleep(waitInDisconnectedState); + } catch (InterruptedException e) { + } + ably.connection.connect(); + connectionWaiter.waitFor(ConnectionState.connected); + assertEquals("Connected state was not reached", ConnectionState.connected, ably.connection.state); + //replace transport + transport = mockWebsocketFactory.getCreatedTransport(); + /* Verify the connection is new */ + assertNotNull(ably.connection.id); + assertNotEquals("Connection has the same id", firstConnectionId, ably.connection.id); + + /* wait for the publish callback to be called.*/ + + ErrorInfo[] resendErrors = senderCompletion.waitFor(); + assertTrue( + "Second round of messages (queued) has errors", + resendErrors.length == 0 + ); + + assertEquals("Second round of messages has incorrect size", 6, transport.getPublishedMessages().size()); + //make sure they were sent with reset serials + for (int i = 0; i < transport.getPublishedMessages().size(); i++) { + ProtocolMessage protocolMessage = transport.getPublishedMessages().get(i); + assertEquals("Sent serial incorrect", Long.valueOf(i), protocolMessage.msgSerial); + } + } + } + //RTL4j2 @Test public void resume_rewind_1 () diff --git a/lib/src/test/java/io/ably/lib/test/util/MockWebsocketFactory.java b/lib/src/test/java/io/ably/lib/test/util/MockWebsocketFactory.java index 3d0b0c44..102b3227 100644 --- a/lib/src/test/java/io/ably/lib/test/util/MockWebsocketFactory.java +++ b/lib/src/test/java/io/ably/lib/test/util/MockWebsocketFactory.java @@ -1,5 +1,8 @@ package io.ably.lib.test.util; +import java.util.ArrayList; +import java.util.List; + import io.ably.lib.transport.ConnectionManager; import io.ably.lib.transport.ITransport; import io.ably.lib.transport.WebSocketTransport; @@ -17,6 +20,13 @@ public class MockWebsocketFactory implements ITransport.Factory { block, fail } + + enum ReceiveBehaviour { + allow, + block, + fail + } + enum ConnectBehaviour { allow, fail @@ -35,8 +45,10 @@ public class MockWebsocketFactory implements ITransport.Factory { } SendBehaviour sendBehaviour = SendBehaviour.allow; + ReceiveBehaviour receiveBehaviour = ReceiveBehaviour.allow; ConnectBehaviour connectBehaviour = ConnectBehaviour.allow; - MessageFilter messageFilter = null; + MessageFilter sendMessageFilter = null; + MessageFilter receiveMessageFilter = null; HostFilter hostFilter = null; HostTransform hostTransform = null; @@ -63,26 +75,38 @@ public class MockWebsocketFactory implements ITransport.Factory { return lastCreatedTransport; } + //only use this when you know when transport is created - just for tests + public MockWebsocketTransport getCreatedTransport() { + return (MockWebsocketTransport) lastCreatedTransport; + } + public void blockSend(MessageFilter filter) { - messageFilter = filter; + sendMessageFilter = filter; sendBehaviour = SendBehaviour.block; } + + //use the same filters temporarily + public void blockReceive(MessageFilter filter) { + receiveMessageFilter = filter; + receiveBehaviour = ReceiveBehaviour.block; + } + public void blockSend() { blockSend(null); } public void allowSend(MessageFilter filter) { - messageFilter = filter; + sendMessageFilter = filter; sendBehaviour = SendBehaviour.allow; } public void allowSend() { allowSend(null);} public void failSend(MessageFilter filter) { - messageFilter = filter; + sendMessageFilter = filter; sendBehaviour = SendBehaviour.fail; } public void failSend() { failSend(null); } - public void setMessageFilter(MessageFilter filter) { - messageFilter = filter; + public void setSendMessageFilter(MessageFilter filter) { + sendMessageFilter = filter; } public void failConnect(HostFilter filter) { @@ -98,9 +122,10 @@ public class MockWebsocketFactory implements ITransport.Factory { /* * Special transport class that allows blocking send() and other operations */ - private class MockWebsocketTransport extends WebSocketTransport { + public class MockWebsocketTransport extends WebSocketTransport { private final TransportParams givenTransportParams; private final TransportParams transformedTransportParams; + private final List<ProtocolMessage> publishedMessages = new ArrayList<>(); private MockWebsocketTransport(TransportParams givenTransportParams, TransportParams transformedTransportParams, ConnectionManager connectionManager) { super(transformedTransportParams, connectionManager); @@ -108,23 +133,34 @@ public class MockWebsocketFactory implements ITransport.Factory { this.transformedTransportParams = transformedTransportParams; } + public List<ProtocolMessage> getPublishedMessages() { + return publishedMessages; + } + + public void clearPublishedMessages() { + publishedMessages.clear(); + } + @Override public void send(ProtocolMessage msg) throws AblyException { + if (msg.action == ProtocolMessage.Action.message){ + publishedMessages.add(msg); + } switch (sendBehaviour) { case allow: - if (messageFilter == null || messageFilter.matches(msg)) { + if (sendMessageFilter == null || sendMessageFilter.matches(msg)) { super.send(msg); } break; case block: - if (messageFilter == null || messageFilter.matches(msg)) { + if (sendMessageFilter == null || sendMessageFilter.matches(msg)) { /* do nothing */ } else { super.send(msg); } break; case fail: - if (messageFilter == null || messageFilter.matches(msg)) { + if (sendMessageFilter == null || sendMessageFilter.matches(msg)) { throw AblyException.fromErrorInfo(new ErrorInfo("Mock", 40000)); } else { super.send(msg); @@ -133,6 +169,32 @@ public class MockWebsocketFactory implements ITransport.Factory { } } + @Override + public void receive(ProtocolMessage msg) throws AblyException { + switch (receiveBehaviour) { + case allow: + if (receiveMessageFilter == null || receiveMessageFilter.matches(msg)) { + super.receive(msg); + } + break; + case block: + if (receiveMessageFilter == null || receiveMessageFilter.matches(msg)) { + /* do nothing */ + } else { + super.receive(msg); + } + break; + case fail: + if (receiveMessageFilter == null || receiveMessageFilter.matches(msg)) { + throw AblyException.fromErrorInfo(new ErrorInfo("Mock", 40000)); + } else { + super.receive(msg); + } + break; + } + } + + @Override public void connect(ConnectListener connectListener) { String host = givenTransportParams.getHost();

['lib/src/main/java/io/ably/lib/transport/WebSocketTransport.java', 'lib/src/test/java/io/ably/lib/test/util/MockWebsocketFactory.java', 'lib/src/main/java/io/ably/lib/realtime/ChannelBase.java', 'lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java', 'lib/src/main/java/io/ably/lib/transport/ITransport.java', 'lib/src/test/java/io/ably/lib/test/realtime/RealtimeResumeTest.java', 'lib/src/main/java/io/ably/lib/transport/ConnectionManager.java']

{'.java': 7}

Java

{'Java': 2119819, 'Shell': 2346, 'HTML': 1161, 'Groovy': 753, 'JavaScript': 178}

Apache License 2.0

ably/ably-java/909/908

ably

ably-java

https://github.com/ably/ably-java/issues/908

https://github.com/ably/ably-java/pull/909

https://github.com/ably/ably-java/pull/909

fixes

Presence messages superseded whilst channel in attaching state

presence.enter and presence.update (and the others) call presence.updatePresence. updatePresence will put messages on a queue to be sent later, in the event that the channel is currently attaching. This queue is a HashMap that is keyed by clientid. This means if a presence.enter and presence.update occur in quick succession before the channel attaches, the former is cancelled out by the latter (and any listeners are not called). There are two possible options: 1. Queue up all presence messages and then send in-order on channel attach. 2. Only send the latest message, but call all event listeners with the result. The spec needs updating to provide more clarification on what the behaviour should be (see: https://github.com/ably/specification/issues/130), but the current implementation in ably-js is to just send all of the pending messages.

a1e2c46266df1a6304b72aa1afd736f95f252c2e

d8445cd92989ddbd2ba7623c28b84e5274f68848

https://github.com/ably/ably-java/compare/a1e2c46266df1a6304b72aa1afd736f95f252c2e...d8445cd92989ddbd2ba7623c28b84e5274f68848

diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java index 3d219b33..fb28d966 100644 --- a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java +++ b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java @@ -196,8 +196,7 @@ public abstract class ChannelBase extends EventEmitter<ChannelEvent, ChannelStat PresenceMessage[] presenceMessages = queuedMessage.msg.presence; if (presenceMessages != null && presenceMessages.length > 0) { for (PresenceMessage presenceMessage : presenceMessages) { - this.presence.addPendingPresence(presenceMessage.clientId, presenceMessage, - queuedMessage.listener); + this.presence.addPendingPresence(presenceMessage, queuedMessage.listener); } } } diff --git a/lib/src/main/java/io/ably/lib/realtime/Presence.java b/lib/src/main/java/io/ably/lib/realtime/Presence.java index e34b8a49..aeaf2a8b 100644 --- a/lib/src/main/java/io/ably/lib/realtime/Presence.java +++ b/lib/src/main/java/io/ably/lib/realtime/Presence.java @@ -117,9 +117,11 @@ public class Presence { return get(new Param(GET_WAITFORSYNC, String.valueOf(wait)), new Param(GET_CLIENTID, clientId)); } - synchronized void addPendingPresence(String clientId, PresenceMessage presenceMessage, CompletionListener listener) { - final QueuedPresence queuedPresence = new QueuedPresence(presenceMessage,listener); - pendingPresence.put(clientId,queuedPresence); + void addPendingPresence(PresenceMessage presenceMessage, CompletionListener listener) { + synchronized(channel) { + final QueuedPresence queuedPresence = new QueuedPresence(presenceMessage,listener); + pendingPresence.add(queuedPresence); + } } /** @@ -739,13 +741,12 @@ public class Presence { * @throws AblyException */ public void updatePresence(PresenceMessage msg, CompletionListener listener) throws AblyException { - Log.v(TAG, "update(); channel = " + channel.name); + Log.v(TAG, "updatePresence(); channel = " + channel.name); AblyRealtime ably = channel.ably; boolean connected = (ably.connection.state == ConnectionState.connected); - String clientId; try { - clientId = ably.auth.checkClientId(msg, false, connected); + ably.auth.checkClientId(msg, false, connected); } catch(AblyException e) { if(listener != null) { listener.onError(e.errorInfo); @@ -759,8 +760,7 @@ public class Presence { case initialized: channel.attach(); case attaching: - QueuedPresence queued = new QueuedPresence(msg, listener); - pendingPresence.put(clientId, queued); + pendingPresence.add(new QueuedPresence(msg, listener)); break; case attached: ProtocolMessage message = new ProtocolMessage(ProtocolMessage.Action.presence, channel.name); @@ -852,7 +852,7 @@ public class Presence { QueuedPresence(PresenceMessage msg, CompletionListener listener) { this.msg = msg; this.listener = listener; } } - private final Map<String, QueuedPresence> pendingPresence = new HashMap<String, QueuedPresence>(); + private final List<QueuedPresence> pendingPresence = new ArrayList<QueuedPresence>(); private void sendQueuedMessages() { Log.v(TAG, "sendQueuedMessages()"); @@ -864,7 +864,7 @@ public class Presence { return; ProtocolMessage message = new ProtocolMessage(ProtocolMessage.Action.presence, channel.name); - Iterator<QueuedPresence> allQueued = pendingPresence.values().iterator(); + Iterator<QueuedPresence> allQueued = pendingPresence.iterator(); PresenceMessage[] presenceMessages = message.presence = new PresenceMessage[count]; CompletionListener listener; @@ -883,7 +883,9 @@ public class Presence { } listener = mListener.isEmpty() ? null : mListener; } + pendingPresence.clear(); + try { connectionManager.send(message, queueMessages, listener); } catch(AblyException e) { @@ -895,7 +897,7 @@ public class Presence { private void failQueuedMessages(ErrorInfo reason) { Log.v(TAG, "failQueuedMessages()"); - for(QueuedPresence msg : pendingPresence.values()) + for(QueuedPresence msg : pendingPresence) if(msg.listener != null) try { msg.listener.onError(reason); diff --git a/lib/src/test/java/io/ably/lib/test/common/Helpers.java b/lib/src/test/java/io/ably/lib/test/common/Helpers.java index 788a81bb..bc6cc8fe 100644 --- a/lib/src/test/java/io/ably/lib/test/common/Helpers.java +++ b/lib/src/test/java/io/ably/lib/test/common/Helpers.java @@ -164,15 +164,35 @@ public class Helpers { error = null; } - public synchronized ErrorInfo waitFor(int count) { + /** + * Wait for a specified amount of time, or until success occurs. + */ + public synchronized ErrorInfo waitFor(int count, long timeoutInMillis) { + long timeoutAt = System.currentTimeMillis() + timeoutInMillis; while(successCount<count && error == null) - try { wait(); } catch(InterruptedException e) {} + try { + if (System.currentTimeMillis() > timeoutAt) { + break; + } + + wait(); + } catch(InterruptedException e) {} success = successCount >= count; return error; } + /** + * Wait for a specified number of successes, with an arbitrarily long timeout. + */ + public synchronized ErrorInfo waitFor(int count) { + return waitFor(count, 600000); + } + + /** + * Wait for a single success with an arbitrarily long timeout. + */ public synchronized ErrorInfo waitFor() { - return waitFor(1); + return waitFor(1, 600000); } /** diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java index 4342b580..7148b9e3 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java @@ -1649,6 +1649,97 @@ public class RealtimePresenceTest extends ParameterizedTest { } } + /** + * <p> + * Validates a client sending multiple presence updates when the channel is in the attaching + * state will have all messages sent once the channel attaches, and all listeners will be called. + * </p> + * + * @throws AblyException + */ + @Test + public void realtime_presence_update_multiple_queued_messages() throws AblyException { + /* Ably instance that will emit presence events */ + AblyRealtime ably1 = null; + /* Ably instance that will receive presence events */ + AblyRealtime ably2 = null; + + String channelName = "test.presence.subscribe.update_multiple_queued_messages" + System.currentTimeMillis(); + EnumSet<PresenceMessage.Action> actions = EnumSet.of(Action.update, Action.enter); + + try { + ClientOptions option1 = createOptions(testVars.keys[0].keyStr); + option1.clientId = "emitter client"; + ClientOptions option2 = createOptions(testVars.keys[0].keyStr); + option2.clientId = "receiver client"; + + ably1 = new AblyRealtime(option1); + ably2 = new AblyRealtime(option2); + + Channel channel1 = ably1.channels.get(channelName); + + Channel channel2 = ably2.channels.get(channelName); + channel2.attach(); + (new ChannelWaiter(channel2)).waitFor(ChannelState.attached); + + CompletionWaiter messageCompletionListener = new CompletionWaiter(); + + final ArrayList<PresenceMessage> receivedMessageStack = new ArrayList<>(); + channel2.presence.subscribe(actions, new Presence.PresenceListener() { + @Override + public void onPresenceMessage(PresenceMessage message) { + synchronized (receivedMessageStack) { + receivedMessageStack.add(message); + receivedMessageStack.notify(); + } + } + }); + + /* + Start emitting channel with ably client 1 (emitter) + + This is synchronized against the channel so that channel.setState cant mark + the channel as attached until we're done queueing up events. + */ + synchronized (channel1) { + channel1.presence.enter("Hello, #2!", messageCompletionListener); + channel1.presence.update("Lorem ipsum", messageCompletionListener); + channel1.presence.update("Dolor sit!", messageCompletionListener); + } + + /* Wait until receiver client (ably2) observes {@code Action.leave} + * is emitted from emitter client (ably1) + */ + try { + synchronized (receivedMessageStack) { + while (receivedMessageStack.size() == 0 || + !receivedMessageStack.get(receivedMessageStack.size()-1).clientId.equals(ably1.options.clientId) || + !receivedMessageStack.get(receivedMessageStack.size()-1).data.equals("Dolor sit!")) + receivedMessageStack.wait(); + } + } catch(InterruptedException e) {} + + /* Validate that, + *- we received specific actions + */ + assertThat(receivedMessageStack.size(), is(equalTo(3))); + for (PresenceMessage message : receivedMessageStack) { + assertTrue(actions.contains(message.action)); + } + + /* + * Validate that + * - our listeners are called within 10 seconds + */ + messageCompletionListener.waitFor(3, 10000); + assertTrue(messageCompletionListener.success); + + } finally { + if (ably1 != null) ably1.close(); + if (ably2 != null) ably2.close(); + } + } + /** * <p> * Validates a client can observe presence messages of other client,

['lib/src/main/java/io/ably/lib/realtime/Presence.java', 'lib/src/main/java/io/ably/lib/realtime/ChannelBase.java', 'lib/src/test/java/io/ably/lib/test/common/Helpers.java', 'lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java']

{'.java': 4}

Java

{'Java': 2119819, 'Shell': 2346, 'HTML': 1161, 'Groovy': 753, 'JavaScript': 178}

Apache License 2.0

ably/ably-java/895/888

ably

ably-java

https://github.com/ably/ably-java/issues/888

https://github.com/ably/ably-java/pull/895

https://github.com/ably/ably-java/pull/895

fixes

EventEmitter.on() does not permit the same listener to be added multiple times

https://github.com/ably/ably-java/blob/9786de65bd44c2f139a53ee235535cb7617cbc87/lib/src/main/java/io/ably/lib/util/EventEmitter.java#L41 The two implementations of EventEmitter.on() prevents the same listener from being registered multiple times (and thus being invoked multiple times per event). It should allow this to happen as per https://sdk.ably.com/builds/ably/specification/main/features/#RTE4.

ba58297e750218b9c86a30a89a1a58fb91c86c89

072d6e9ed3d16044ac673a439c0a5de4fbc130e6

https://github.com/ably/ably-java/compare/ba58297e750218b9c86a30a89a1a58fb91c86c89...072d6e9ed3d16044ac673a439c0a5de4fbc130e6

diff --git a/core/src/main/java/io/ably/lib/util/EventEmitter.java b/core/src/main/java/io/ably/lib/util/EventEmitter.java index 46fac0a7..fc6c7c87 100644 --- a/core/src/main/java/io/ably/lib/util/EventEmitter.java +++ b/core/src/main/java/io/ably/lib/util/EventEmitter.java @@ -1,10 +1,7 @@ package io.ably.lib.util; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; /** * A generic interface for event registration and delivery used in a number of the types in the Realtime client library. @@ -26,8 +23,8 @@ public abstract class EventEmitter<Event, Listener> { } /** - * Registers the provided listener all events. - * If on() is called more than once with the same listener and event, + * Registers the provided listener for all events. + * If on() is called more than once with the same listener, * the listener is added multiple times to its listener registry. * Therefore, as an example, assuming the same listener is registered twice using on(), * and an event is emitted once, the listener would be invoked twice. @@ -39,8 +36,7 @@ public abstract class EventEmitter<Event, Listener> { * This listener is invoked on a background thread. */ public synchronized void on(Listener listener) { - if(!listeners.contains(listener)) - listeners.add(listener); + listeners.add(listener); } /** @@ -58,7 +54,7 @@ public abstract class EventEmitter<Event, Listener> { * This listener is invoked on a background thread. */ public synchronized void once(Listener listener) { - filters.put(listener, new Filter(null, listener, true)); + filters.add(new Filter(null, listener, true)); } /** @@ -70,7 +66,7 @@ public abstract class EventEmitter<Event, Listener> { */ public synchronized void off(Listener listener) { listeners.remove(listener); - filters.remove(listener); + filters.removeIf(pair -> pair.listener == listener); } /** @@ -88,7 +84,7 @@ public abstract class EventEmitter<Event, Listener> { * This listener is invoked on a background thread. */ public synchronized void on(Event event, Listener listener) { - filters.put(listener, new Filter(event, listener, false)); + filters.add(new Filter(event, listener, false)); } /** @@ -106,7 +102,7 @@ public abstract class EventEmitter<Event, Listener> { * This listener is invoked on a background thread. */ public synchronized void once(Event event, Listener listener) { - filters.put(listener, new Filter(event, listener, true)); + filters.add(new Filter(event, listener, true)); } /** @@ -117,9 +113,7 @@ public abstract class EventEmitter<Event, Listener> { * @param event The named event. */ public synchronized void off(Event event, Listener listener) { - Filter filter = filters.get(listener); - if(filter != null && filter.event == event) - filters.remove(listener); + filters.removeIf(filter -> filter.listener == listener && filter.event != null && filter.event == event); } /** @@ -144,17 +138,19 @@ public abstract class EventEmitter<Event, Listener> { apply(listener, event, args); } - Map<Listener, Filter> clonedFilters = new HashMap<>(filters); - for (Iterator<Map.Entry<Listener, Filter>> it = clonedFilters.entrySet().iterator(); it.hasNext(); ) { - Map.Entry<Listener, Filter> entry = it.next(); - if (entry.getValue().apply(event, args)) { - filters.remove(entry.getKey()); + List<Filter> clonedFilters = new ArrayList<>(filters); + for (Filter entry: clonedFilters) { + if (entry.apply(event, args)) { + filters.remove(entry); } } } protected abstract void apply(Listener listener, Event event, Object... args); + /** + * Used to determine whether or not a listener is interested + */ protected class Filter { Filter(Event event, Listener listener, boolean once) { this.event = event; this.listener = listener; this.once = once; } private Event event; @@ -169,6 +165,6 @@ public abstract class EventEmitter<Event, Listener> { } } - Map<Listener, Filter> filters = new HashMap<Listener, Filter>(); + List<Filter> filters = new ArrayList<Filter>(); List<Listener> listeners = new ArrayList<Listener>(); } diff --git a/core/src/test/java/io/ably/lib/util/EventEmitterTest.java b/core/src/test/java/io/ably/lib/util/EventEmitterTest.java index d56a0e0c..d272a23b 100644 --- a/core/src/test/java/io/ably/lib/util/EventEmitterTest.java +++ b/core/src/test/java/io/ably/lib/util/EventEmitterTest.java @@ -73,6 +73,22 @@ public class EventEmitterTest { assertEquals(listener.counts.get(MyEvents.event_1), Integer.valueOf(1)); } + /** + * Register a listener twice, and verify it is called twice + * when the event is emitted + */ + @Test + public void on_multiple_registrations() { + MyEmitter emitter = new MyEmitter(); + CountingListener listener = new CountingListener(); + emitter.on(listener); + emitter.on(listener); + emitter.emit(MyEvents.event_0, "on_multiple_0"); + emitter.emit(MyEvents.event_1, "on_multiple_1"); + assertEquals(listener.counts.get(MyEvents.event_0), Integer.valueOf(2)); + assertEquals(listener.counts.get(MyEvents.event_1), Integer.valueOf(2)); + } + /** * Register and unregister listener, and verify it * is not called when the event is emitted @@ -111,7 +127,7 @@ public class EventEmitterTest { /** * Register a listener for a specific event, and verify it is called - * only when that event is emitted + * only when that event is emitted. */ @Test public void on_event_simple() { @@ -125,6 +141,23 @@ public class EventEmitterTest { assertNull(listener.counts.get(MyEvents.event_1)); } + /** + * Register a listener multiple times for a specific event, and verify it is called + * multiple times when that event is emitted + */ + @Test + public void on_event_multiple_registrations() { + MyEmitter emitter = new MyEmitter(); + CountingListener listener = new CountingListener(); + emitter.on(MyEvents.event_0, listener); + emitter.on(MyEvents.event_0, listener); + emitter.on(MyEvents.event_1, listener); + emitter.emit(MyEvents.event_0, "on_event_simple_0"); + emitter.emit(MyEvents.event_1, "on_event_simple_1"); + assertEquals(listener.counts.get(MyEvents.event_0), Integer.valueOf(2)); + assertEquals(listener.counts.get(MyEvents.event_1), Integer.valueOf(1)); + } + /** * Register a listener for a specific event, and verify * it is no longer called after it has been removed

['core/src/test/java/io/ably/lib/util/EventEmitterTest.java', 'core/src/main/java/io/ably/lib/util/EventEmitter.java']

{'.java': 2}

Java

{'Java': 2119819, 'Shell': 2346, 'HTML': 1161, 'Groovy': 753, 'JavaScript': 178}

Apache License 2.0

ably/ably-java/825/823

ably

ably-java

https://github.com/ably/ably-java/issues/823

https://github.com/ably/ably-java/pull/825

https://github.com/ably/ably-java/pull/825

closes

waiter.close() is invoked early on onAuthUpdatedAsync method

After release of 1.2.15 Me and KacperKluka realized that waiter is closed too early, just after execute call from background thread. That was a copy/paste mistake from the previous method. We should move waiter.close method inside the background thread and close it after the while loop breaks. ┆Issue is synchronized with this [Jira Bug](https://ably.atlassian.net/browse/SDK-2468) by [Unito](https://www.unito.io)

361ee12f4ae0bd227d964a538db015a6e837ec98

370a444d305bc47d29e5b0ed654cf25e5097cb33

https://github.com/ably/ably-java/compare/361ee12f4ae0bd227d964a538db015a6e837ec98...370a444d305bc47d29e5b0ed654cf25e5097cb33

diff --git a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java index fe29b824..2004cf8c 100644 --- a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java +++ b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java @@ -988,71 +988,69 @@ public class ConnectionManager implements ConnectListener { **/ public void onAuthUpdatedAsync(final String token, final Auth.AuthUpdateResult authUpdateResult) { final ConnectionWaiter waiter = new ConnectionWaiter(); - try { - switch (currentState.state) { - case connected: - /* (RTC8a) If the connection is in the CONNECTED currentState and - * auth.authorize is called or Ably requests a re-authentication - * (see RTN22), the client must obtain a new token, then send an - * AUTH ProtocolMessage to Ably with an auth attribute - * containing an AuthDetails object with the token string. */ - try { - ProtocolMessage msg = new ProtocolMessage(ProtocolMessage.Action.auth); - msg.auth = new ProtocolMessage.AuthDetails(token); - send(msg, false, null); - } catch (AblyException e) { - /* The send failed. Close the transport; if a subsequent - * reconnect succeeds, it will be with the new token. */ - Log.v(TAG, "onAuthUpdated: closing transport after send failure"); - transport.close(); - } - break; + switch (currentState.state) { + case connected: + /* (RTC8a) If the connection is in the CONNECTED currentState and + * auth.authorize is called or Ably requests a re-authentication + * (see RTN22), the client must obtain a new token, then send an + * AUTH ProtocolMessage to Ably with an auth attribute + * containing an AuthDetails object with the token string. */ + try { + ProtocolMessage msg = new ProtocolMessage(ProtocolMessage.Action.auth); + msg.auth = new ProtocolMessage.AuthDetails(token); + send(msg, false, null); + } catch (AblyException e) { + /* The send failed. Close the transport; if a subsequent + * reconnect succeeds, it will be with the new token. */ + Log.v(TAG, "onAuthUpdated: closing transport after send failure"); + transport.close(); + } + break; - case connecting: - /* Close the connecting transport. */ - Log.v(TAG, "onAuthUpdated: closing connecting transport"); - ErrorInfo disconnectError = new ErrorInfo("Aborting incomplete connection with superseded auth params", 503, 80003); - requestState(new StateIndication(ConnectionState.disconnected, disconnectError, null, null)); - /* Start a new connection attempt. */ - connect(); - break; + case connecting: + /* Close the connecting transport. */ + Log.v(TAG, "onAuthUpdated: closing connecting transport"); + ErrorInfo disconnectError = new ErrorInfo("Aborting incomplete connection with superseded auth params", 503, 80003); + requestState(new StateIndication(ConnectionState.disconnected, disconnectError, null, null)); + /* Start a new connection attempt. */ + connect(); + break; - default: - /* Start a new connection attempt. */ - connect(); - break; - } + default: + /* Start a new connection attempt. */ + connect(); + break; + } - /* Wait for a currentState transition into anything other than connecting or - * disconnected in a background thread */ - singleThreadExecutor.execute(() -> { - boolean waitingForConnected = true; - while (waitingForConnected) { - final ErrorInfo reason = waiter.waitForChange(); - final ConnectionState connectionState = currentState.state; - switch (connectionState) { - case connected: - authUpdateResult.onUpdate(true, null); - Log.v(TAG, "onAuthUpdated: got connected"); - waitingForConnected = false; - break; + /* Wait for a currentState transition into anything other than connecting or + * disconnected in a background thread */ + singleThreadExecutor.execute(() -> { + boolean waitingForConnected = true; + while (waitingForConnected) { + final ErrorInfo reason = waiter.waitForChange(); + final ConnectionState connectionState = currentState.state; + switch (connectionState) { + case connected: + authUpdateResult.onUpdate(true, null); + Log.v(TAG, "onAuthUpdated: got connected"); + waitingForConnected = false; + break; - case connecting: - case disconnected: - Log.v(TAG, "onAuthUpdated: " + connectionState); - break; + case connecting: + case disconnected: + Log.v(TAG, "onAuthUpdated: " + connectionState); + break; - default: - /* suspended/closed/error: throw the error. */ - Log.v(TAG, "onAuthUpdated: throwing exception"); - authUpdateResult.onUpdate(false, reason); - waitingForConnected = false; - } + default: + /* suspended/closed/error: throw the error. */ + Log.v(TAG, "onAuthUpdated: throwing exception"); + authUpdateResult.onUpdate(false, reason); + waitingForConnected = false; } - }); - } finally { + } waiter.close(); - } + }); + } /** diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeAuthTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeAuthTest.java index 4fa6acc3..f0cbf2b1 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeAuthTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeAuthTest.java @@ -33,6 +33,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + public class RealtimeAuthTest extends ParameterizedTest { @Rule @@ -914,6 +918,7 @@ public class RealtimeAuthTest extends ParameterizedTest { try { opts.wait(); } catch(InterruptedException ie) {} + ably.auth.renewAuth((success, tokenDetails1, errorInfo) -> { //Ignore completion handling }); @@ -933,6 +938,84 @@ public class RealtimeAuthTest extends ParameterizedTest { } } + @Test + public void auth_renewAuth_callback_invoked() throws InterruptedException { + try { + /* get a TokenDetails */ + final String testKey = testVars.keys[0].keyStr; + final ClientOptions clientOptions = createOptions(testKey); + final AblyRest ablyRest = new AblyRest(clientOptions); + + final TokenDetails tokenDetails = ablyRest.auth.requestToken(new Auth.TokenParams() {{ + ttl = 1000L; + }}, null); + assertNotNull("Expected token value", tokenDetails.token); + + // create Ably realtime instance with token and authCallback + class ProtocolListener extends DebugOptions implements DebugOptions.RawProtocolListener { + ProtocolListener() { + Setup.getTestVars().fillInOptions(this); + protocolListener = this; + } + + @Override + public void onRawConnectRequested(String url) { + synchronized (this) { + notify(); + } + } + + @Override + public void onRawConnect(String url) { + } + + @Override + public void onRawMessageSend(ProtocolMessage message) { + } + + @Override + public void onRawMessageRecv(ProtocolMessage message) { + } + } + + final ProtocolListener protocolListener = new ProtocolListener(); + protocolListener.autoConnect = false; + protocolListener.tokenDetails = tokenDetails; + // implement callback, using Ably instance with key + protocolListener.authCallback = params -> tokenDetails; + + final AblyRealtime ably = new AblyRealtime(protocolListener); + synchronized (protocolListener) { + ably.connect(); + try { + protocolListener.wait(); + } catch (InterruptedException ie) { + fail("auth_expired_token_expire_renew protocolListener.wait(): interrupted -" + ie.getMessage()); + } + } + + final Helpers.ConnectionWaiter connectionWaiter = new Helpers.ConnectionWaiter(ably.connection); + boolean isConnected = connectionWaiter.waitFor(ConnectionState.connected, 1, 4000L); + if (isConnected) { + final CountDownLatch latch = new CountDownLatch(1); + final AtomicBoolean isCalled = new AtomicBoolean(false); + ably.auth.renewAuth((success, tokenDetails1, errorInfo) -> { + latch.countDown(); + isCalled.set(true); + }); + latch.await(30, TimeUnit.SECONDS); + assertTrue("Callback not invoked", isCalled.get()); + ably.close(); + } else { + fail("auth_renewAuth_callback_invoked: unable to connect; final state = " + ably.connection.state); + } + } catch (AblyException e) { + e.printStackTrace(); + fail("auth_renewAuth_callback_invoked: Unexpected exception instantiating library: " + e.getMessage()); + } + } + + /** * Verify that with queryTime=false, when instancing with an already-expired token and authCallback, * connection can succeed

['lib/src/test/java/io/ably/lib/test/realtime/RealtimeAuthTest.java', 'lib/src/main/java/io/ably/lib/transport/ConnectionManager.java']

{'.java': 2}