diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d51b789d04f859ab8906b094bfb76b825..adcabd34e2a04116cf86443afb0474ab0748fdc5 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -1,55 +1,55 @@
-
-
-
- GitLab-Authenticate-With-Job-Token
-
- true
-
-
- community-maven-via-job-token
-
-
+
+
+
+ GitLab-Authenticate-With-Job-Token
+
+ true
+
+
+ community-maven-via-job-token
+
+
-
-
- GitLab-Authenticate-With-Private-Token
-
-
- env.COMMUNITY_MAVEN_TOKEN
-
-
-
- community-maven-via-private-token
-
-
-
+
+
+ GitLab-Authenticate-With-Private-Token
+
+
+ env.COMMUNITY_MAVEN_TOKEN
+
+
+
+ community-maven-via-private-token
+
+
+
-
-
- community-maven-via-job-token
-
-
-
- Job-Token
- ${env.CI_JOB_TOKEN}
-
-
-
-
+
+
+ community-maven-via-job-token
+
+
+
+ Job-Token
+ ${env.CI_JOB_TOKEN}
+
+
+
+
-
- community-maven-via-private-token
-
-
-
- Private-Token
- ${env.COMMUNITY_MAVEN_TOKEN}
-
-
-
-
-
-
+
+ community-maven-via-private-token
+
+
+
+ Private-Token
+ ${env.COMMUNITY_MAVEN_TOKEN}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/GoogleSchemaInfoStore.java b/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/GoogleSchemaInfoStore.java
index 5683ca6bf21dd3efb39492ab84dd96a60ad4f39d..95064025e61a1f4ae23e2db2ae01e328056cec65 100644
--- a/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/GoogleSchemaInfoStore.java
+++ b/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemainfostore/GoogleSchemaInfoStore.java
@@ -257,6 +257,10 @@ public class GoogleSchemaInfoStore implements ISchemaInfoStore {
@Override
public List getSchemaInfoList(QueryParams queryParams, String tenantId) throws ApplicationException {
+ List schemaList = new LinkedList<>();
+ if (SchemaConstants.ACCOUNT_ID_COMMON_PROJECT.equals(tenantId)) {
+ return schemaList;
+ }
Datastore datastore = dataStoreFactory.getDatastore(tenantId, SchemaConstants.NAMESPACE);
List filterList = getFilters(queryParams);
@@ -269,7 +273,6 @@ public class GoogleSchemaInfoStore implements ISchemaInfoStore {
}
QueryResults result = datastore.run(queryBuilder.build());
- List schemaList = new LinkedList<>();
while (result.hasNext()) {
Entity entity = result.next();
schemaList.add(getSchemaInfoObject(entity, datastore));
diff --git a/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemastore/GoogleSchemaStore.java b/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemastore/GoogleSchemaStore.java
index 073e7493961a6e66553b96b2d16245fdf327332d..7dc586d8d86860c3b8ba6a686bfc29327f429dbb 100644
--- a/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemastore/GoogleSchemaStore.java
+++ b/provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/impl/schemastore/GoogleSchemaStore.java
@@ -9,7 +9,6 @@ import org.opengroup.osdu.schema.exceptions.ApplicationException;
import org.opengroup.osdu.schema.exceptions.NotFoundException;
import org.opengroup.osdu.schema.provider.interfaces.schemastore.ISchemaStore;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import com.google.cloud.storage.Blob;
@@ -50,6 +49,9 @@ public class GoogleSchemaStore implements ISchemaStore {
*/
@Override
public String getSchema(String dataPartitionId, String filePath) throws ApplicationException, NotFoundException {
+ if (SchemaConstants.ACCOUNT_ID_COMMON_PROJECT.equals(dataPartitionId)) {
+ throw new NotFoundException(SchemaConstants.SCHEMA_NOT_PRESENT);
+ }
filePath = filePath + SchemaConstants.JSON_EXTENSION;
String bucketname = getSchemaBucketName(dataPartitionId);
Storage storage = storageFactory.get(tenantFactory.getTenantInfo(dataPartitionId));