Skip to content

Commit 64f27d0

Browse files
bencartbencart
authored
Merge pull request #30 from nsip/master
Updated to v0.12.0
2 parents cc1a061 + 2a05233 commit 64f27d0

File tree

47 files changed

+536
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+536
-448
lines changed

‎SIF3InfraREST/README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Project (note that the version number will change over time):
2525
<dependency>
2626
<groupId>sif3.framework</groupId>
2727
<artifactId>sif3-infra-rest</artifactId>
28-
<version>0.11.0</version>
28+
<version>0.12.0</version>
2929
</dependency>
3030
```
3131

@@ -157,6 +157,14 @@ Please refer to the release notes in the directory "release/v0.10.0" for additio
157157
**NOTE: There are database changes! You must read the detailed release notes in "release/v0.11.0" carefully to ensure that your
158158
project is upgraded properly to the new framework version.**
159159

160+
## Version from Sep 05, 2017: v0.12.0 - Various changes
161+
- Changes to the way hibernate properties are configured for the SIF3 Framework. The change ensured that projects that use hibernate
162+
do not have conflicts with the framework's hibernate settings.
163+
- Make TLS version a property in environment.properties.
164+
165+
**Please refer to the detailed release notes in "release/v0.12.0" carefully to ensure that your project is upgraded properly to the
166+
new framework version.**
167+
160168
# Download Instructions
161169
How to download this project:
162170

‎SIF3InfraREST/SIF3Demo/sif3-demo-web/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>sif3.framework</groupId>
99
<artifactId>sif3-demo-web</artifactId>
1010
<packaging>war</packaging>
11-
<version>0.11.0-Demo</version>
11+
<version>0.12.0-Demo</version>
1212
<name>SIF3 Demo Provider</name>
1313

1414
<!-- =============================== -->
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>sif3.framework</groupId>
4343
<artifactId>sif3-infra-rest</artifactId>
44-
<version>0.11.0-beta</version>
44+
<version>0.12.0-beta</version>
4545
</dependency>
4646

4747
<!-- ====================== -->

‎SIF3InfraREST/SIF3Demo/sif3-demo-web/src/main/java/systemic/sif3/demo/rest/consumer/AUDataModelEventConsumer.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,17 @@ public AUDataModelEventConsumer()
8585
* @see sif3.common.interfaces.EventConsumer#onEvent(sif3.common.model.SIFEvent, sif3.common.model.SIFZone, sif3.common.model.SIFContext, java.lang.String)
8686
*/
8787
@Override
88-
public void processEvent(SIFEvent<L> sifEvent, SIFZone zone, SIFContext context, EventMetadata metadata, String msgReadID, String consumerID)
88+
// public void processEvent(SIFEvent<L> sifEvent, SIFZone zone, SIFContext context, EventMetadata metadata, String msgReadID, String consumerID)
89+
public void processEvent(SIFEvent<L> sifEvent, EventMetadata metadata, String msgReadID, String consumerID)
8990
{
9091
String consumerName = getPrettyName()+"(QueueID:"+msgReadID+"; ConsumerID: "+consumerID+")";
9192

9293
// We know from the framework that zone and context is never null. For the time being we just log the event.
93-
logger.debug(consumerName +" received an event from Zone = "+zone.getId()+", Context = "+context.getId()+" and Event Metadata = "+metadata);
94+
SIFZone zone = sifEvent.getLimitToZoneCtxList().get(0).getZone();
95+
SIFContext context = sifEvent.getLimitToZoneCtxList().get(0).getContext();
96+
97+
// logger.debug(consumerName +" received an event from Zone = "+zone.getId()+", Context = "+context.getId()+" and Event Metadata = "+metadata);
98+
logger.debug(consumerName +" received an event from Zone = "+zone+", Context = "+context+" and Event Metadata = "+metadata);
9499
dumpObject(sifEvent, zone, context, msgReadID, consumerID);
95100

96101
// Pretend to be busy for a long time to test threading

‎SIF3InfraREST/SIF3Demo/sif3-demo-web/src/main/java/systemic/sif3/demo/rest/consumer/CSVStudentConsumer.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,15 @@ public SIFEvent<String> createEventObject(Object sifObjectList, EventAction even
181181
* @see sif3.infra.rest.consumer.AbstractEventConsumer#processEvent(sif3.common.model.SIFEvent, sif3.common.model.SIFZone, sif3.common.model.SIFContext, sif3.common.model.EventMetadata, java.lang.String, java.lang.String)
182182
*/
183183
@Override
184-
public void processEvent(SIFEvent<String> sifEvent, SIFZone zone, SIFContext context, EventMetadata metadata, String msgReadID, String consumerID)
184+
// public void processEvent(SIFEvent<L> sifEvent, SIFZone zone, SIFContext context, EventMetadata metadata, String msgReadID, String consumerID)
185+
public void processEvent(SIFEvent<String> sifEvent, EventMetadata metadata, String msgReadID, String consumerID)
185186
{
186187
// We know from the framework that zone and context is never null. For the time being we just log the event.
187188
String timestamp = DateUtils.getISO8601withSecFraction(new Date());
189+
SIFZone zone = sifEvent.getLimitToZoneCtxList().get(0).getZone();
190+
SIFContext context = sifEvent.getLimitToZoneCtxList().get(0).getContext();
191+
188192
logger.debug(RECORD_MARKER+"Record processed by Thread ID = "+Thread.currentThread().getId()+"\n"+sifEvent.getEventAction().name()+" Events from Queue Reader "+ msgReadID+"\nReceived at "+timestamp+" from Zone = "+zone.getId()+" and Context = "+context.getId()+"\nData:\n"+sifEvent.getSIFObjectList()+RECORD_MARKER);
189193
}
194+
190195
}

‎SIF3InfraREST/SIF3Demo/sif3-demo-web/src/test/java/sif3/test/infra/rest/consumer/TestCSVStudentConsumer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
public class TestCSVStudentConsumer
3434
{
3535
// private final static String PATH = "/Users/crub/dev/nsip/Users/crub/dev/nsip/sif3-framework-java-dev";
36-
private final static String PATH = "C:/DEV/eclipseWorkspace";
37-
// private final static String PATH = "C:/Development/GitHubRepositories/SIF3InfraRest";
36+
private final static String PATH = "C:/DEV/eclipseWorkspace/SIF3InfraREST";
37+
// private final static String PATH = "C:/Development/GitHubRepositories/SIF3InfraRest/SIF3InfraREST";
3838

39-
private final static String CSV_FILE_NAME = PATH + "/SIF3InfraREST/TestData/csv/input/CSVStudents.csv";
39+
private final static String CSV_FILE_NAME = PATH + "/TestData/csv/input/CSVStudents.csv";
4040
private static final String CONSUMER_ID = "StudentConsumer";
4141

4242
private void printResponses(List<Response> responses, CSVStudentConsumer consumer)

‎SIF3InfraREST/SIF3Demo/sif3-demo-web/src/test/java/sif3/test/infra/rest/consumer/TestStudentPersonalConsumer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public class TestStudentPersonalConsumer
5454
{
5555
// private final static String PATH = "/Users/crub/dev/nsip/Users/crub/dev/nsip/sif3-framework-java-dev";
5656
// private final static String PATH = "C:/DEV/lunaWorkspace";
57-
private final static String PATH = "C:/Development/GitHubRepositories/SIF3InfraRest";
57+
private final static String PATH = "C:/Development/GitHubRepositories/SIF3InfraRest/SIF3InfraREST";
5858

59-
private final static String SINGLE_STUDENT_FILE_NAME = PATH + "/SIF3InfraREST/TestData/xml/input/StudentPersonal.xml";
60-
private final static String MULTI_STUDENT_FILE_NAME = PATH + "/SIF3InfraREST/TestData/xml/input/StudentPersonals5.xml";
59+
private final static String SINGLE_STUDENT_FILE_NAME = PATH + "/TestData/xml/input/StudentPersonal.xml";
60+
private final static String MULTI_STUDENT_FILE_NAME = PATH + "/TestData/xml/input/StudentPersonals5.xml";
6161
// private static final String CONSUMER_ID = "SecureStudentConsumer";
6262
private static final String CONSUMER_ID = "StudentConsumer";
6363
// private static final String CONSUMER_ID = "HITSStudentConsumer";
@@ -170,8 +170,8 @@ private void createStudents(StudentPersonalConsumer consumer)
170170
StudentPersonalCollectionType students = getStudents((DataModelUnmarshalFactory)consumer.getUnmarshaller());
171171
try
172172
{
173-
// List<BulkOperationResponse<CreateOperationStatus>> responses = consumer.createMany(students, null, RequestType.IMMEDIATE);
174-
List<BulkOperationResponse<CreateOperationStatus>> responses = consumer.createMany(students, null, RequestType.DELAYED);
173+
List<BulkOperationResponse<CreateOperationStatus>> responses = consumer.createMany(students, null, RequestType.IMMEDIATE);
174+
// List<BulkOperationResponse<CreateOperationStatus>> responses = consumer.createMany(students, null, RequestType.DELAYED);
175175
if (responses != null)
176176
{
177177
int i = 1;

‎SIF3InfraREST/SIF3REST/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>sif3.framework</groupId>
99
<artifactId>sif3-framework</artifactId>
10-
<version>0.11.0-beta</version>
10+
<version>0.12.0-beta</version>
1111
</parent>
1212

1313
<!-- =========== -->

‎SIF3InfraREST/SIF3REST/src/main/java/sif3/infra/rest/client/ClientConfigMgr.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ private synchronized SSLContext getSSLContext()
208208

209209
try
210210
{
211-
sslCtx = SSLContext.getInstance("SSL");
211+
String protocol = props.getPropertyAsString("env.tls.version", "SSL");
212+
logger.debug("HTTPS Protocol to use: "+ protocol);
213+
sslCtx = SSLContext.getInstance(protocol);
212214
sslCtx.init(keystoreMgr, truststoreMgr, null);
213215
}
214216
catch (GeneralSecurityException ex)

‎SIF3InfraREST/SIF3REST/src/main/java/sif3/infra/rest/client/EventClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public BaseResponse sendEvents(SIFEvent<?> event, SIFZone zone, SIFContext conte
151151
HeaderProperties headerProps = getEventHeaders(event.getEventAction(), event.getUpdateType(), event.getFingerprint(), zone, context, customHdrFields);
152152

153153
Builder builder = setRequestHeaderAndMediaTypes(service, headerProps, false, false, true);
154-
logger.debug("Send Event with payload size: "+payloadStr.length());
154+
logger.debug("Send "+serviceName+" Event with payload size: "+payloadStr.length()+" to Zone = "+((zone == null) ? "default" : zone.getId())+" and Context = "+((context == null) ? "DEFAULT" : context.getId()));
155155
ClientResponse response = builder.post(ClientResponse.class, payloadStr);
156156
logger.debug("Receive Event Response Status: "+response.getStatus());
157157

‎SIF3InfraREST/SIF3REST/src/main/java/sif3/infra/rest/client/ObjectServiceClient.java‎

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ private BulkOperationResponse<CreateOperationStatus> setCreateBulkResponse(WebRe
600600
{
601601
BulkOperationResponse<CreateOperationStatus> response = new BulkOperationResponse<CreateOperationStatus>();
602602
setBaseResponseData(response, clientResponse, requestHeaders, zone, context, true, requestType, service.getURI().toString());
603-
if ((clientResponse.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) ||
603+
if ((clientResponse.getStatusInfo().getStatusCode() == Status.OK.getStatusCode()) ||
604+
(clientResponse.getStatusInfo().getStatusCode() == Status.CREATED.getStatusCode()) ||
604605
(clientResponse.getStatusInfo().getStatusCode() == Status.ACCEPTED.getStatusCode()) ||
605606
(clientResponse.getStatusInfo().getStatusCode() == Status.NO_CONTENT.getStatusCode()))
606607
{
@@ -610,37 +611,6 @@ private BulkOperationResponse<CreateOperationStatus> setCreateBulkResponse(WebRe
610611
MultiOperationStatusList<CreateOperationStatus> statusList = getInfraMapper().toStatusListFromSIFCreateString(payload, getResponseMediaType());
611612
response.setError(statusList.getError());
612613
response.setOperationStatuses(statusList.getOperationStatuses());
613-
614-
// try
615-
// {
616-
// //Because CreateResponseType is a Infrastructure thing we must ensure we use the Infrastructure Unmarshaller
617-
// CreateResponseType createManyResponse = (CreateResponseType)getInfraUnmarshaller().unmarshal(payload, CreateResponseType.class, getResponseMediaType());
618-
// if (createManyResponse == null)// this is strange. So set the unmarshalled value.
619-
// {
620-
// response.setError(new ErrorDetails(response.getStatus(), "Could not unmarshal payload. See error description for payload details.", payload));
621-
// }
622-
// else
623-
// {
624-
// response.setOperationStatuses(new ArrayList<CreateOperationStatus>());
625-
// for (CreateType createStatus : createManyResponse.getCreates().getCreate())
626-
// {
627-
// CreateOperationStatus opStatus = new CreateOperationStatus();
628-
// opStatus.setResourceID(createStatus.getId());
629-
// opStatus.setAdvisoryID(createStatus.getAdvisoryId());
630-
// opStatus.setStatus(toInt(createStatus.getStatusCode()));
631-
// opStatus.setError(convertFromErrorType(createStatus.getError()));
632-
// response.getOperationStatuses().add(opStatus);
633-
// }
634-
// }
635-
// }
636-
// catch (UnmarshalException ex)
637-
// {
638-
// response.setError(new ErrorDetails(response.getStatus(), "Could not unmarshal payload: "+ex.getMessage()+". See error description for payload details.", payload));
639-
// }
640-
// catch (UnsupportedMediaTypeExcpetion ex)
641-
// {
642-
// response.setError(new ErrorDetails(Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode(), "Could not unmarshal payload (unsupported media type): "+ex.getMessage()+". See error description for payload details.", payload));
643-
// }
644614
}
645615
}
646616
else// We are dealing with an error case.
@@ -670,35 +640,6 @@ private BulkOperationResponse<OperationStatus> setDeleteBulkResponse(WebResource
670640
response.setError(statusList.getError());
671641
response.setOperationStatuses(statusList.getOperationStatuses());
672642

673-
// try
674-
// {
675-
// //Because DeleteResponseType is a Infrastructure thing we must ensure we use the Infrastructure Unmarshaller
676-
// DeleteResponseType deleteManyResponse = (DeleteResponseType)getInfraUnmarshaller().unmarshal(payload, DeleteResponseType.class, getResponseMediaType());
677-
// if (deleteManyResponse == null)// this is strange. So set the unmarshalled value.
678-
// {
679-
// response.setError(new ErrorDetails(response.getStatus(), "Could not unmarshal payload. See error description for payload details.", payload));
680-
// }
681-
// else
682-
// {
683-
// response.setOperationStatuses(new ArrayList<OperationStatus>());
684-
// for (DeleteStatus deleteStatus : deleteManyResponse.getDeletes().getDelete())
685-
// {
686-
// OperationStatus opStatus = new OperationStatus();
687-
// opStatus.setResourceID(deleteStatus.getId());
688-
// opStatus.setStatus(toInt(deleteStatus.getStatusCode()));
689-
// opStatus.setError(convertFromErrorType(deleteStatus.getError()));
690-
// response.getOperationStatuses().add(opStatus);
691-
// }
692-
// }
693-
// }
694-
// catch (UnmarshalException ex)
695-
// {
696-
// response.setError(new ErrorDetails(response.getStatus(), "Could not unmarshal payload: "+ex.getMessage()+". See error description for payload details.", payload));
697-
// }
698-
// catch (UnsupportedMediaTypeExcpetion ex)
699-
// {
700-
// response.setError(new ErrorDetails(Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode(), "Could not unmarshal payload (unsupported media type): "+ex.getMessage()+". See error description for payload details.", payload));
701-
// }
702643
}
703644
}
704645
else// We are dealing with an error case.
@@ -792,37 +733,4 @@ private HeaderProperties addAuthenticationHdrProps(HeaderProperties hdrPropertie
792733

793734
return hdrProperties;
794735
}
795-
796-
// /*
797-
// * Caller MUST ensure that the requestHdrProperties are not null. They really shouldn't since this class is only called
798-
// * by the AbstractConsumer which must set a few header properties anyway.
799-
// */
800-
// private boolean isDelayedRequest(HeaderProperties requestHdrProperties)
801-
// {
802-
// String requestType = requestHdrProperties.getHeaderProperty(RequestHeaderConstants.HDR_REQUEST_TYPE);
803-
//
804-
// if (requestType != null)
805-
// {
806-
// return HeaderValues.RequestType.valueOf(requestType) == RequestType.DELAYED;
807-
// }
808-
//
809-
// // Nothing found => Assume IMMEDIATE
810-
// return false;
811-
// }
812-
//
813-
// /*
814-
// * Caller MUST ensure that the requestHdrProperties are not null. They really shouldn't since this class is only called
815-
// * by the AbstractConsumer which must set a few header properties anyway.
816-
// */
817-
// private ServiceType getServiceTypeFromRequestHeaders(HeaderProperties requestHdrProperties)
818-
// {
819-
// String serviceType = requestHdrProperties.getHeaderProperty(RequestHeaderConstants.HDR_SERVICE_NAME);
820-
//
821-
// if (serviceType != null)
822-
// {
823-
// return HeaderValues.ServiceType.valueOf(serviceType);
824-
// }
825-
//
826-
// return null;
827-
// }
828736
}

0 commit comments

Comments
 (0)