Skip to content
Snippets Groups Projects
Commit 77355f27 authored by Spencer Sutton's avatar Spencer Sutton
Browse files

RequestScope fix for AWS legal repo factory

commit 1c6097e5 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 15 2021 14:46:06 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger


commit 8e1b36f7 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 15 2021 14:45:31 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit 88c9315c 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 15 2021 13:46:33 GMT-0500 (Central Daylight Time) 

    Disabling sonar


commit 8a69da05 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 15 2021 13:45:51 GMT-0500 (Central Daylight Time) 

    Testing int test failure


commit bb5e4245 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger


commit d8d0fd56 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) 

    Fixing broken unit test


commit 36b1e2f7 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) 

    Adding log warning


commit 3a0c1745 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) 

    Fixing problem where data partitions got stuck across calls


commit 9dbff512 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) 

    Fixing bug with compliance process, partitions weren't handled right


commit b663408a 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) 

    Adding custom class to include data partition
parent a332fae1
No related branches found
No related tags found
1 merge request!163Fixing bug with Legal Job Run Process, some AWS Updates
Pipeline #72346 failed
...@@ -65,9 +65,9 @@ phases: ...@@ -65,9 +65,9 @@ phases:
- printenv - printenv
- echo "Building primary service assemblies..." - echo "Building primary service assemblies..."
- mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} - mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME}
# Suspended until further notice # Suspended until further notice
# - echo "Copying assemblies to dist..." # - echo "Copying assemblies to dist..."
# - cp ./provider/legal-aws/target/*spring-boot.jar ${OUTPUT_DIR}/bin # copy aws jars # - cp ./provider/legal-aws/target/*spring-boot.jar ${OUTPUT_DIR}/bin # copy aws jars
# - cp ./legal-core/target/*.jar ${OUTPUT_DIR}/bin # copy core jar # - cp ./legal-core/target/*.jar ${OUTPUT_DIR}/bin # copy core jar
......
...@@ -10,11 +10,13 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; ...@@ -10,11 +10,13 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository;
import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory; import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.context.annotation.RequestScope;
import javax.inject.Inject; import javax.inject.Inject;
@Service @Service
@Primary @Primary
@RequestScope
public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory { public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory {
......
...@@ -33,6 +33,7 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; ...@@ -33,6 +33,7 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.web.context.annotation.RequestScope;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
...@@ -40,6 +41,7 @@ import java.io.UnsupportedEncodingException; ...@@ -40,6 +41,7 @@ import java.io.UnsupportedEncodingException;
import java.util.*; import java.util.*;
@Repository // why use repository over component over service @Repository // why use repository over component over service
@RequestScope
public class LegalTagRepositoryImpl implements ILegalTagRepository { public class LegalTagRepositoryImpl implements ILegalTagRepository {
@Inject @Inject
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment