Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
import com.redhat.lightblue.query.Projection;
import com.redhat.lightblue.util.Error;

public class PublishHook implements CRUDHook, LightblueFactoryAware {
public class EsbHook implements CRUDHook, LightblueFactoryAware {

private final Logger LOGGER = LoggerFactory.getLogger(PublishHook.class);
private final Logger LOGGER = LoggerFactory.getLogger(EsbHook.class);

public static final String HOOK_NAME = "publishHook";
public static final String ENTITY_NAME = "esbEvents";
Expand All @@ -56,11 +56,11 @@ public void setLightblueFactory(LightblueFactory factory) {

@Override
public void processHook(EntityMetadata entityMetadata, HookConfiguration hookConfiguration, List<HookDoc> docs) {
if (!(hookConfiguration instanceof PublishHookConfiguration)) {
if (!(hookConfiguration instanceof EsbHookConfiguration)) {
throw new IllegalArgumentException("Only instances of PublishHookConfiguration are supported.");
}

PublishHookConfiguration publishHookConfiguration = (PublishHookConfiguration) hookConfiguration;
EsbHookConfiguration publishHookConfiguration = (EsbHookConfiguration) hookConfiguration;

for (HookDoc doc : docs) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
*
* @author vrjain
*/
public class PublishHookConfiguration implements HookConfiguration {
public class EsbHookConfiguration implements HookConfiguration {

private static final long serialVersionUID = -2297815875083279355L;

private final List<EventConfiguration> eventConfigurations;

public PublishHookConfiguration(List<EventConfiguration> eventConfigurations) {
public EsbHookConfiguration(List<EventConfiguration> eventConfigurations) {
this.eventConfigurations = eventConfigurations;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.redhat.lightblue.metadata.parser.MetadataParser;
import com.redhat.lightblue.query.Projection;

public class PublishHookConfigurationParser<T> implements HookConfigurationParser<T> {
public class EsbHookConfigurationParser<T> implements HookConfigurationParser<T> {

public static final String PROPERTY_EVENT_CONFIGURATIONS = "eventConfigurations";
public static final String PROPERTY_ROOT_ENTITY_NAME = "esbRootEntityName";
Expand All @@ -25,18 +25,18 @@ public class PublishHookConfigurationParser<T> implements HookConfigurationParse

@Override
public String getName() {
return PublishHook.HOOK_NAME;
return EsbHook.HOOK_NAME;
}

@Override
public CRUDHook getCRUDHook() {
return new PublishHook();
return new EsbHook();
}

@Override
public void convert(MetadataParser<T> p, T emptyNode, HookConfiguration object) {
if (object instanceof PublishHookConfiguration) {
PublishHookConfiguration config = (PublishHookConfiguration) object;
if (object instanceof EsbHookConfiguration) {
EsbHookConfiguration config = (EsbHookConfiguration) object;

Object eventConfigurationArray = p.newArrayField(emptyNode, PROPERTY_EVENT_CONFIGURATIONS);
for (EventConfiguration eventConfiguration : config.getEventConfigurations()) {
Expand Down Expand Up @@ -98,6 +98,6 @@ public HookConfiguration parse(String name, MetadataParser<T> parser, T node) {
eventConfigurations.add(conf);
}

return new PublishHookConfiguration(eventConfigurations);
return new EsbHookConfiguration(eventConfigurations);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.redhat.lightblue.mongo.test.AbstractMongoCRUDTestController;
import com.redhat.lightblue.test.FakeClientIdentification;

public abstract class BasePublishHookTest extends AbstractMongoCRUDTestController {
public abstract class BaseEsbHookTest extends AbstractMongoCRUDTestController {

protected static final String ESB_EVENTS_VERSION = "0.0.1-SNAPSHOT";
protected static final String COUNTRY_VERSION = "0.1.0-SNAPSHOT";
Expand All @@ -29,7 +29,7 @@ public static void preparePublishHookDatasources() {
System.setProperty("mongo.datasource", "mongodata");
}

public BasePublishHookTest() throws Exception {
public BaseEsbHookTest() throws Exception {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import com.fasterxml.jackson.databind.JsonNode;

public class PublishHookTest extends BasePublishHookTest {
public class EsbHookTest extends BaseEsbHookTest {

private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"123\",\"field\":\"iso2Code\"},{\"value\":\"456\",\"field\":\"iso3Code\"}]";
private static final String expectedFields = ",\"rootIdentity\":" + expectedIdentityKeys
+ ",\"headers\":[{\"name\":\"test\",\"value\":\"true\"},{\"name\":\"noop\",\"value\":\"false\"}]";

public PublishHookTest() throws Exception {
public EsbHookTest() throws Exception {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import com.fasterxml.jackson.databind.JsonNode;

public class FieldIdentityPublishHookTest extends BasePublishHookTest {
public class FieldIdentityEsbHookTest extends BaseEsbHookTest {

private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"swift\",\"field\":\"optionalField.mySpecificField\"}]";
private static final String expectedFields = ",\"rootIdentity\":[{\"field\":\"_id\"}]"
+ ",\"headers\":[{\"name\":\"test\",\"value\":\"true\"},{\"name\":\"noop\",\"value\":\"false\"}]";

public FieldIdentityPublishHookTest() throws Exception {
public FieldIdentityEsbHookTest() throws Exception {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

import com.fasterxml.jackson.databind.JsonNode;

public class MinimalConfigurationsPublishHookTest extends BasePublishHookTest {
public class MinimalConfigurationsEsbHookTest extends BaseEsbHookTest {

private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"123\",\"field\":\"iso2Code\"},{\"value\":\"456\",\"field\":\"iso3Code\"}]";
private static final String expectedFields = ",\"rootIdentity#\":0,\"headers#\":0";

public MinimalConfigurationsPublishHookTest() throws Exception {
public MinimalConfigurationsEsbHookTest() throws Exception {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dataSource" : "${mongo.datasource}",
"collection": "metadata",
"hookConfigurationParsers": [
"com.redhat.lightblue.hook.publish.PublishHookConfigurationParser"
"com.redhat.lightblue.hook.publish.EsbHookConfigurationParser"
]
}