List<String> lst = topic2data.computeIfAbsent(topicName, this::makeTopicData).read(consumerGroup, limit,
timeoutMs);
- if (lst.isEmpty() && timeoutMs > 0) {
- LOGGER.debug("Topic: {}, Timed out waiting for messages: {}: {}", topicName, consumerGroup, consumerId);
- return Response.status(Status.REQUEST_TIMEOUT).entity(lst).build();
-
- } else {
- LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, consumerGroup, lst.size(),
- consumerId);
- return Response.status(Status.OK).entity(lst).build();
- }
+ LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, lst.size(), consumerGroup,
+ consumerId);
+ return Response.status(Status.OK).entity(lst).build();
} catch (InterruptedException e) {
LOGGER.warn("Topic: {}, Request for DMaaP message interrupted: {}: {}", topicName, consumerGroup,
</dependencySet>
</dependencySets>
<fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources
+ </directory>
+ <includes>
+ <include>startDmaap.sh</include>
+ </includes>
+ <outputDirectory>bin</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>755</fileMode>
+ </fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources
</directory>
--- /dev/null
+#!/bin/bash
+
+#
+# ============LICENSE_START=======================================================
+# ONAP Policy Models
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+
+#
+# Starts the DMaaP simulator using the default configuration.
+#
+
+trap 'exit 1' ERR
+
+cd ${0%/*}/..
+
+java -cp "lib/*" \
+ org.onap.policy.models.sim.dmaap.startstop.Main -c etc/DefaultConfig.json
when(data1.read(any(), anyInt(), anyLong())).thenReturn(Collections.emptyList());
Response resp = prov.processDmaapMessageGet(TOPIC1, CONSUMER1, CONSUMER_ID1, 3, 300L);
- assertEquals(Status.REQUEST_TIMEOUT.getStatusCode(), resp.getStatus());
+ assertEquals(Status.OK.getStatusCode(), resp.getStatus());
assertEquals("[]", resp.getEntity().toString());
}