svn commit: r1848688 - in /uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common: ADuccWork.java IDuccWork.java

2018-12-11 Thread degenaro 
Author: degenaro
Date: Tue Dec 11 14:30:10 2018
New Revision: 1848688

URL: http://svn.apache.org/viewvc?rev=1848688&view=rev
Log:
UIMA-5928 DUCC Agent quiesce should wait (forever) for non-fairshare 
displatchables to complete before shutting down

Provide method interface and implementation to determine preemptability status 
of dispatchable entities.

Modified:

uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java

uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java?rev=1848688&r1=1848687&r2=1848688&view=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
 Tue Dec 11 14:30:10 2018
@@ -18,6 +18,7 @@
 */
 package org.apache.uima.ducc.transport.event.common;
 
+import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
 import 
org.apache.uima.ducc.transport.event.common.IDuccWorkService.ServiceDeploymentType;
@@ -94,6 +95,29 @@ public abstract class ADuccWork implemen
this.duccSchedulingInfo = schedulingInfo;
}
 
+   // Evaluate preemptability of scheduling class for entity: { 1 == yes, 
-1 == no, 0 == dunno }
+   public int getPreemptableStatus() {
+   int retVal = 0;  // dunno
+   try {
+   if(duccSchedulingInfo != null) {
+   String class_name = 
duccSchedulingInfo.getSchedulingClass();
+   if(class_name != null) {
+   DuccSchedulerClasses 
duccSchedulerClasses = DuccSchedulerClasses.getInstance();
+   boolean preemptable = 
duccSchedulerClasses.isPreemptable(class_name);
+   if(preemptable) {
+   retVal = 0+1; // yes
+   }
+   else {
+   retVal = 0-1; // no
+   }
+   }
+   }
+   }
+   catch(Exception e) {
+   // dunno
+   }
+   return retVal;
+   }

public Object getStateObject() {
return stateObject;

Modified: 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java?rev=1848688&r1=1848687&r2=1848688&view=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
 Tue Dec 11 14:30:10 2018
@@ -41,6 +41,9 @@ public interface IDuccWork extends Ident
public IDuccSchedulingInfo getSchedulingInfo();
public void setSchedulingInfo(IDuccSchedulingInfo schedulingInfo);

+   // Evaluate preemptability of scheduling class for entity: { 1 == yes, 
-1 == no, 0 == dunno }
+   public int getPreemptableStatus();
+   
public Object getStateObject();
public void setStateObject(Object state);

svn commit: r1848693 - in /uima/uv3/uimaj-v3/trunk: jVinci/src/main/java/org/apache/vinci/transport/document/ uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/ uimaj-core/s

2018-12-11 Thread schor 
Author: schor
Date: Tue Dec 11 15:45:22 2018
New Revision: 1848693

URL: http://svn.apache.org/viewvc?rev=1848693&view=rev
Log:
[UIMA-5390] auto refactor use StandardCharsets.UTF_8, plus occasional removal 
of unused imports

Modified:

uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java

uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UimaDecompiler.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_implTest.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java

uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java

uima/uv3/uimaj-v3/trunk/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java

uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java

uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java

uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java

Modified: 
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java?rev=1848693&r1=1848692&r2=1848693&view=diff
==
--- 
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
 Tue Dec 11 15:45:22 2018
@@ -32,6 +32,7 @@ import java.io.OutputStreamWriter;
 import java.io.RandomAccessFile;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -205,7 +206,7 @@ public class XMLToXTalk {
 Writer xml_os = null;
 if (xml_filename != null) {
   xml_os = new BufferedWriter(new OutputStreamWriter(new 
FileOutputStream(xml_filename),
-  "UTF-8"));
+  StandardCharsets.UTF_8));
 }
 File file = new File(filename);
 OutputStream os = new BufferedOutputStream(new FileOutputStream(file));

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java?rev=1848693&r1=1848692&r2=1848693&view=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotationWriter.java
 Tue Dec 11 15:45:22 2018
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -103,7 +104,8 @@ public class An

svn commit: r1848694 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java

2018-12-11 Thread schor 
Author: schor
Date: Tue Dec 11 15:47:51 2018
New Revision: 1848694

URL: http://svn.apache.org/viewvc?rev=1848694&view=rev
Log:
[UIMA-5390] StandardCharsets.UTF_8, plus occasional removal of unused imports

Modified:

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java?rev=1848694&r1=1848693&r2=1848694&view=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java
 Tue Dec 11 15:47:51 2018
@@ -29,6 +29,7 @@ import java.nio.charset.CharacterCodingE
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Methods for working with Data during I/O
@@ -37,7 +38,6 @@ public class DataIO {
   
   
   public static final Charset UTF8 = Charset.forName("UTF-8");  // use with 
String is a java 6, not 5, feature
-  public static final String UTF8_FAST = "UTF-8"; // for faster impls
   private static final int SIGNED_INT_VALUE_0x80 = 0x80;
   private static final int MASK_LOW_7 = 0x7f;
   private static final long MASK_LOW_7_LONG = 0x7fL;
@@ -105,7 +105,7 @@ public class DataIO {
   out.write(0);
   return;
 }
-byte[] bb = string.getBytes(UTF8_FAST);
+byte[] bb = string.getBytes(StandardCharsets.UTF_8);
 if (bb.length > (Integer.MAX_VALUE - 1)) {
   throw new RuntimeException(String.format("String UTF-8 representation 
too long, was %,d", bb.length));
 }
@@ -128,7 +128,7 @@ public class DataIO {
 if (null == string) {
   return 1;
 }
-byte[] bb = string.getBytes(UTF8_FAST);
+byte[] bb = string.getBytes(StandardCharsets.UTF_8);
 if (bb.length > (Integer.MAX_VALUE - 1)) {
   throw new RuntimeException(String.format("String UTF-8 representation 
too long, was %,d", bb.length));
 }

svn commit: r1848695 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java

2018-12-11 Thread schor 
Author: schor
Date: Tue Dec 11 15:50:44 2018
New Revision: 1848695

URL: http://svn.apache.org/viewvc?rev=1848695&view=rev
Log:
[UIMA-5390] StandardCharsets.UTF_8, plus use local var 

Modified:

uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1848695&r1=1848694&r2=1848695&view=diff
==
--- 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
 Tue Dec 11 15:50:44 2018
@@ -34,6 +34,7 @@ import java.lang.invoke.MethodType;
 import java.lang.invoke.MutableCallSite;
 import java.net.URL;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
@@ -1661,11 +1662,7 @@ public class CASImpl extends AbstractCas
 
 if (null != sd) {
   ByteArrayInputStream bis;
-  try {
-bis = new ByteArrayInputStream(sd.getBytes("UTF-8"));
-  } catch (UnsupportedEncodingException e) {
-throw new RuntimeException(e);  // never happen 
-  }
+  bis = new ByteArrayInputStream(sd.getBytes(StandardCharsets.UTF_8));
   return bis;
   
 } else if (null != aSofa.getLocalFSData()) {
@@ -1683,11 +1680,7 @@ public class CASImpl extends AbstractCas
   }
   sb.append(theArray[i]);
 }
-try {
-  return new ByteArrayInputStream(sb.toString().getBytes("UTF-8") );
-} catch (UnsupportedEncodingException e) {
-  throw new RuntimeException(e);  // never happen 
-}
+return new 
ByteArrayInputStream(sb.toString().getBytes(StandardCharsets.UTF_8) );
   }
   case intArrayTypeCode: {
 final int[] theArray = ((IntegerArray) fs)._getTheArray();
@@ -1765,7 +1758,7 @@ public class CASImpl extends AbstractCas
 //  System.out.format("debug committing ts %s classLoader %s%n", 
ts.hashCode(), cl);
   if (!ts.isCommitted()) {
 ts.set_skip_loading_user_jcas(skip_loading_user_jcas);
-TypeSystemImpl tsc = ts.commit(getJCasClassLoader());
+TypeSystemImpl tsc = ts.commit(cl);
 if (tsc != ts) {
   installTypeSystemInAllViews(tsc);
   ts = tsc;

svn commit: r1848697 - in /uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common: ADuccWork.java IDuccWork.java

2018-12-11 Thread degenaro 
Author: degenaro
Date: Tue Dec 11 16:47:02 2018
New Revision: 1848697

URL: http://svn.apache.org/viewvc?rev=1848697&view=rev
Log:
UIMA-5928 DUCC Agent quiesce should wait (forever) for non-fairshare 
displatchables to complete before shutting down

Provide method interface and implementation to determine preemptability status 
of dispatchable entities, where returned value is boolean or Exception.

Modified:

uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java

uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java?rev=1848697&r1=1848696&r2=1848697&view=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
 Tue Dec 11 16:47:02 2018
@@ -95,27 +95,11 @@ public abstract class ADuccWork implemen
this.duccSchedulingInfo = schedulingInfo;
}
 
-   // Evaluate preemptability of scheduling class for entity: { 1 == yes, 
-1 == no, 0 == dunno }
-   public int getPreemptableStatus() {
-   int retVal = 0;  // dunno
-   try {
-   if(duccSchedulingInfo != null) {
-   String class_name = 
duccSchedulingInfo.getSchedulingClass();
-   if(class_name != null) {
-   DuccSchedulerClasses 
duccSchedulerClasses = DuccSchedulerClasses.getInstance();
-   boolean preemptable = 
duccSchedulerClasses.isPreemptable(class_name);
-   if(preemptable) {
-   retVal = 0+1; // yes
-   }
-   else {
-   retVal = 0-1; // no
-   }
-   }
-   }
-   }
-   catch(Exception e) {
-   // dunno
-   }
+   // Evaluate preemptability of scheduling class for entity:
+   public boolean getPreemptableStatus() throws Exception {
+   String class_name = duccSchedulingInfo.getSchedulingClass();
+   DuccSchedulerClasses duccSchedulerClasses = 
DuccSchedulerClasses.getInstance();
+   boolean retVal = duccSchedulerClasses.isPreemptable(class_name);
return retVal;
}


Modified: 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java?rev=1848697&r1=1848696&r2=1848697&view=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
 Tue Dec 11 16:47:02 2018
@@ -41,8 +41,8 @@ public interface IDuccWork extends Ident
public IDuccSchedulingInfo getSchedulingInfo();
public void setSchedulingInfo(IDuccSchedulingInfo schedulingInfo);

-   // Evaluate preemptability of scheduling class for entity: { 1 == yes, 
-1 == no, 0 == dunno }
-   public int getPreemptableStatus();
+   // Evaluate preemptability of scheduling class for entity
+   public boolean getPreemptableStatus() throws Exception;

public Object getStateObject();
public void setStateObject(Object state);