US92090: REST APIs for resource connector configuration #98

sanjeevchopra · 2017-03-13T18:05:15Z

No description provided.

sanjeevchopra

@irinaepshteyn submitting this for initial comments. I am still reviewing other classes.

sanjeevchopra · 2017-03-13T18:33:29Z

.../main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorException.java

@@ -0,0 +1,18 @@
+package com.ge.predix.acs.attribute.connector.management;
+
+public class AttributeConnectorException extends RuntimeException {


We are using this as a checked exception, not runtime. should extend Exception

It's not a true checked exception since we don't have throws in service methods. Also, converting it to checked exception will not work with a stream used to validate adapter configuration:
connector.getAdapters().parallelStream().forEach(adapter -> {
validateAdapterEntityOrFail(adapter);
});
I would rather keep this exception as runtime.

sanjeevchopra · 2017-03-13T18:35:23Z

...rc/main/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorService.java

+
+import com.ge.predix.acs.rest.AttributeConnector;
+
+public interface AttributeConnectorService {


minor: not sure if it's worth having a interface for this. Given its not a user visible, class and we only have one implementation for it. We could add a interface when we need a 2nd implementation

I would leave the interface for consistency with other ACS services

sanjeevchopra · 2017-03-13T18:47:11Z

...ain/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java

+    }
+
+    private void validateAdapterEntityOrFail(final AttributeAdapterConnection adapter) {
+        if (adapter == null) {


this cannot be null

sanjeevchopra · 2017-03-13T18:49:18Z

...ain/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java

+        if (adapter == null) {
+            throw new AttributeConnectorException("Attribute connector configuration requires at least one adapter");
+        }
+        if (adapter.getAdapterEndpoint() == null || adapter.getAdapterEndpoint().isEmpty()) {


maybe this is what you are referring to earlier - a lot of this validation can be enforced via jackson using annotations on the AttributeAdapterConnection bean. I believe, by default, a field is required, unless you mark it as optional.

sanjeevchopra · 2017-03-13T18:53:23Z

...ain/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceImpl.java

+        if (connector.getAdapters() == null || connector.getAdapters().isEmpty()) {
+            throw new AttributeConnectorException("Attribute connector configuration requires at least one adapter");
+        }
+        if (connector.getMaxCachedIntervalMinutes() < CACHED_INTERVAL_THRESHOLD_MINUTES) {


lets use jackson for all this validation. Also, if the value of maxCachedIntervalMinutes is not set - it should default to 480 minutes (8hrs). I propose a minimum of 60 mins ?

To unblock other pull requests that depend on this story I would address input validation as a separate story.

sanjeevchopra

Few more comments - i am done with my review.

sanjeevchopra · 2017-03-13T19:02:37Z

service/src/main/resources/security-config.xml

    </http>

+    <!-- Authorization Configuration For V1 subject APIS -->
+    <http pattern="/v1/connector/**" request-matcher="ant" create-session="stateless"


/v1/connector/* ?

sanjeevchopra · 2017-03-13T19:08:56Z

...est/java/com/ge/predix/acs/attribute/connector/management/AttributeConnectorServiceTest.java

+    }
+
+    @Test
+    public void testCreateResourceConnector() {


this is and other tests should check affected values in the connector/adapter which was created/updated or removed.

sanjeevchopra · 2017-03-13T20:31:30Z

...on-tests/src/test/java/com/ge/predix/integration/test/AttributeConnectorConfigurationIT.java

+        }
+
+        try {
+            this.zone1ConnectorReadClient.exchange(this.acsUrl + V1 + RESOURCE_CONNECTOR_URL, HttpMethod.GET,


please add asserts for expected values on connector/adapter properties

sanjeevchopra · 2017-03-13T20:41:22Z

service/src/test/java/com/ge/predix/controller/test/AttributeConnectorControllerIT.java

+    }
+
+    @Test
+    public void testCreateResourceConnectorWithCacheaIntervalBelowThreshold() throws Exception {


the validation tests here should suffice, if we use jackson for validation. Please remove any similar validation tests from the unit test - AttributeConnectorServiceTest

sanjeevchopra · 2017-03-13T22:42:25Z

model/src/main/java/com/ge/predix/acs/rest/AttributeConnector.java

+
+    private Set<AttributeAdapterConnection> adapters;
+
+    public boolean getIsActive() {


please rename to isActive. Also, this needs to be saved to the database

Renaming getIsActive to isActive breaks json serialization. isActive will be serialized to active unless we use isIsActive instead.

To unblock other pull requests that depend on this story I would handle persisting isActive as a separate story.

irinaepshteyn · 2017-03-14T19:52:51Z

All tasts PASSed:

https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-build-pullrequest/72/

https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-integration-pullrequest/235/
https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-integration-pullrequest/236/
https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-integration-pullrequest/237/
https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-integration-pullrequest/239/

Signed-off-by: Frank <[email protected]>

sanjeevchopra commented Mar 13, 2017

View reviewed changes

sanjeevchopra changed the title ~~creating a PR for review only~~ for review only: config API for connectors Mar 13, 2017

sanjeevchopra commented Mar 13, 2017

View reviewed changes

irinaepshteyn force-pushed the US92090 branch 3 times, most recently from 55f8438 to 1522538 Compare March 14, 2017 18:07

US92090: REST APIs for attribute connector config

d631b0e

Signed-off-by: Frank <[email protected]>

irinaepshteyn force-pushed the US92090 branch from c1cee2e to d631b0e Compare March 15, 2017 17:41

FrankGasparovic changed the title ~~for review only: config API for connectors~~ US92090: Config API for connectors Mar 15, 2017

FrankGasparovic changed the title ~~US92090: Config API for connectors~~ US92090: REST APIs for resource connector configuration Mar 15, 2017

FrankGasparovic merged commit d97afdd into develop Mar 15, 2017

anubhavi25 deleted the US92090 branch March 16, 2017 22:57

		@@ -0,0 +1,18 @@
		package com.ge.predix.acs.attribute.connector.management;

		public class AttributeConnectorException extends RuntimeException {


		import com.ge.predix.acs.rest.AttributeConnector;

		public interface AttributeConnectorService {


		private Set<AttributeAdapterConnection> adapters;

		public boolean getIsActive() {

US92090: REST APIs for resource connector configuration #98

US92090: REST APIs for resource connector configuration #98

Uh oh!

Conversation

sanjeevchopra commented Mar 13, 2017

Uh oh!

sanjeevchopra left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sanjeevchopra left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

irinaepshteyn commented Mar 14, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants