Remove subscriptionURI column from authorization table - Issue GreenB…

…uttonAlliance#140
SekharBeri · Aug 4, 2014 · 654e315 · 654e315
1 parent f3d7735
commit 654e315
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 70 deletions.
diff --git a/etc/datacustodianmysql.sql b/etc/datacustodianmysql.sql
@@ -353,7 +353,6 @@ CREATE TABLE `authorizations` (
  `scope` varchar(255) DEFAULT NULL,
  `state` varchar(255) DEFAULT NULL,
  `status` varchar(255) DEFAULT NULL,
- `subscriptionURI` varchar(255) DEFAULT NULL,
  `third_party` varchar(255) DEFAULT NULL,
  `tokenType` int(11) DEFAULT NULL,
  `application_information_id` bigint(20) DEFAULT NULL,

diff --git a/etc/prepopulatesql_applicationinformation_dc.sql b/etc/prepopulatesql_applicationinformation_dc.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost443.sql b/etc/prepopulatesql_applicationinformation_dc_localhost443.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql b/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql
diff --git a/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql b/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql
diff --git a/etc/thirdpartymysql.sql b/etc/thirdpartymysql.sql
@@ -354,7 +354,6 @@ CREATE TABLE `authorizations` (
  `scope` varchar(255) DEFAULT NULL,
  `state` varchar(255) DEFAULT NULL,
  `status` varchar(255) DEFAULT NULL,
- `subscriptionURI` varchar(255) DEFAULT NULL,
  `third_party` varchar(255) DEFAULT NULL,
  `tokenType` int(11) DEFAULT NULL,
  `application_information_id` bigint(20) DEFAULT NULL,

diff --git a/src/main/java/org/energyos/espi/common/domain/Authorization.java b/src/main/java/org/energyos/espi/common/domain/Authorization.java
@@ -98,7 +98,6 @@
 @XmlType(name = "Authorization", propOrder = {
  "authorizedPeriod",
  "publishedPeriod",
-// "retailCustomer",
  "accessToken",
  "status",
  "expiresIn",
@@ -114,7 +113,6 @@
  "errorUri",
  "resourceURI",
  "authorizationURI",
- "subscriptionURI",
  "thirdParty"
  })@Entity
 @Table(name = "authorizations")
@@ -233,8 +231,6 @@ public class Authorization
  @XmlTransient
  private ApplicationInformation applicationInformation;
 
- private String subscriptionURI; 
-
  public Subscription getSubscription () {
  return this.subscription;
  }
@@ -710,16 +706,8 @@ public void setApplicationInformation(ApplicationInformation applicationInformat
  this.applicationInformation = applicationInformation;
  }
 
- public void setSubscriptionURI(String subscriptionURI) {
- this.subscriptionURI = subscriptionURI;
- }
-
- public String getSubscriptionURI() {
- return subscriptionURI;
- }
-
  public String getSubscriptionId() {
- String[] pieces = subscriptionURI.split("/");
+ String[] pieces = resourceURI.split("/");
  return pieces[pieces.length-1];
  }
 
@@ -748,7 +736,6 @@ public void merge(IdentifiedObject resource) {
  this.state = ((Authorization)resource).getState();
  this.status = ((Authorization)resource).getStatus();
  this.subscribable = ((Authorization)resource).subscribable;
- this.subscriptionURI = ((Authorization)resource).getSubscriptionURI();
  this.thirdParty = ((Authorization)resource).getThirdParty();
  this.tokenType = ((Authorization)resource).getTokenType();
  }

diff --git a/src/main/java/org/energyos/espi/common/test/EspiFactory.java b/src/main/java/org/energyos/espi/common/test/EspiFactory.java
@@ -328,7 +328,7 @@ public static Authorization newAuthorization(RetailCustomer retailCustomer, Appl
 
  authorization.setAccessToken("accessToken" + System.currentTimeMillis());
  authorization.setAuthorizationURI("http://DataCustodian" + System.currentTimeMillis() + ".example.com");
- authorization.setSubscriptionURI(Routes.getDataCustodianRESTSubscriptionGetURL(newRandomString()));
+ authorization.setResourceURI(Routes.getDataCustodianRESTSubscriptionGetURL(newRandomString()));
  authorization.setThirdParty("thirdParty" + System.currentTimeMillis());
  authorization.setState("state" + UUID.randomUUID());
  authorization.setRetailCustomer(retailCustomer);

diff --git a/src/test/java/org/energyos/espi/common/domain/AuthorizationTests.java b/src/test/java/org/energyos/espi/common/domain/AuthorizationTests.java
@@ -108,7 +108,7 @@ public void applicationInformation() {
  public void subscriptionId() {
  Authorization authorization = new Authorization();
 
- authorization.setSubscriptionURI("http://localhost:8080/DataCustodian/espi/1_1/resource/Subscription/16228736-8e29-4807-a2a7-283be5cc253e");
+ authorization.setResourceURI("http://localhost:8080/DataCustodian/espi/1_1/resource/Subscription/16228736-8e29-4807-a2a7-283be5cc253e");
 
  assertThat(authorization.getSubscriptionId(), is("16228736-8e29-4807-a2a7-283be5cc253e"));
  }