US87141: Added JPA Entities for AttributeConnector and AttributeAdapterConnection #92

FrankGasparovic · 2017-03-01T22:10:54Z

FrankGasparovic · 2017-03-02T17:15:24Z

Tests passed https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-build-pullrequest/badge/icon

anurag-gujral · 2017-03-02T18:10:19Z

...ce/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeAdapterConnectionEntity.java

+    @Column(name = "adapter_endpoint", nullable = false)
+    private String adapterEndpoint;
+
+    @Column(name = "adapter_token_url", nullable = false)


Possibly see if you can move annotations as applicable from fields to getters

See other related comment,

anurag-gujral · 2017-03-02T18:10:57Z

...ce/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeAdapterConnectionEntity.java

+        this.adapterClientSecret = uaaClientSecret;
+    }
+
+    public AttributeAdapterConnectionEntity() {


Do we need this? if needed can we make it private since we dont have setters?

It needs to be public if we have the @entity annotation

anurag-gujral · 2017-03-02T18:11:39Z

service/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeConnectorEntity.java

+@Table(name = "attribute_connector")
+public class AttributeConnectorEntity {
+    @Id
+    @Column(name = "id")


Is is possible to move annotations on getters which I believe is a better practice read stackoverflow or google for more details?

It looks like unit tests are not passing when we make this move.

anurag-gujral · 2017-03-02T18:13:46Z

service/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeConnectorEntity.java

+    private long id;
+
+    @Column(name = "refresh_interval_hours", nullable = true)
+    private int refreshIntervalHours;


Should we do it in seconds?

@sanjeevchopra discussed with me he wanted the field in the ACS API to be in hours so that the minimum time they can pass is 1 hour. Sanjeev, what do you think? We could:

Change customer field in the public API to be in seconds

Convert from hours to seconds when we store in the DB

Keep it the way it is

lets discuss

I suggested this to force a minimum cache time of 1 hour as a design pre-req.

To provide flexibility, we can use minutes and enforce a minimum of 60 mins. In case someone doesn't care about latency. Default should be probably 8 hours.

on a side not maxCacheIntervalMintues maybe more clear as a name

anurag-gujral · 2017-03-02T18:17:51Z

...ce/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeAdapterConnectionEntity.java

+    @JoinColumn(name = "connector_id", referencedColumnName = "id", nullable = false, updatable = false)
+    private AttributeConnectorEntity connector;
+
+    @Column(name = "adapter_endpoint", nullable = false)


Looks like we have not specified length for the endpoint, please check other fields as well.

Added length of 128

sanjeevchopra · 2017-03-03T01:10:27Z

service/src/main/resources/db/postgres/V3_0_0__add_attribute_connectors.sql

+  adapter_client_id varchar(128) NOT NULL
+);
+
+ALTER TABLE authorization_zone ADD COLUMN resource_attribute_connector integer NULL;


this column should be same type as the one it links to - attribute_connector(id)

Agreed that foreign keys must have the same type of the referenced column's type. However, for postgres attribute_connector(id) is defined as bigserial. We can't use this type when defining a nullable foreign key for zone entity as bigserial does not support nullability. Since bigserial is just a wrapper for bigint to support auto-generating sequencing, decided to use bigint for foreign key definition.

sanjeevchopra · 2017-03-03T01:10:57Z

service/src/main/resources/db/postgres/V3_0_0__add_attribute_connectors.sql

+
+ALTER TABLE authorization_zone ADD COLUMN resource_attribute_connector integer NULL;
+ALTER TABLE authorization_zone ADD FOREIGN KEY (resource_attribute_connector) REFERENCES attribute_connector(id) ON DELETE CASCADE;
+ALTER TABLE authorization_zone ADD COLUMN subject_attribute_connector integer NULL;


same as above

sanjeevchopra · 2017-03-03T01:21:39Z

service/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeConnectorEntity.java

+    private long id;
+
+    @Column(name = "refresh_interval_hours", nullable = true)
+    private int refreshIntervalHours;


lets discuss

I suggested this to force a minimum cache time of 1 hour as a design pre-req.

To provide flexibility, we can use minutes and enforce a minimum of 60 mins. In case someone doesn't care about latency. Default should be probably 8 hours.

on a side not maxCacheIntervalMintues maybe more clear as a name

sanjeevchopra · 2017-03-03T01:22:55Z

service/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeConnectorEntity.java

+        return this.refreshIntervalHours;
+    }
+
+    public Set<AttributeAdapterConnectionEntity> getAttributeAdapters() {


getAttributeAdapterConnections ?

sanjeevchopra · 2017-03-03T01:27:08Z

...ce/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeAdapterConnectionEntity.java

+    @JoinColumn(name = "connector_id", referencedColumnName = "id", nullable = false, updatable = false)
+    private AttributeConnectorEntity connector;
+
+    @Column(name = "adapter_endpoint", nullable = false, length = 128)


128 seems small - please double check other urls we store in acs/uaa. 256 ?

sanjeevchopra · 2017-03-03T01:27:56Z

...ce/src/main/java/com/ge/predix/acs/zone/management/dao/AttributeAdapterConnectionEntity.java

+        return adapterClientId;
+    }
+
+    public String getUaaClientSecret() {


Pls add a note here that this is temporary until encryption is implemented.

sanjeevchopra · 2017-03-03T19:10:23Z

service/src/test/java/com/ge/predix/acs/zone/management/ZoneRepositoryTest.java

+@EnableAutoConfiguration
+@ContextConfiguration(classes = { InMemoryDataSourceConfig.class })
+@ActiveProfiles(resolver = TestActiveProfilesResolver.class)
+public class ZoneRepositoryTest extends AbstractTransactionalTestNGSpringContextTests {


Consider any negative tests - missing required fields in adapter, field too long etc. Some may belong at the controller layer to assert the correct response codes.

We were thinking that this would be enforced at the controller level. In the rest api story we already have one test for this, and will add more.

ok, once you squash the commits I can merge

Ok it's good to go. Integration tests are passing locally (Jenkins tests won't pass because of connections issues). Please merge so that we can continue with Rest API story.

…erConnection Signed-off-by: Irina <[email protected]>

FrankGasparovic assigned anubhavi25 Mar 2, 2017

anurag-gujral reviewed Mar 2, 2017

View reviewed changes

sanjeevchopra suggested changes Mar 3, 2017

View reviewed changes

sanjeevchopra reviewed Mar 3, 2017

View reviewed changes

US87141: Added JPA Entities for AttributeConnector and AttributeAdapt…

74dc671

…erConnection Signed-off-by: Irina <[email protected]>

FrankGasparovic force-pushed the US87141 branch from 64b16d6 to 74dc671 Compare March 3, 2017 20:31

sanjeevchopra merged commit 61fa6ed into develop Mar 3, 2017

sanjeevchopra deleted the US87141 branch March 3, 2017 21:10

sanjeevchopra self-assigned this Mar 18, 2017

US87141: Added JPA Entities for AttributeConnector and AttributeAdapterConnection #92

US87141: Added JPA Entities for AttributeConnector and AttributeAdapterConnection #92

Uh oh!

Conversation

FrankGasparovic commented Mar 1, 2017

Uh oh!

FrankGasparovic commented Mar 2, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FrankGasparovic Mar 2, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

FrankGasparovic Mar 2, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

FrankGasparovic Mar 2, 2017 •

edited

Loading

FrankGasparovic Mar 2, 2017 •

edited

Loading