fix(mrcm): Move, rename attribute type enum

b2ihealthcare · Nov 29, 2022 · 34d079e · 34d079e
1 parent ba2eb0f
commit 34d079e
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 22 deletions.
diff --git a/...d.core.rest.tests/src/com/b2international/snowowl/snomed/core/request/SnomedMrcmTest.java b/...d.core.rest.tests/src/com/b2international/snowowl/snomed/core/request/SnomedMrcmTest.java
@@ -30,9 +30,9 @@
 import org.junit.Test;
 
 import com.b2international.snowowl.snomed.common.SnomedConstants.Concepts;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMember;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
-import com.b2international.snowowl.snomed.datastore.request.SnomedMrcmTypeRequest.MrcmAttributeType;
 import com.b2international.snowowl.snomed.datastore.request.SnomedRequests;
 import com.b2international.snowowl.test.commons.Services;
 import com.google.common.base.Objects;

diff --git a/...med.core.rest/src/com/b2international/snowowl/snomed/core/rest/SnomedMrcmRestService.java b/...med.core.rest/src/com/b2international/snowowl/snomed/core/rest/SnomedMrcmRestService.java
@@ -22,8 +22,8 @@
 
 import com.b2international.snowowl.core.events.util.Promise;
 import com.b2international.snowowl.core.rest.AbstractRestService;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
-import com.b2international.snowowl.snomed.datastore.request.SnomedMrcmTypeRequest.MrcmAttributeType;
 import com.b2international.snowowl.snomed.datastore.request.SnomedRequests;
 
 import io.swagger.v3.oas.annotations.Operation;

diff --git a/...owowl.snomed.datastore/src/com/b2international/snowowl/snomed/core/MrcmAttributeType.java b/...owowl.snomed.datastore/src/com/b2international/snowowl/snomed/core/MrcmAttributeType.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2018-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * 
+ * 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 com.b2international.snowowl.snomed.core;
+
+import static com.google.common.base.Strings.nullToEmpty;
+
+import com.b2international.commons.exceptions.BadRequestException;
+
+/**
+ * @since 8.8.0
+ */
+public enum MrcmAttributeType {
+
+	DATA,
+	OBJECT,
+	ALL;
+
+	public static MrcmAttributeType getByNameIgnoreCase(String name) {
+		for (final MrcmAttributeType type : values()) {
+			if (nullToEmpty(name).equalsIgnoreCase(type.toString())) {
+				return type;
+			}
+		}
+		throw new BadRequestException("Unknown attribute type: '%s'", name);
+	}
+
+}
diff --git a/...tore/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmRangeRequest.java b/...tore/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmRangeRequest.java
@@ -34,9 +34,9 @@
 
 import com.b2international.snowowl.core.domain.BranchContext;
 import com.b2international.snowowl.core.events.Request;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMember;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
-import com.b2international.snowowl.snomed.datastore.request.SnomedMrcmTypeRequest.MrcmAttributeType;
 
 /**
  * @since 8.8.0

diff --git a/...c/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmRangeRequestBuilder.java b/...c/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmRangeRequestBuilder.java
@@ -21,8 +21,8 @@
 import com.b2international.snowowl.core.domain.BranchContext;
 import com.b2international.snowowl.core.events.BaseRequestBuilder;
 import com.b2international.snowowl.core.events.Request;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
-import com.b2international.snowowl.snomed.datastore.request.SnomedMrcmTypeRequest.MrcmAttributeType;
 
 /**
  * @since 8.8.0

diff --git a/...store/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequest.java b/...store/src/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequest.java
@@ -19,19 +19,18 @@
 import static com.b2international.snowowl.snomed.common.SnomedConstants.Concepts.CONCEPT_MODEL_DATA_ATTRIBUTE;
 import static com.b2international.snowowl.snomed.common.SnomedConstants.Concepts.CONCEPT_MODEL_OBJECT_ATTRIBUTE;
 import static com.b2international.snowowl.snomed.datastore.index.entry.SnomedRefSetMemberIndexEntry.Fields.MRCM_RULE_REFSET_ID;
-import static com.google.common.base.Strings.nullToEmpty;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.b2international.commons.exceptions.BadRequestException;
 import com.b2international.commons.options.Options;
 import com.b2international.snowowl.core.domain.BranchContext;
 import com.b2international.snowowl.core.events.Request;
 import com.b2international.snowowl.snomed.common.SnomedRf2Headers;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.SnomedConcept;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedRefSetType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
@@ -43,21 +42,6 @@
 final class SnomedMrcmTypeRequest implements Request<BranchContext, SnomedReferenceSetMembers> {
 
 	private static final long serialVersionUID = 1L;
-
-	public enum MrcmAttributeType {
-		DATA,
-		OBJECT,
-		ALL;
-
-		public static MrcmAttributeType getByNameIgnoreCase(String name) {
-			for (final MrcmAttributeType type : values()) {
-				if (nullToEmpty(name).equalsIgnoreCase(type.toString())) {
-					return type;
-				}
-			}
-			throw new BadRequestException("Unknown attribute type: '%s'", name);
-		}
-	}
 
 	private Set<String> selfIds;
 	private Set<String> ruleParentIds; 

diff --git a/...rc/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequestBuilder.java b/...rc/com/b2international/snowowl/snomed/datastore/request/SnomedMrcmTypeRequestBuilder.java
@@ -21,8 +21,8 @@
 import com.b2international.snowowl.core.domain.BranchContext;
 import com.b2international.snowowl.core.events.BaseRequestBuilder;
 import com.b2international.snowowl.core.events.Request;
+import com.b2international.snowowl.snomed.core.MrcmAttributeType;
 import com.b2international.snowowl.snomed.core.domain.refset.SnomedReferenceSetMembers;
-import com.b2international.snowowl.snomed.datastore.request.SnomedMrcmTypeRequest.MrcmAttributeType;
 
 /**
  * @since 8.8.0