Merge branch 'og-syanc-ibm-develop' into 'master'

Merging IBM Implementation

See merge request !65

README.md

@@ -21,4 +21,6 @@ The Register Service is a Maven multi-module project with each cloud implementio
 Instructions for running the Google Cloud Platform implementation locally can be found [here](./provider/register-gcp/README.md).
 
 ## Running integration tests
-See Integration-Testing [Readme](./testing/README.md).
\ No newline at end of file
+See Integration-Testing [Readme](./testing/README.md).
+
+# Updated github url test2

provider/register-ibm/pom.xml

@@ -36,7 +36,6 @@
 		<version>0.3.8-SNAPSHOT</version>
 	</dependency>
 
-
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>register-core</artifactId>
@@ -44,7 +43,6 @@
     </dependency>
 
 
-
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/RegisterApplication.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.register.provider.ibm;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/action/datastore/ActionDoc.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.register.provider.ibm.action.datastore;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/action/datastore/ActionRepository.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.register.provider.ibm.action.datastore;

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/ddms/datastore/DatastoreDdmsRepository.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.register.provider.ibm.ddms.datastore;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/ddms/datastore/DatastoreMultiTenantAccess.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.register.provider.ibm.ddms.datastore;

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/ddms/datastore/DdmsDoc.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.register.provider.ibm.ddms.datastore;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/security/IBMSecurityConfig.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.register.provider.ibm.security;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/subscriber/DatastoreAccess.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.register.provider.ibm.subscriber;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/subscriber/IDatastoreAccess.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.register.provider.ibm.subscriber;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/subscriber/PushSubscription.java

+/* Licensed Materials - Property of IBM              */		
+/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/	
 
 package org.opengroup.osdu.register.provider.ibm.subscriber;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/subscriber/SubscriptionDoc.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.register.provider.ibm.subscriber;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/subscriber/SubscriptionRepository.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.register.provider.ibm.subscriber;
 

provider/register-ibm/src/main/java/org/opengroup/osdu/register/provider/ibm/util/GoogleServiceAccountImpl.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.register.provider.ibm.util;
 

testing/register-test-ibm/src/test/java/org/opengroup/osdu/register/action/TestRetrieveActionApi.java

@@ -70,6 +70,4 @@ public class TestRetrieveActionApi extends RetrieveActionApiTest {
 		super.should_return401_when_noAccessOnCustomerTenantEditor();
 	}  
 	
-	
-	
 }

testing/register-test-ibm/src/test/java/org/opengroup/osdu/register/ddms/TestGetRegistrationByIdApi.java

@@ -16,7 +16,6 @@
 
 package org.opengroup.osdu.register.ddms;
 
-
 import static org.junit.Assert.assertEquals;
 
 import org.junit.After;
@@ -25,7 +24,6 @@ import org.opengroup.osdu.register.util.IBMTestUtils;
 
 import com.sun.jersey.api.client.ClientResponse;
 
-
 public class TestGetRegistrationByIdApi extends GetRegistrationByIdApiTest {
 
     @Before

testing/register-test-ibm/src/test/java/org/opengroup/osdu/register/subscriber/TestListTopicsApi.java

@@ -69,6 +69,5 @@ public class TestListTopicsApi extends ListTopicsApiTest {
 		// TODO could add data partition validation as this api impl in core module
 		super.should_return401_when_noAccessOnCustomerTenantEditor();
 	}
-	
-	
+
 }