Remove shadow jar

Author: Joffry Ferrater

Diff for: abac-pep-spring-security/build.gradle

@@ -0,0 +1,39 @@
+buildscript {
+    ext {
+        springBootVersion = '2.0.2.RELEASE'
+    }
+    repositories {
+        mavenCentral()
+    }
+}
+
+plugins {
+    id 'java'
+    id 'maven'
+    id 'maven-publish'
+}
+
+apply plugin: 'eclipse'
+
+dependencies {
+    compile project(":xacml-resource-models")
+
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion
+
+    compileOnly group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: springBootVersion
+
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
+}
+
+compileJava.dependsOn(processResources)
+
+publishing {
+    publications {
+        jar(MavenPublication) {
+            from components.java
+        }
+    }
+}

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/PepApplication.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/PepApplication.java

@@ -1,18 +1,15 @@
 package com.github.joffryferrater.pep;
 
+import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.pep.configuration.PdpConfiguration;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
-@SpringBootApplication
+@Configuration
 public class PepApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(PepApplication.class, args);
-    }
-
     @Bean
     public RestTemplate restTemplate() {
         return new RestTemplate();
@@ -22,5 +19,10 @@ public RestTemplate restTemplate() {
     public PdpConfiguration pdpConfiguration() {
         return new PdpConfiguration();
     }
+
+    @Bean
+    public PdpClient pdpClient(RestTemplateBuilder restTemplateBuilder) {
+        return new PdpClient(restTemplateBuilder, pdpConfiguration());
+    }
 }
 

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/client/PdpClient.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/client/PdpClient.java

@@ -2,9 +2,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.joffryferrater.pep.PepApplication;
 import com.github.joffryferrater.pep.TestBase;
 import com.github.joffryferrater.request.AccessSubjectCategory;
 import com.github.joffryferrater.request.Attribute;
@@ -20,9 +20,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
+@ContextConfiguration(classes = PepApplication.class, initializers  = ConfigFileApplicationContextInitializer.class)
 public class PdpClientTest extends TestBase {
 
     @Autowired
@@ -34,11 +37,6 @@ public void setUp() throws JsonProcessingException {
         setExpectedPdpResponse(result);
     }
 
-    @Test
-    public void contextLoad() {
-        assertThat(target, is(notNullValue()));
-    }
-
     @Test
     public void shouldReturnPdpResponse() throws IOException {
         Request request = new Request();

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/common/JsonUtility.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/common/JsonUtility.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertThat;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.joffryferrater.pep.PepApplication;
 import com.github.joffryferrater.pep.TestBase;
 import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.request.AccessSubjectCategory;
@@ -19,9 +20,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
+@ContextConfiguration(classes = PepApplication.class, initializers  = ConfigFileApplicationContextInitializer.class)
 public class AbacMethodSecurityExpressionRootTest extends TestBase {
 
     private AbacMethodSecurityExpressionRoot target;

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/configuration/PdpConfiguration.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/configuration/PdpConfiguration.java

@@ -4,6 +4,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import com.github.joffryferrater.pep.PepApplication;
 import com.github.joffryferrater.pep.TestBase;
 import com.github.joffryferrater.pep.client.PdpClient;
 import com.github.joffryferrater.response.Response;
@@ -15,10 +16,13 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
 import org.springframework.security.web.FilterInvocation;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
+@ContextConfiguration(classes = PepApplication.class, initializers  = ConfigFileApplicationContextInitializer.class)
 public class AbacWebSecurityExpressionRootTest extends TestBase {
 
     private AbacWebSecurityExpressionRoot target;

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRoot.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRoot.java

@@ -1,25 +1,13 @@
-buildscript {
-    repositories {
-        jcenter()
-        mavenLocal()
-    }
-
-    dependencies {
-        classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.+')
-    }
-}
-
-defaultTasks "clean", ":security-expression-root:shadowJar"
+defaultTasks "clean", ":abac-pep-spring-security:build"
 
 allprojects {
     apply plugin: 'java'
-    apply plugin: 'com.jfrog.artifactory'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
     group = 'com.github.joffryferrater'
-	version = '0.0.1-SNAPSHOT'
+	version = '0.3.1'
 
 	repositories {
         mavenLocal()

Diff for: security-expression-root/src/main/java/com/github/joffryferrater/pep/security/AbacWebSecurityExpressionRoot.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/security/AbacWebSecurityExpressionRoot.java

@@ -1,4 +1,4 @@
-rootProject.name = 'xacml-pep-spring-security'
+rootProject.name = 'abac-spring-security'
 include 'xacml-resource-models'
-include 'security-expression-root'
+include 'abac-pep-spring-security'
 

Diff for: security-expression-root/src/main/resources/application.properties renamed to abac-pep-spring-security/src/main/resources/application.properties

@@ -1,7 +1,20 @@
+plugins {
+    id 'java'
+    id 'maven'
+    id 'maven-publish'
+}
 
 dependencies {
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.0'
     compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
+
+publishing {
+    publications {
+        jar(MavenPublication) {
+            from components.java
+        }
+    }
+}