issue #679 - rename classes per PR feedback

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Feb 5, 2020 · bc19aa2 · bc19aa2
1 parent ac3e1bd
commit bc19aa2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/...com/ibm/fhir/path/patch/FHIRPatchAdd.java → ...ibm/fhir/path/patch/FHIRPathPatchAdd.java b/...com/ibm/fhir/path/patch/FHIRPatchAdd.java → ...ibm/fhir/path/patch/FHIRPathPatchAdd.java
@@ -14,12 +14,12 @@
 import com.ibm.fhir.path.exception.FHIRPathException;
 import com.ibm.fhir.path.util.FHIRPathUtil;
 
-public class FHIRPatchAdd extends FHIRPathPatchOperation {
+public class FHIRPathPatchAdd extends FHIRPathPatchOperation {
     String fhirPath;
     String name;
     Element value;
 
-    public FHIRPatchAdd(String fhirPath, String name, Element value) {
+    public FHIRPathPatchAdd(String fhirPath, String name, Element value) {
         this.fhirPath = Objects.requireNonNull(fhirPath);
         this.name = Objects.requireNonNull(name);
         this.value = Objects.requireNonNull(value);

diff --git a/.../ibm/fhir/path/patch/FHIRPatchDelete.java → .../fhir/path/patch/FHIRPathPatchDelete.java b/.../ibm/fhir/path/patch/FHIRPatchDelete.java → .../fhir/path/patch/FHIRPathPatchDelete.java
@@ -11,11 +11,11 @@
 import com.ibm.fhir.path.exception.FHIRPathException;
 import com.ibm.fhir.path.util.FHIRPathUtil;
 
-public class FHIRPatchDelete extends FHIRPathPatchOperation {
+public class FHIRPathPatchDelete extends FHIRPathPatchOperation {
     String fhirPath;
     String elementName;
 
-    public FHIRPatchDelete(String fhirPath) {
+    public FHIRPathPatchDelete(String fhirPath) {
         this.fhirPath = fhirPath;
         this.elementName = getElementName(fhirPath);
     }

diff --git a/.../ibm/fhir/path/patch/FHIRPatchInsert.java → .../fhir/path/patch/FHIRPathPatchInsert.java b/.../ibm/fhir/path/patch/FHIRPatchInsert.java → .../fhir/path/patch/FHIRPathPatchInsert.java
@@ -14,13 +14,13 @@
 import com.ibm.fhir.path.exception.FHIRPathException;
 import com.ibm.fhir.path.util.FHIRPathUtil;
 
-public class FHIRPatchInsert extends FHIRPathPatchOperation {
+public class FHIRPathPatchInsert extends FHIRPathPatchOperation {
     String fhirPath;
     Element value;
     int index;
     String elementName;
 
-    public FHIRPatchInsert(String fhirPath, Element value, Integer index) {
+    public FHIRPathPatchInsert(String fhirPath, Element value, Integer index) {
         this.fhirPath = Objects.requireNonNull(fhirPath);
         this.value = Objects.requireNonNull(value);
         this.index = Objects.requireNonNull(index);

diff --git a/...om/ibm/fhir/path/patch/FHIRPatchMove.java → ...bm/fhir/path/patch/FHIRPathPatchMove.java b/...om/ibm/fhir/path/patch/FHIRPatchMove.java → ...bm/fhir/path/patch/FHIRPathPatchMove.java
@@ -13,13 +13,13 @@
 import com.ibm.fhir.path.exception.FHIRPathException;
 import com.ibm.fhir.path.util.FHIRPathUtil;
 
-public class FHIRPatchMove extends FHIRPathPatchOperation {
+public class FHIRPathPatchMove extends FHIRPathPatchOperation {
     String fhirPath;
     int source;
     int destination;
     String elementName;
 
-    public FHIRPatchMove(String fhirPath, Integer source, Integer destination) {
+    public FHIRPathPatchMove(String fhirPath, Integer source, Integer destination) {
         this.fhirPath = Objects.requireNonNull(fhirPath);
         this.source = Objects.requireNonNull(source);
         this.destination = Objects.requireNonNull(destination);

diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchOperation.java b/fhir-path/src/main/java/com/ibm/fhir/path/patch/FHIRPathPatchOperation.java
@@ -26,7 +26,7 @@ public abstract class FHIRPathPatchOperation implements FHIRPatch {
      */
     public static FHIRPathPatchOperation parse(Parameter operation) {
         boolean foundType = false, foundPath = false, foundName = false, foundValue = false, foundIndex = false, foundSource = false, foundDestination = false;
-        FHIRPatchType type = null;
+        FHIRPathPatchType type = null;
         String fhirPath = null;
         String name = null;
         Element value = null;
@@ -39,7 +39,7 @@ public static FHIRPathPatchOperation parse(Parameter operation) {
             switch (partName) {
             case TYPE:
                 Code valueCode = validatePartAndGetValue(foundType, part, Code.class);
-                type = FHIRPatchType.from(valueCode.getValue());
+                type = FHIRPathPatchType.from(valueCode.getValue());
                 foundType = true;
                 break;
             case PATH:
@@ -78,11 +78,11 @@ public static FHIRPathPatchOperation parse(Parameter operation) {
         }
         try {
             switch (type) {
-            case ADD:       return new FHIRPatchAdd(fhirPath, name, value);
-            case DELETE:    return new FHIRPatchDelete(fhirPath);
-            case INSERT:    return new FHIRPatchInsert(fhirPath, value, index);
-            case MOVE:      return new FHIRPatchMove(fhirPath, source, destination);
-            case REPLACE:   return new FHIRPatchReplace(fhirPath, value);
+            case ADD:       return new FHIRPathPatchAdd(fhirPath, name, value);
+            case DELETE:    return new FHIRPathPatchDelete(fhirPath);
+            case INSERT:    return new FHIRPathPatchInsert(fhirPath, value, index);
+            case MOVE:      return new FHIRPathPatchMove(fhirPath, source, destination);
+            case REPLACE:   return new FHIRPathPatchReplace(fhirPath, value);
             default:
                 throw new IllegalArgumentException("Invalid FHIRPath patch operation type: " + type.name());
             }

diff --git a/...ibm/fhir/path/patch/FHIRPatchReplace.java → ...fhir/path/patch/FHIRPathPatchReplace.java b/...ibm/fhir/path/patch/FHIRPatchReplace.java → ...fhir/path/patch/FHIRPathPatchReplace.java
@@ -14,12 +14,12 @@
 import com.ibm.fhir.path.exception.FHIRPathException;
 import com.ibm.fhir.path.util.FHIRPathUtil;
 
-public class FHIRPatchReplace extends FHIRPathPatchOperation {
+public class FHIRPathPatchReplace extends FHIRPathPatchOperation {
     String fhirPath;
     Element value;
     String elementName;
 
-    public FHIRPatchReplace(String fhirPath, Element value) {
+    public FHIRPathPatchReplace(String fhirPath, Element value) {
         this.fhirPath = Objects.requireNonNull(fhirPath);
         this.value = Objects.requireNonNull(value);
         this.elementName = getElementName(fhirPath);

diff --git a/...om/ibm/fhir/path/patch/FHIRPatchType.java → ...bm/fhir/path/patch/FHIRPathPatchType.java b/...om/ibm/fhir/path/patch/FHIRPatchType.java → ...bm/fhir/path/patch/FHIRPathPatchType.java
@@ -8,7 +8,7 @@
 /**
  * The list of allowed FHIRPath Patch operation types
  */
-public enum FHIRPatchType {
+public enum FHIRPathPatchType {
     /**
      * The content will be appended to the element identified in the path, using the name specified.
      * Add can used for non-repeating elements as long as they do not already exist.
@@ -39,16 +39,16 @@ public enum FHIRPatchType {
 
     private final String value;
 
-    FHIRPatchType(String value) {
+    FHIRPathPatchType(String value) {
         this.value = value;
     }
 
     public java.lang.String value() {
         return value;
     }
 
-    public static FHIRPatchType from(String value) {
-        for (FHIRPatchType t : FHIRPatchType.values()) {
+    public static FHIRPathPatchType from(String value) {
+        for (FHIRPathPatchType t : FHIRPathPatchType.values()) {
             if (t.value.equals(value)) {
                 return t;
             }