Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Schema
Commits
93d2fc33
Commit
93d2fc33
authored
Apr 29, 2021
by
Abhishek Kumar (SLB)
Committed by
Abhishek Kumar
May 11, 2021
Browse files
Corrections based on review comments
parent
47f3d8f1
Changes
12
Hide whitespace changes
Inline
Side-by-side
provider/schema-aws/src/main/java/org/opengroup/osdu/schema/provider/aws/impl/messagebus/MessageBusImpl.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.provider.aws.impl.messagebus
;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.schema.provider.interfaces.messagebus.IMessageBus
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
...
...
@@ -13,7 +12,7 @@ public class MessageBusImpl implements IMessageBus{
private
JaxRsDpsLog
logger
;
@Override
public
void
publishMessage
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
)
{
public
void
publishMessage
(
String
schemaId
,
String
eventType
)
{
// TODO Auto-generated method stub
logger
.
warning
(
"publish message not implemented yet"
);
...
...
provider/schema-azure/src/main/java/org/opengroup/osdu/schema/azure/di/EventGridConfig.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.azure.di
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Configuration
;
import
com.azure.cosmos.implementation.apachecommons.lang.StringUtils
;
@Configuration
public
class
EventGridConfig
{
private
boolean
eventGridEnabled
;
private
String
eventGridCustomTopic
;
public
boolean
is
PublishTo
EventGridEnabled
()
{
return
publishToE
ventGridEnabled
;
public
boolean
isEventGridEnabled
()
{
return
e
ventGridEnabled
;
}
public
String
getCustomTopicName
()
{
return
eventGridCustomTopic
;
}
private
boolean
publishToEventGridEnabled
;
private
String
eventGridCustomTopic
;
public
EventGridConfig
(
@Value
(
"#{new Boolean('${azure.publishToEventGrid:false}')}"
)
boolean
publish
,
@Value
(
"#{new String('${azure.eventGridTopic:schema-change-alert}')}"
)
String
topicName
)
{
if
(
publish
)
{
if
((
topicName
.
isEmpty
()))
{
public
EventGridConfig
(
@Value
(
"#{new Boolean('${azure.eventGrid.enabled:false}')}"
)
boolean
publish
,
@Value
(
"#{new String('${azure.eventGrid.topicName:schemachangedtopic}')}"
)
String
topicName
)
{
if
(
publish
&&
StringUtils
.
isEmpty
(
topicName
))
{
throw
new
RuntimeException
(
"Missing EventGrid Configuration"
);
}
}
this
.
publishToE
ventGridEnabled
=
publish
;
this
.
e
ventGridEnabled
=
publish
;
this
.
eventGridCustomTopic
=
topicName
;
}
...
...
provider/schema-azure/src/main/java/org/opengroup/osdu/schema/azure/impl/messagebus/MessageBusImpl.java
View file @
93d2fc33
...
...
@@ -5,7 +5,6 @@ import java.util.Collections;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.UUID
;
import
org.joda.time.DateTime
;
import
org.opengroup.osdu.azure.eventgrid.EventGridTopicStore
;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
...
...
@@ -33,40 +32,40 @@ public class MessageBusImpl implements IMessageBus {
@Autowired
private
AuditLogger
auditLogger
;
@Autowired
private
JaxRsDpsLog
log
;
DpsHeaders
headers
;
private
final
static
String
EVENT_DATA_VERSION
=
"1.0"
;
@Override
public
void
publishMessage
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
)
{
if
(
eventGridConfig
.
is
PublishTo
EventGridEnabled
())
{
public
void
publishMessage
(
String
schemaId
,
String
eventType
)
{
if
(
eventGridConfig
.
isEventGridEnabled
())
{
logger
.
info
(
"Generating event of type {}"
,
eventType
);
try
{
publishToEventGrid
(
headers
,
schemaId
,
eventType
);
publishToEventGrid
(
schemaId
,
eventType
);
auditLogger
.
schemaNotificationSuccess
(
Collections
.
singletonList
(
schemaId
));
}
catch
(
AppException
ex
)
{
//We do not want to fail schema creation if notification delivery has failed, hence just logging the exception
auditLogger
.
schemaNotificationFailure
(
Collections
.
singletonList
(
schemaId
));
log
.
warning
(
SchemaConstants
.
SCHEMA_NOTIFICATION_FAILED
);
log
ger
.
warning
(
SchemaConstants
.
SCHEMA_NOTIFICATION_FAILED
);
}
}
else
{
logger
.
info
(
"
Schema
event notification is turned off."
);
logger
.
info
(
Schema
Constants
.
SCHEMA_NOTIFICATION_IS_DISABLED
);
}
}
private
void
publishToEventGrid
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
)
{
private
void
publishToEventGrid
(
String
schemaId
,
String
eventType
)
{
List
<
EventGridEvent
>
eventsList
=
new
ArrayList
<>();
HashMap
<
String
,
Object
>
data
=
new
HashMap
<>();
data
.
put
(
SchemaConstants
.
KIND
,
schemaId
);
data
.
put
(
DpsHeaders
.
ACCOUNT_ID
,
headers
.
getPartitionIdWithFallbackToAccountId
());
data
.
put
(
DpsHeaders
.
DATA_PARTITION_ID
,
headers
.
getPartitionId
WithFallbackToAccountId
());
data
.
put
(
DpsHeaders
.
DATA_PARTITION_ID
,
headers
.
getPartitionId
());
data
.
put
(
DpsHeaders
.
CORRELATION_ID
,
headers
.
getCorrelationId
());
HashMap
<
String
,
Object
>
pubsubMessage
=
new
HashMap
<>();
...
...
provider/schema-azure/src/main/resources/application.properties
View file @
93d2fc33
...
...
@@ -68,5 +68,5 @@ azure.activedirectory.app-resource-id=${aad_client_id}
shared.tenant.name
=
opendes
# Azure Event Grid Configuration
azure.
publishToEventGri
d
=
${event_grid_enabled}
azure.eventGrid
T
opic
=
${event_grid_topic}
azure.
eventGrid.enable
d
=
${event_grid_enabled}
azure.eventGrid
.t
opic
Name
=
${event_grid_topic}
provider/schema-azure/src/test/java/org/opengroup/osdu/schema/azure/impl/messagebus/MessageBusImplTest.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.azure.impl.messagebus
;
import
static
org
.
hamcrest
.
CoreMatchers
.
equalTo
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
mockito
.
ArgumentMatchers
.
any
;
import
static
org
.
mockito
.
ArgumentMatchers
.
anyList
;
import
static
org
.
mockito
.
ArgumentMatchers
.
anyString
;
...
...
@@ -9,10 +14,12 @@ import static org.mockito.Mockito.times;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
mockito
.
MockitoAnnotations
.
initMocks
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.mockito.ArgumentCaptor
;
import
org.mockito.InjectMocks
;
import
org.mockito.Mock
;
import
org.mockito.junit.jupiter.MockitoExtension
;
...
...
@@ -20,8 +27,10 @@ import org.opengroup.osdu.azure.eventgrid.EventGridTopicStore;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.schema.azure.di.EventGridConfig
;
import
org.opengroup.osdu.schema.constants.SchemaConstants
;
import
org.opengroup.osdu.schema.logging.AuditLogger
;
import
com.microsoft.azure.eventgrid.models.EventGridEvent
;
import
com.microsoft.azure.servicebus.primitives.ServiceBusException
;
@ExtendWith
(
MockitoExtension
.
class
)
...
...
@@ -31,29 +40,27 @@ public class MessageBusImplTest {
private
static
final
String
CORRELATION_ID
=
"correlation-id"
;
private
static
final
String
PARTITION_ID
=
"partition-id"
;
@Mock
private
EventGridTopicStore
eventGridTopicStore
;
@Mock
private
EventGridConfig
eventGridConfig
;
@Mock
private
DpsHeaders
dpsHeaders
;
@Mock
private
JaxRsDpsLog
logger
;
@Mock
private
AuditLogger
auditLogger
;
@InjectMocks
private
MessageBusImpl
messageBusImpl
;
@Before
public
void
init
()
throws
ServiceBusException
,
InterruptedException
{
initMocks
(
this
);
doReturn
(
DATA_PARTITION_WITH_FALLBACK_ACCOUNT_ID
).
when
(
dpsHeaders
).
getPartitionIdWithFallbackToAccountId
();
doReturn
(
PARTITION_ID
).
when
(
dpsHeaders
).
getPartitionId
();
doReturn
(
CORRELATION_ID
).
when
(
dpsHeaders
).
getCorrelationId
();
...
...
@@ -61,32 +68,40 @@ public class MessageBusImplTest {
@Test
public
void
should_publishToEventGrid_WhenFlagIsFalse
()
{
//The schema-notification is turned off
when
(
this
.
eventGridConfig
.
isPublishToEventGridEnabled
()).
thenReturn
(
false
);
when
(
this
.
eventGridConfig
.
isEventGridEnabled
()).
thenReturn
(
false
);
//Call publish Message
messageBusImpl
.
publishMessage
(
dpsHeaders
,
"dummy"
,
"dummy"
);
messageBusImpl
.
publishMessage
(
"dummy"
,
"dummy"
);
//Assert that eventGridTopicStore is not called even once
verify
(
this
.
eventGridTopicStore
,
times
(
0
)).
publishToEventGridTopic
(
any
(),
any
(),
anyList
());
}
@Test
public
void
should_publishToEventGrid_WhenFlagIsTrue
()
{
//The schema-notification is turned off
when
(
this
.
eventGridConfig
.
isPublishToEventGridEnabled
()).
thenReturn
(
true
);
when
(
this
.
eventGridConfig
.
isEventGridEnabled
()).
thenReturn
(
true
);
//The schema-notification is turned off
when
(
this
.
eventGridConfig
.
getCustomTopicName
()).
thenReturn
(
"dummy-topic"
);
//The schema-notification is turned off
doNothing
().
when
(
this
.
eventGridTopicStore
).
publishToEventGridTopic
(
anyString
(),
anyString
(),
anyList
());;
ArgumentCaptor
<
ArrayList
<
EventGridEvent
>>
captorList
=
ArgumentCaptor
.
forClass
(
ArrayList
.
class
);
//Call publish Message
messageBusImpl
.
publishMessage
(
dpsHeaders
,
"dummy"
,
"dummy"
);
//Assert that eventGridTopicStore is not called even once
verify
(
this
.
eventGridTopicStore
,
times
(
1
)).
publishToEventGridTopic
(
any
(),
any
(),
anyList
());
HashMap
<
String
,
Object
>
data
=
new
HashMap
<>();
data
.
put
(
SchemaConstants
.
KIND
,
"dummy"
);
data
.
put
(
DpsHeaders
.
ACCOUNT_ID
,
DATA_PARTITION_WITH_FALLBACK_ACCOUNT_ID
);
data
.
put
(
DpsHeaders
.
DATA_PARTITION_ID
,
PARTITION_ID
);
data
.
put
(
DpsHeaders
.
CORRELATION_ID
,
CORRELATION_ID
);
//Call publish Message
messageBusImpl
.
publishMessage
(
"dummy"
,
"dummy"
);
//Assert that eventGridTopicStore is called once
verify
(
this
.
eventGridTopicStore
,
times
(
1
)).
publishToEventGridTopic
(
anyString
(),
anyString
(),
captorList
.
capture
());
ArrayList
<
EventGridEvent
>
eventGridList
=
captorList
.
getValue
();
assertNotNull
(
eventGridList
);
assertThat
(
eventGridList
.
size
(),
is
(
equalTo
(
1
)));
assertEquals
(
eventGridList
.
get
(
0
).
data
(),
data
);
}
...
...
provider/schema-azure/src/test/java/org/opengroup/osdu/schema/provider/azure/di/EventGridConfigTest.java
View file @
93d2fc33
...
...
@@ -19,6 +19,17 @@ public class EventGridConfigTest {
// Positive Case
EventGridConfig
eventGridConfig
=
new
EventGridConfig
(
true
,
VALID_TOPIC_NAME
);
assertEquals
(
VALID_TOPIC_NAME
,
eventGridConfig
.
getCustomTopicName
());
assertEquals
(
true
,
eventGridConfig
.
isEventGridEnabled
());
// Positive Case
eventGridConfig
=
new
EventGridConfig
(
false
,
VALID_TOPIC_NAME
);
assertEquals
(
VALID_TOPIC_NAME
,
eventGridConfig
.
getCustomTopicName
());
assertEquals
(
false
,
eventGridConfig
.
isEventGridEnabled
());
eventGridConfig
=
new
EventGridConfig
(
false
,
INVALID_TOPIC_NAME
);
assertEquals
(
INVALID_TOPIC_NAME
,
eventGridConfig
.
getCustomTopicName
());
assertEquals
(
false
,
eventGridConfig
.
isEventGridEnabled
());
// Negative Cases
RuntimeException
runtimeException
=
Assertions
.
assertThrows
(
RuntimeException
.
class
,
...
...
provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/messagebus/MessageBusImpl.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.impl.messagebus
;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.schema.provider.interfaces.messagebus.IMessageBus
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
...
...
@@ -13,7 +12,7 @@ public class MessageBusImpl implements IMessageBus{
private
JaxRsDpsLog
logger
;
@Override
public
void
publishMessage
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
)
{
public
void
publishMessage
(
String
schemaId
,
String
eventType
)
{
// TODO Auto-generated method stub
logger
.
warning
(
"publish message not implemented yet"
);
...
...
provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/MessageBusImpl.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.provider.ibm
;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.schema.provider.interfaces.messagebus.IMessageBus
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
...
...
@@ -13,7 +12,7 @@ public class MessageBusImpl implements IMessageBus{
private
JaxRsDpsLog
logger
;
@Override
public
void
publishMessage
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
)
{
public
void
publishMessage
(
String
schemaId
,
String
eventType
)
{
// TODO Auto-generated method stub
logger
.
warning
(
"publish message not implemented yet"
);
...
...
schema-core/src/main/java/org/opengroup/osdu/schema/constants/SchemaConstants.java
View file @
93d2fc33
...
...
@@ -76,6 +76,7 @@ public class SchemaConstants {
public
static
final
String
EMPTY_ID
=
"The id provided is empty"
;
public
static
final
String
SCHEMA_CREATION_FAILED
=
"Schema creation failed"
;
public
static
final
String
SCHEMA_NOTIFICATION_FAILED
=
"Failed to publish the schema notification."
;
public
static
final
String
SCHEMA_NOTIFICATION_IS_DISABLED
=
"Schema event notification is turned off."
;
public
static
final
String
SCHEMA_UPDATE_FAILED
=
"Schema updation failed"
;
public
static
final
String
SCHEMA_UPDATE_EXCEPTION
=
"Only schema in developement stage can be updated"
;
public
static
final
String
SCHEMA_PUT_CREATE_EXCEPTION
=
"Only schema in developement stage can be created through put"
;
...
...
schema-core/src/main/java/org/opengroup/osdu/schema/provider/interfaces/messagebus/IMessageBus.java
View file @
93d2fc33
package
org.opengroup.osdu.schema.provider.interfaces.messagebus
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
public
interface
IMessageBus
{
void
publishMessage
(
DpsHeaders
headers
,
String
schemaId
,
String
eventType
);
void
publishMessage
(
String
schemaId
,
String
eventType
);
}
\ No newline at end of file
schema-core/src/main/java/org/opengroup/osdu/schema/service/serviceimpl/SchemaService.java
View file @
93d2fc33
...
...
@@ -10,11 +10,9 @@ import java.util.LinkedList;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
import
org.json.JSONException
;
import
org.opengroup.osdu.core.common.logging.JaxRsDpsLog
;
import
org.opengroup.osdu.core.common.model.http.AppException
;
import
org.opengroup.osdu.core.common.model.http.DpsHeaders
;
import
org.opengroup.osdu.schema.constants.SchemaConstants
;
import
org.opengroup.osdu.schema.enums.SchemaScope
;
...
...
@@ -43,12 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.stereotype.Service
;
import
com.fasterxml.jackson.core.JsonParseException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonMappingException
;
import
com.google.gson.Gson
;
import
lombok.RequiredArgsConstructor
;
/**
...
...
@@ -156,7 +152,7 @@ public class SchemaService implements ISchemaService {
SchemaInfo
schemaInfo
=
schemaInfoStore
.
createSchemaInfo
(
schemaRequest
);
schemaStore
.
createSchema
(
schemaId
,
schema
);
auditLogger
.
schemaRegisteredSuccess
(
Collections
.
singletonList
(
schemaRequest
.
toString
()));
messageBus
.
publishMessage
(
headers
,
schemaId
,
SchemaConstants
.
SCHEMA_CREATE_EVENT_TYPE
);
messageBus
.
publishMessage
(
schemaId
,
SchemaConstants
.
SCHEMA_CREATE_EVENT_TYPE
);
return
schemaInfo
;
}
catch
(
ApplicationException
ex
)
{
auditLogger
.
schemaRegisteredFailure
(
...
...
@@ -214,7 +210,7 @@ public class SchemaService implements ISchemaService {
SchemaInfo
schInfo
=
schemaInfoStore
.
updateSchemaInfo
(
schemaRequest
);
auditLogger
.
schemaUpdatedSuccess
(
Collections
.
singletonList
(
schemaRequest
.
toString
()));
schemaStore
.
createSchema
(
schemaRequest
.
getSchemaInfo
().
getSchemaIdentity
().
getId
(),
schema
);
messageBus
.
publishMessage
(
headers
,
createdSchemaId
,
SchemaConstants
.
SCHEMA_UPDATE_EVENT_TYPE
);
messageBus
.
publishMessage
(
createdSchemaId
,
SchemaConstants
.
SCHEMA_UPDATE_EVENT_TYPE
);
log
.
info
(
SchemaConstants
.
SCHEMA_UPDATED
);
return
schInfo
;
}
else
{
...
...
schema-core/src/test/java/org/opengroup/osdu/schema/service/serviceimpl/SchemaServiceTest.java
View file @
93d2fc33
...
...
@@ -175,7 +175,7 @@ public class SchemaServiceTest {
assertEquals
(
SchemaStatus
.
PUBLISHED
,
schemaService
.
createSchema
(
schReqPubInt
).
getStatus
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -205,7 +205,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaInfoStore
.
createSchemaInfo
(
schReq
))
.
thenReturn
(
schInfo
);
assertEquals
(
schInfo
,
schemaService
.
createSchema
(
schReq
));
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -234,7 +234,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaStore
.
createSchema
(
Mockito
.
anyString
(),
Mockito
.
anyString
()))
.
thenThrow
(
ApplicationException
.
class
);
schemaService
.
createSchema
(
schReq
);
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -264,7 +264,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaStore
.
createSchema
(
Mockito
.
anyString
(),
Mockito
.
anyString
())).
thenReturn
(
"{}"
);
Mockito
.
when
(
schemaInfoStore
.
createSchemaInfo
(
schReqPub
)).
thenReturn
(
schInfoPub
);
assertEquals
(
SchemaStatus
.
PUBLISHED
,
schemaService
.
createSchema
(
schReqPub
).
getStatus
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
anyString
(),
anyString
());
}
...
...
@@ -286,7 +286,7 @@ public class SchemaServiceTest {
.
thenReturn
(
true
);
Mockito
.
when
(
schemaInfoStore
.
isUnique
(
schemaId
,
tenantId
)).
thenReturn
(
false
);
schemaService
.
createSchema
(
getMockSchemaObject_published
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -304,7 +304,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaInfoStore
.
getLatestMinorVerSchema
(
getMockSchemaInfo_Published_InternalScope
()))
.
thenReturn
(
latestSchema
);
schemaService
.
createSchema
(
schReqBreakingChange
);
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -339,7 +339,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaInfoStore
.
createSchemaInfo
(
mockSchReqPubInt
))
.
thenReturn
(
mockSchInfoPubInt
);
assertEquals
(
mockSchInfoPubInt
,
schemaService
.
createSchema
(
mockSchReqPubInt
));
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
any
(
DpsHeaders
.
class
),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -361,7 +361,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
entityTypeService
.
checkAndRegisterEntityTypeIfNotPresent
(
schReqPub
.
getSchemaInfo
().
getSchemaIdentity
().
getEntityType
())).
thenReturn
(
false
);
schemaService
.
createSchema
(
schReqPub
);
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -382,7 +382,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
entityTypeService
.
checkAndRegisterEntityTypeIfNotPresent
(
schReqPub
.
getSchemaInfo
().
getSchemaIdentity
().
getEntityType
())).
thenReturn
(
true
);
schemaService
.
createSchema
(
schReqPub
);
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -403,7 +403,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
entityTypeService
.
checkAndRegisterEntityTypeIfNotPresent
(
schReqPub
.
getSchemaInfo
().
getSchemaIdentity
().
getEntityType
())).
thenReturn
(
true
);
schemaService
.
createSchema
(
schReqPub
);
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -417,7 +417,7 @@ public class SchemaServiceTest {
when
(
schemaInfoStore
.
isUnique
(
schemaId
,
"common"
)).
thenReturn
(
false
);
when
(
schemaInfoStore
.
isUnique
(
schemaId
,
"tenant"
)).
thenReturn
(
false
);
schemaService
.
createSchema
(
getMockSchemaObject_published
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
@@ -439,7 +439,7 @@ public class SchemaServiceTest {
fail
(
"Should not succeed"
);
}
catch
(
BadRequestException
e
)
{
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
assertEquals
(
SchemaConstants
.
SCHEMA_UPDATE_EXCEPTION
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
fail
(
"Should not get different exception"
);
...
...
@@ -464,7 +464,7 @@ public class SchemaServiceTest {
fail
(
"Should not succeed"
);
}
catch
(
BadRequestException
e
)
{
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
assertEquals
(
SchemaConstants
.
SCHEMA_PUT_CREATE_EXCEPTION
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
fail
(
"Should not get different exception"
);
...
...
@@ -489,7 +489,7 @@ public class SchemaServiceTest {
fail
(
"Should not succeed"
);
}
catch
(
NoSchemaFoundException
e
)
{
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
assertEquals
(
SchemaConstants
.
INVALID_SCHEMA_UPDATE
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
fail
(
"Should not get different exception"
);
...
...
@@ -516,7 +516,7 @@ public class SchemaServiceTest {
fail
(
"Should not succeed"
);
}
catch
(
BadRequestException
e
)
{
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
0
)).
publishMessage
(
anyString
(),
anyString
());
assertEquals
(
SchemaConstants
.
SCHEMA_PUT_CREATE_EXCEPTION
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
fail
(
"Should not get different exception"
);
...
...
@@ -532,7 +532,7 @@ public class SchemaServiceTest {
Mockito
.
when
(
schemaInfoStore
.
updateSchemaInfo
(
getMockSchemaObject_Development
()))
.
thenReturn
(
getMockSchemaInfo_development_status
());
assertNotNull
(
schemaService
.
updateSchema
(
getMockSchemaObject_Development
()));
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
any
(),
anyString
(),
anyString
());
verify
(
messageBus
,
times
(
1
)).
publishMessage
(
anyString
(),
anyString
());
}
@Test
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment