diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 9844c3e168d8d128d14d499f8a00b60962e3cb38..b05cd10983d56ffbdfa848655122e481628378c8 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -13,7 +13,7 @@ <artifactId>legal-ibm</artifactId> <packaging>jar</packaging> <properties> - <os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.3.23-SNAPSHOT</os-core-lib-ibm.version> </properties> <dependencies> diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/LegalApplication.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/LegalApplication.java index 65edb1f9983c3bdf07520987c29b6935591f337d..d8d1afa1f0aff4e7688aeb2158f4e9ace4a427d7 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/LegalApplication.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/LegalApplication.java @@ -1,17 +1,5 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java index 491f4a624c595025fef55c634ced908e21a881a7..9fea3299cd269759999d1b34a24d5fc865b5f368 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java @@ -1,17 +1,6 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.legal.ibm.countries; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderImpl.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderImpl.java index e85b1cee8a99fad1fcc15e4fa29ca674ec231209..d35a1808351f092bc500f899ce52ef7e4b6158ec 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderImpl.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderImpl.java @@ -1,17 +1,5 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm.countries; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DpsLogFactory.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DpsLogFactory.java index 8123e25d8e118afbd3cab03de17fb9bfd98cffea..1abf8a7e1761bfffba978ee43886a4a3aa3aa24d 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DpsLogFactory.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DpsLogFactory.java @@ -1,17 +1,6 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.legal.ibm.di; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java index b870247b475d4cffb2fc9a256a51644a1762df65..a84c67a63ae15a8a87d4def860eec652b3549022 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java @@ -1,16 +1,5 @@ -// Copyright 2020 IBM Corp. All Rights Reserved -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm.jobs; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java index 8fcf9df53a2cd796b4a0707390d2fae1737c6dde..0c34f00ce378c3eab535d608fe9eea8e8b870abf 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java @@ -1,3 +1,7 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + + package org.opengroup.osdu.legal.ibm.security; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -13,7 +17,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { http .csrf().disable() .authorizeRequests() - .antMatchers("/v2/api-docs", + .antMatchers("/_ah/liveness_check","/_ah/readiness_check", + "/v2/api-docs", "/configuration/ui", "/swagger-resources/**", "/configuration/security", diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/WhoamiController.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/WhoamiController.java index a76c8ace7c8302c8e38ea577ac644258b5bbfcc1..934dfecac8d6c52b38768209311939bef23d6170 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/WhoamiController.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/WhoamiController.java @@ -1,3 +1,6 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.legal.ibm.security; import org.springframework.security.core.Authentication; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantBackedLegalTag.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantBackedLegalTag.java index cadec423dcae8bce0759305529a4af5731a179f3..ba96f018389dab04eef98fd422547c4d0e39a2f7 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantBackedLegalTag.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantBackedLegalTag.java @@ -1,3 +1,6 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.legal.ibm.tags; import java.lang.reflect.Type; import java.sql.Date; diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java index b8761bd39e3dea292d31453f82a7509c19dd8116..eda4c62f25ba3e7caf9e2efb33535cf0a806134a 100644 --- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java +++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java @@ -1,17 +1,5 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm.tags; diff --git a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsFactoryByoc.java b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsFactoryByoc.java index 79936ac56b2139053c69e7db09367cce8d06dfbf..5667ec43e4ee03a8a86322f655b0aff7bb630068 100644 --- a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsFactoryByoc.java +++ b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsFactoryByoc.java @@ -1,16 +1,5 @@ -// Copyright © Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm.api; diff --git a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsServiceByoc.java b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsServiceByoc.java index 10566a30f529b5e81d498af95b539dff00e7c980..4f648accad4c84f97d377fe80a17a3ce57cf9f2e 100644 --- a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsServiceByoc.java +++ b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/EntitlementsServiceByoc.java @@ -1,16 +1,6 @@ -// Copyright © Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.legal.ibm.api; diff --git a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/LegalTagApiTest.java b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/LegalTagApiTest.java index c65d6b8a20ccf997576ad352d63fb8f9451bd4db..1d36af767d2515d0eeb8f6800272106a42a65528 100644 --- a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/LegalTagApiTest.java +++ b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/api/LegalTagApiTest.java @@ -1,3 +1,7 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + + package org.opengroup.osdu.legal.ibm.api; import static org.mockito.Mockito.when; diff --git a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/tags/LegalTagTests.java b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/tags/LegalTagTests.java index 1b3c296690b4e100e1791df774c9d3c23760d553..b54d0fa9d05b402c31f79af4454510fd41dcf8b6 100644 --- a/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/tags/LegalTagTests.java +++ b/provider/legal-ibm/src/test/java/org/opengroup/osdu/legal/ibm/tags/LegalTagTests.java @@ -1,17 +1,5 @@ -// (C) Copyright IBM Corporation 2019 -// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ package org.opengroup.osdu.legal.ibm.tags;