Merge pull request #169 from jateeter/master

Delete of Authorizations

Author: jateeter

etc/datacustodianmysql.sql

@@ -365,8 +365,7 @@ CREATE TABLE `authorizations` (
   PRIMARY KEY (`id`),
   KEY `FK_d0761ae9d2dd44c49867ac4ec4b` (`application_information_id`),
   KEY `FK_a4fccef421a14e0ead5c1b9753d` (`retail_customer_id`),
-  KEY `FK_subscriptionkey` (`subscription_id`),
-  CONSTRAINT `FK_d0761ae9d2dd44c49867ac4ec4b` FOREIGN KEY (`application_information_id`) REFERENCES `application_information` (`id`)
+  KEY `FK_subscriptionkey` (`subscription_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -414,8 +413,7 @@ CREATE TABLE `subscriptions` (
   KEY `FK_a68a2938cbc142c3b82f57cb4b1` (`authorization_id`),
   KEY `FK_e38a940ce8ed4d8983d1d5dac6e` (`retail_customer_id`),
   CONSTRAINT `FK_e38a940ce8ed4d8983d1d5dac6e` FOREIGN KEY (`retail_customer_id`) REFERENCES `retail_customers` (`id`),
-  CONSTRAINT `FK_a027c87418ce4d7abbde7ee5eec` FOREIGN KEY (`applicationInformation_id`) REFERENCES `application_information` (`id`),
-  CONSTRAINT `FK_a68a2938cbc142c3b82f57cb4b1` FOREIGN KEY (`authorization_id`) REFERENCES `authorizations` (`id`)
+  CONSTRAINT `FK_a027c87418ce4d7abbde7ee5eec` FOREIGN KEY (`applicationInformation_id`) REFERENCES `application_information` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

etc/thirdpartymysql.sql

@@ -367,8 +367,7 @@ CREATE TABLE `authorizations` (
   KEY `FK_a4fccef421a14e0ead5c1b9753d` (`retail_customer_id`),
   KEY `FK_subscriptionkey` (`subscription_id`),
   CONSTRAINT `FK_a4fccef421a14e0ead5c1b9753d` FOREIGN KEY (`retail_customer_id`) REFERENCES `retail_customers` (`id`),
-  CONSTRAINT `FK_d0761ae9d2dd44c49867ac4ec4b` FOREIGN KEY (`application_information_id`) REFERENCES `application_information` (`id`),
-  CONSTRAINT `FK_subscriptionkey` FOREIGN KEY (`subscription_id`) REFERENCES `subscriptions` (`id`)
+  CONSTRAINT `FK_d0761ae9d2dd44c49867ac4ec4b` FOREIGN KEY (`application_information_id`) REFERENCES `application_information` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -416,8 +415,7 @@ CREATE TABLE `subscriptions` (
   KEY `FK_a68a2938cbc142c3b82f57cb4b1` (`authorization_id`),
   KEY `FK_e38a940ce8ed4d8983d1d5dac6e` (`retail_customer_id`),
   CONSTRAINT `FK_e38a940ce8ed4d8983d1d5dac6e` FOREIGN KEY (`retail_customer_id`) REFERENCES `retail_customers` (`id`),
-  CONSTRAINT `FK_a027c87418ce4d7abbde7ee5eec` FOREIGN KEY (`applicationInformation_id`) REFERENCES `application_information` (`id`),
-  CONSTRAINT `FK_a68a2938cbc142c3b82f57cb4b1` FOREIGN KEY (`authorization_id`) REFERENCES `authorizations` (`id`)
+  CONSTRAINT `FK_a027c87418ce4d7abbde7ee5eec` FOREIGN KEY (`applicationInformation_id`) REFERENCES `application_information` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

src/main/java/org/energyos/espi/common/domain/Authorization.java

@@ -190,7 +190,7 @@ public class Authorization
     @XmlTransient
     protected RetailCustomer retailCustomer;
 
-    @OneToOne (cascade = CascadeType.DETACH) @JoinColumn(name = "subscription_id")
+    @OneToOne (cascade = CascadeType.REMOVE)  @JoinColumn(name = "subscription_id")
     @XmlTransient
     protected Subscription subscription;
 

src/main/java/org/energyos/espi/common/domain/Subscription.java

@@ -96,7 +96,7 @@ public class Subscription
     protected RetailCustomer retailCustomer;
 
     @XmlTransient
-    @OneToOne
+    @OneToOne (cascade = CascadeType.REMOVE)
     private Authorization authorization;
 
     @OneToOne

src/main/java/org/energyos/espi/common/service/impl/AuthorizationServiceImpl.java

@@ -19,8 +19,10 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
+import org.energyos.espi.common.domain.ApplicationInformation;
 import org.energyos.espi.common.domain.Authorization;
 import org.energyos.espi.common.domain.Subscription;
 import org.energyos.espi.common.domain.UsagePoint;
@@ -32,10 +34,22 @@
 import org.energyos.espi.common.service.ResourceService;
 import org.energyos.espi.common.utils.EntryTypeIterator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.token.ClientTokenServices;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.OAuth2RefreshToken;
+import org.springframework.security.oauth2.provider.OAuth2Authentication;
+import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
+import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
+import org.springframework.security.oauth2.provider.token.ResourceServerTokenServices;
 import org.springframework.stereotype.Service;
 
 @Service
 public class AuthorizationServiceImpl implements AuthorizationService {
+	
     @Autowired
     private AuthorizationRepository authorizationRepository;
 
@@ -192,7 +206,7 @@ public void add(Authorization authorization) {
 
 	@Override
 	public void delete(Authorization authorization) {
-	      authorizationRepository.deleteById(authorization.getId());
+	    authorizationRepository.deleteById(authorization.getId());
 	}
 
 	// import-exportResource services
@@ -257,5 +271,5 @@ public void setImportService(ImportService importService) {
    public ImportService getImportService () {
         return this.importService;
    }
-
+   
 }