Merge branch 'og-sync-ibm' into 'master'

latest ibm changes

See merge request !68

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmAuthorityStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import java.net.MalformedURLException;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmEntityTypeStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import java.net.MalformedURLException;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmSchemaInfoStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import static com.cloudant.client.api.query.Expression.eq;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmSourceStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import java.net.MalformedURLException;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/util/IbmDocumentStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore.util;
 
 import java.net.MalformedURLException;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/impl/schemastore/IBMSchemaStore.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemastore;
 
 import java.io.ByteArrayInputStream;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/AuthorityDoc.java

-/**
- * 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.schema.provider.ibm;
 

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/EntityTypeDoc.java

-/**
- * 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.schema.provider.ibm;
 

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/SchemaDoc.java

-/**
- * 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.schema.provider.ibm;
 

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/SourceDoc.java

-/**
- * 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.schema.provider.ibm;
 

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/app/SchemaIBMApplication.java

-// 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.schema.provider.ibm.app;
 

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/security/SecurityConfig.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.provider.ibm.security;
 
 import org.springframework.core.Ordered;

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/security/WhoamiController.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.provider.ibm.security;
 /**
- * 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.

provider/schema-ibm/src/test/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmAuthorityStoreTest.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import static org.junit.Assert.assertEquals;

provider/schema-ibm/src/test/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmEntityTypeStoreTest.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 //import static org.junit.Assert.assertEquals;

provider/schema-ibm/src/test/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmSchemaInfoStoreTest.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import static org.junit.Assert.assertEquals;

provider/schema-ibm/src/test/java/org/opengroup/osdu/schema/impl/schemainfostore/IbmSourceStoreTest.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemainfostore;
 
 import static org.junit.Assert.assertEquals;

provider/schema-ibm/src/test/java/org/opengroup/osdu/schema/impl/schemastore/IBMSchemaStoreTest.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/
+
 package org.opengroup.osdu.schema.impl.schemastore;