diff --git a/indexer-service-azure/pom.xml b/indexer-service-azure/pom.xml index 081411d78933e6bbd7d19937e9afc130cd63b8af..d7f8bf9bcf8227ac6927a9fe2a24da721aab2bcc 100644 --- a/indexer-service-azure/pom.xml +++ b/indexer-service-azure/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java index fc2d97c8aa23c7f7a4ce76ffd07071607e785c0c..487568dec3f716ae3e765252a63a14ec8b54875c 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure; import org.springframework.boot.SpringApplication; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/ServletInitializer.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/ServletInitializer.java index dc1363976b35cde4a2a108ac52abf746260d1437..0a6086fb6dcccd82d097e69489435d8a474d9f36 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/ServletInitializer.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/ServletInitializer.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java index 26d305a05f9956d9c5149936ab6d305e7c00d1ef..d2da8fe74082cf147c51403a10cfa9992b5f2c55 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.api; import org.opengroup.osdu.indexer.azure.util.ServiceAccountJwtClientImpl; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java index eed776bf5c6bdb985d5b377563dcda6f1b4499dc..e50e5c89a467866c8fd5d03c7831ff9c68c3864c 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java @@ -1,4 +1,4 @@ -// Copyright 2017-2019, Schlumberger +// 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. diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java index 6a25147f93d8da6991e84a8506ad5dc649b3c358..0613ab8d8c59bbf3488ce090880881cdcc0ba956 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java @@ -1,16 +1,16 @@ -// Copyright © Microsoft Corporation +// 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 +// 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 +// 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. +// 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. package org.opengroup.osdu.indexer.azure.di; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java index 2b47190f69e03e095acb238a241917c77e3902ce..d3a20cb6f87a760e99f6191dd5d59ffa87fff13b 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.di; import org.opengroup.osdu.core.cache.ICache; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java index bdc42a8adee8193bc36ed7f0de88ec4063e2b0d1..58d3ee84ee3e030cef2c971ae3ad565cfaff3f52 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.di; import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java index e556a0cef062b5a55cb438acb4d9db944d475b88..e439cb487f8b502db7568c2e4704b4afa4cb7c06 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.di; import lombok.extern.java.Log; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/AADConfiguration.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/AADConfiguration.java index 88905fe9dee0c8b8cf456c2183b58f8826cb72d8..3b311a933a2fc0ff7756ec317d5838d4464a29c1 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/AADConfiguration.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/AADConfiguration.java @@ -1,6 +1,19 @@ +// 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. + package org.opengroup.osdu.indexer.azure.model; -import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/ElasticSettingSchema.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/ElasticSettingSchema.java index 90ebe4d78206d207e380f419103722fb7e9d53ee..90d6abf873eb7fe1d075a08737d7c4b6ce0bda6d 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/ElasticSettingSchema.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/model/ElasticSettingSchema.java @@ -1,4 +1,4 @@ -// Copyright 2017-2019, Schlumberger +// 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. @@ -14,13 +14,8 @@ package org.opengroup.osdu.indexer.azure.model; -import java.util.Map; - import javax.validation.constraints.NotEmpty; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java index ff233fc599be63950adfb8316930634ff11bd10d..809a77fd4453e75468d4b62b3f5d40d1d8467bc2 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.persistence; import org.apache.http.HttpStatus; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java index 969c8c172fe0e4aa8ed54ab5df8faa4a100fe94c..f65158815436ab5dc9b555af69cb875a767d0aa6 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.persistence; import org.opengroup.osdu.indexer.azure.model.ElasticSettingSchema; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ISchemaRepository.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ISchemaRepository.java index 08555553ab4459532f8c005d00080bb3abd14c80..92f62ec357ea74deb4b79bdadc37ed6550e2cd21 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ISchemaRepository.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ISchemaRepository.java @@ -1,6 +1,5 @@ - -// Copyright 2017-2019, Schlumberger +// 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. diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java index cb7f497d06b6ec9fec9199e66ba863617b63f003..673ddfcf3b5183429a0a1717617deb85258f84c6 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java @@ -1,4 +1,4 @@ -// Copyright 2017-2019, Schlumberger +// 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. diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java index 489f65c63b94d134fac76fa4d9e196b6cfa6ee31..bcd33fff49c972fe43a43258c9ad197c9e0c3b94 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java @@ -1,4 +1,4 @@ -// Copyright 2017-2019, Schlumberger +// 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. @@ -83,7 +83,7 @@ public class HeadersInfoAzureImpl implements IHeadersInfo { Preconditions.checkNotNull(input, "input headers cannot be null"); DpsHeaders output = DpsHeaders.createFromMap(input); - output.put(INDEXER_QUEUE_KEY,queueKey); + //output.put(INDEXER_QUEUE_KEY,queueKey); return output; } diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java index eb8540d1079f583e66ab4a4de4224a41b7bd7725..972ddaeb17cf1bd98055696d94f0f56817f25860 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.util; import com.google.common.base.Strings; diff --git a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java index 200f9a6fe256b794661f1aeda2adf435de7fbc6a..1630d72603cd7739b19af51afc5df33f2d9986de 100644 --- a/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java +++ b/indexer-service-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java @@ -1,3 +1,17 @@ +// 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. + package org.opengroup.osdu.indexer.azure.util; import com.auth0.jwt.JWT; diff --git a/indexer-service-azure/src/test/java/org/opendes/indexer/azure/persistence/ElasticSettingSchemaRepositoryImplTest.java b/indexer-service-azure/src/test/java/org/opendes/indexer/azure/persistence/ElasticSettingSchemaRepositoryImplTest.java index df746b75c2ae6add6e02a305a88970afa1b1e55c..721a7a4f1d28d0d1c51af4c4435fd0974167245a 100644 --- a/indexer-service-azure/src/test/java/org/opendes/indexer/azure/persistence/ElasticSettingSchemaRepositoryImplTest.java +++ b/indexer-service-azure/src/test/java/org/opendes/indexer/azure/persistence/ElasticSettingSchemaRepositoryImplTest.java @@ -1,3 +1,17 @@ +// 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. + //package org.opendes.indexer.azure.persistence; // //import org.junit.Before;