cleanup dead marking code

Author: Joe Alphonso

warehouse/ingest-core/src/main/java/datawave/ingest/config/RawRecordContainerImpl.java

@@ -101,25 +101,6 @@ public void setSecurityMarkings(Markings<?> securityMarkings) {
         syncSecurityMarkingsToFields();
     }
 
-    @Override
-    public void addSecurityMarking(String domain, String marking) {
-        // Legacy map-based operation — treat marking as an access expression string
-        this.securityMarkings = AccessExpressionMarkings.builder().accessExpression(ACCESS.newExpression(marking)).build();
-        syncSecurityMarkingsToFields();
-    }
-
-    @Override
-    public boolean hasSecurityMarking(String domain, String marking) {
-        if (securityMarkings == null) {
-            return false;
-        }
-        Object m = securityMarkings.getMarkings();
-        if (m instanceof AccessExpression) {
-            return ((AccessExpression) m).getExpression().equals(marking);
-        }
-        return false;
-    }
-
     protected void syncSecurityMarkingsToFields() {
         if (securityMarkings != null) {
             Object m = securityMarkings.getMarkings();

warehouse/ingest-core/src/main/java/datawave/ingest/data/RawRecordContainer.java

@@ -21,10 +21,6 @@ public interface RawRecordContainer {
 
     void setSecurityMarkings(Markings<?> securityMarkings);
 
-    void addSecurityMarking(String domain, String marking);
-
-    boolean hasSecurityMarking(String domain, String marking);
-
     UID getId();
 
     void setId(UID id);

warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/tokenize/ExtendedContentIngestHelper.java

@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.log4j.Logger;
 
@@ -170,89 +169,6 @@ public void addMetadataFromId(RawRecordContainer event, String id) {
         }
     }
 
-    public void inheritFromRootPayload(RawRecordContainer event, Map<String,Collection<Object>> metadata) {
-        // TODO: No-op here, but need to refactor the following in upstream
-        // if (metadata == null)
-        // return;
-        //
-        // IBaseDataObject payload = (IBaseDataObject) event.getAuxData();
-        // if (payload != null) {
-        // for (String field : helper.getInheritedPayloadFields()) {
-        // if (metadata.containsKey(field) && (!payload.hasParameter(field))) {
-        // payload.putParameter(field, metadata.get(field));
-        // }
-        // }
-        // }
-    }
-
-    public void addMetadataFromParms(RawRecordContainer event, Map<String,Collection<Object>> metadata, String id) {
-
-        for (Map.Entry<String,Collection<Object>> entry : metadata.entrySet()) {
-            CharSequence key = entry.getKey();
-            for (Object value : entry.getValue()) {
-                if (value == null)
-                    continue;
-
-                if (helper.getUuids().contains(key)) {
-                    event.getAltIds().add(String.valueOf(value));
-                }
-                if (this.helper.getSecurityMarkingFieldDomainMap().containsKey(key)) {
-                    addSecurityMetadataFromParms(key, value, event);
-                }
-            }
-        }
-
-        Multimap<String,String> newMetadata = HashMultimap.create();
-        Multimap<String,MetadataIdParser> fieldParsers = helper.getMetadataFieldParsers();
-        for (String field : fieldParsers.keySet()) {
-            if (metadata.containsKey(field) && metadata.get(field) != null) {
-                for (MetadataIdParser parser : fieldParsers.get(field)) {
-                    for (Object v : metadata.get(field)) {
-                        if (v == null)
-                            continue;
-                        try {
-                            parser.addMetadata(event, newMetadata, v.toString());
-                        } catch (Exception e) {
-                            log.error("Unable to apply " + parser + " to " + field, e);
-                            event.addError(RawDataErrorNames.FIELD_EXTRACTION_ERROR);
-                        }
-                    }
-                }
-            }
-        }
-
-        // If the ID is a UUID (i.e., contains no date), try to get
-        // event metadata from the parameters
-        if ((id != null) && (id.length() >= UUID_LENGTH) && id.matches(UUID_PATTERN)) {
-            fieldParsers = helper.getMetadataFieldUuidParsers();
-            for (String field : fieldParsers.keySet()) {
-                if (metadata.containsKey(field) && metadata.get(field) != null) {
-                    for (MetadataIdParser parser : fieldParsers.get(field)) {
-                        for (Object v : metadata.get(field)) {
-                            if (v == null)
-                                continue;
-                            try {
-                                parser.addMetadata(event, newMetadata, v.toString());
-                            } catch (Exception e) {
-                                log.error("Unable to apply " + parser + " to " + field, e);
-                                event.addError(RawDataErrorNames.FIELD_EXTRACTION_ERROR);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    protected void addSecurityMetadataFromParms(CharSequence key, Object value, RawRecordContainer event) {
-        // If fieldName is a security marking field (as configured by EVENT_SECURITY_MARKING_FIELD_NAMES),
-        // then put the marking value into this.securityMarkings, where 'key' maps to the domain for the marking
-        // (as configured by EVENT_SECURITY_MARKING_FIELD_DOMAINS)
-        if (!StringUtils.isEmpty(key.toString()) && !StringUtils.isEmpty(value.toString())) {
-            event.addSecurityMarking(this.helper.getSecurityMarkingFieldDomainMap().get(key.toString()), value.toString());
-        }
-    }
-
     /**
      * Override the normalize call to enable event field value normalization
      *

warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/SimpleRawRecord.java

@@ -58,23 +58,6 @@ public void setSecurityMarkings(Markings<?> securityMarkings) {
         this.securityMarkings = securityMarkings;
     }
 
-    @Override
-    public void addSecurityMarking(String domain, String marking) {
-        this.securityMarkings = AccessExpressionMarkings.builder().accessExpression(ACCESS.newExpression(marking)).build();
-    }
-
-    @Override
-    public boolean hasSecurityMarking(String domain, String marking) {
-        if (securityMarkings == null) {
-            return false;
-        }
-        Object m = securityMarkings.getMarkings();
-        if (m instanceof AccessExpression) {
-            return ((AccessExpression) m).getExpression().equals(marking);
-        }
-        return false;
-    }
-
     @Override
     public UID getId() {
         return id;

warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeleteModeTest.java

@@ -131,7 +131,7 @@ public void setup() {
     private RawRecordContainer getEvent(Configuration conf) {
 
         RawRecordContainerImpl myEvent = new RawRecordContainerImpl();
-        myEvent.addSecurityMarking("columnVisibility", "PRIVATE");
+        myEvent.setVisibility("PRIVATE");
         myEvent.setDataType(type);
         myEvent.setId(UID.builder().newId());
         myEvent.setConf(conf);

warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeletePreconditionTest.java

@@ -62,7 +62,7 @@ public void setup() {
     private RawRecordContainer getEvent(Configuration conf) {
 
         RawRecordContainerImpl myEvent = new RawRecordContainerImpl();
-        myEvent.addSecurityMarking("columnVisibility", "PRIVATE");
+        myEvent.setVisibility("PRIVATE");
         myEvent.setDataType(type);
         myEvent.setId(UID.builder().newId());
         myEvent.setConf(conf);

warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDirectionTest.java

@@ -319,7 +319,7 @@ public void testUniDirectionWithJexlCondition() {
 
     private RawRecordContainer getEvent(Type type) {
         RawRecordContainerImpl myEvent = new RawRecordContainerImpl();
-        myEvent.addSecurityMarking("columnVisibility", "PRIVATE");
+        myEvent.setVisibility("PRIVATE");
         myEvent.setDataType(type);
         myEvent.setId(UID.builder().newId());
         myEvent.setAltIds(Collections.singleton("0016dd72-0000-827d-dd4d-001b2163ba09"));

warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgePreconditionTest.java

@@ -72,7 +72,7 @@ public void setup() {
     private RawRecordContainer getEvent(Configuration conf) {
 
         RawRecordContainerImpl myEvent = new RawRecordContainerImpl();
-        myEvent.addSecurityMarking("columnVisibility", "PRIVATE");
+        myEvent.setVisibility("PRIVATE");
         myEvent.setDataType(type);
         myEvent.setId(UID.builder().newId());
         myEvent.setAltIds(Collections.singleton("0016dd72-0000-827d-dd4d-001b2163ba09"));

warehouse/query-core/src/main/java/datawave/webservice/query/result/event/SimpleField.java

@@ -136,10 +136,6 @@ public void setName(String name) {
         this.name = name;
     }
 
-    private void assureMarkings() {
-        // no-op: markings are now Markings<?> and should be set externally
-    }
-
     @Override
     public Markings<?> getMarkings() {
         return this.markings;

web-services/client/src/main/java/datawave/webservice/modification/ModificationRequestBase.java

@@ -72,7 +72,7 @@ public static class DefaultFieldMarkingsAdapter extends XmlAdapter<DefaultFieldM
 
         @Override
         public Map<String,String> unmarshal(DefaultFieldMarking value) throws Exception {
-            HashMap<String,String> fieldMarkings = new HashMap<String,String>();
+            HashMap<String,String> fieldMarkings = new HashMap<>();
             fieldMarkings.put(COLUMN_VISIBILITY, value.fieldColumnVisibility);
             return fieldMarkings;
         }