From 4e2242bb41dda922573046c00c5142745632f95f Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Mon, 14 Sep 2015 15:03:51 -0700 Subject: [SPARK-10576] [BUILD] Move .java files out of src/main/scala Move .java files in `src/main/scala` to `src/main/java` root, except for `package-info.java` (to stay next to package.scala) Author: Sean Owen Closes #8736 from srowen/SPARK-10576. --- .../org/apache/spark/graphx/TripletFields.java | 72 ++++++++++++++++++++++ .../apache/spark/graphx/impl/EdgeActiveness.java | 34 ++++++++++ .../org/apache/spark/graphx/TripletFields.java | 72 ---------------------- .../apache/spark/graphx/impl/EdgeActiveness.java | 34 ---------- 4 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 graphx/src/main/java/org/apache/spark/graphx/TripletFields.java create mode 100644 graphx/src/main/java/org/apache/spark/graphx/impl/EdgeActiveness.java delete mode 100644 graphx/src/main/scala/org/apache/spark/graphx/TripletFields.java delete mode 100644 graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeActiveness.java (limited to 'graphx') diff --git a/graphx/src/main/java/org/apache/spark/graphx/TripletFields.java b/graphx/src/main/java/org/apache/spark/graphx/TripletFields.java new file mode 100644 index 0000000000..7eb4ae0f44 --- /dev/null +++ b/graphx/src/main/java/org/apache/spark/graphx/TripletFields.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.spark.graphx; + +import java.io.Serializable; + +/** + * Represents a subset of the fields of an [[EdgeTriplet]] or [[EdgeContext]]. This allows the + * system to populate only those fields for efficiency. + */ +public class TripletFields implements Serializable { + + /** Indicates whether the source vertex attribute is included. */ + public final boolean useSrc; + + /** Indicates whether the destination vertex attribute is included. */ + public final boolean useDst; + + /** Indicates whether the edge attribute is included. */ + public final boolean useEdge; + + /** Constructs a default TripletFields in which all fields are included. */ + public TripletFields() { + this(true, true, true); + } + + public TripletFields(boolean useSrc, boolean useDst, boolean useEdge) { + this.useSrc = useSrc; + this.useDst = useDst; + this.useEdge = useEdge; + } + + /** + * None of the triplet fields are exposed. + */ + public static final TripletFields None = new TripletFields(false, false, false); + + /** + * Expose only the edge field and not the source or destination field. + */ + public static final TripletFields EdgeOnly = new TripletFields(false, false, true); + + /** + * Expose the source and edge fields but not the destination field. (Same as Src) + */ + public static final TripletFields Src = new TripletFields(true, false, true); + + /** + * Expose the destination and edge fields but not the source field. (Same as Dst) + */ + public static final TripletFields Dst = new TripletFields(false, true, true); + + /** + * Expose all the fields (source, edge, and destination). + */ + public static final TripletFields All = new TripletFields(true, true, true); +} diff --git a/graphx/src/main/java/org/apache/spark/graphx/impl/EdgeActiveness.java b/graphx/src/main/java/org/apache/spark/graphx/impl/EdgeActiveness.java new file mode 100644 index 0000000000..377ae849f0 --- /dev/null +++ b/graphx/src/main/java/org/apache/spark/graphx/impl/EdgeActiveness.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.spark.graphx.impl; + +/** + * Criteria for filtering edges based on activeness. For internal use only. + */ +public enum EdgeActiveness { + /** Neither the source vertex nor the destination vertex need be active. */ + Neither, + /** The source vertex must be active. */ + SrcOnly, + /** The destination vertex must be active. */ + DstOnly, + /** Both vertices must be active. */ + Both, + /** At least one vertex must be active. */ + Either +} diff --git a/graphx/src/main/scala/org/apache/spark/graphx/TripletFields.java b/graphx/src/main/scala/org/apache/spark/graphx/TripletFields.java deleted file mode 100644 index 7eb4ae0f44..0000000000 --- a/graphx/src/main/scala/org/apache/spark/graphx/TripletFields.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.spark.graphx; - -import java.io.Serializable; - -/** - * Represents a subset of the fields of an [[EdgeTriplet]] or [[EdgeContext]]. This allows the - * system to populate only those fields for efficiency. - */ -public class TripletFields implements Serializable { - - /** Indicates whether the source vertex attribute is included. */ - public final boolean useSrc; - - /** Indicates whether the destination vertex attribute is included. */ - public final boolean useDst; - - /** Indicates whether the edge attribute is included. */ - public final boolean useEdge; - - /** Constructs a default TripletFields in which all fields are included. */ - public TripletFields() { - this(true, true, true); - } - - public TripletFields(boolean useSrc, boolean useDst, boolean useEdge) { - this.useSrc = useSrc; - this.useDst = useDst; - this.useEdge = useEdge; - } - - /** - * None of the triplet fields are exposed. - */ - public static final TripletFields None = new TripletFields(false, false, false); - - /** - * Expose only the edge field and not the source or destination field. - */ - public static final TripletFields EdgeOnly = new TripletFields(false, false, true); - - /** - * Expose the source and edge fields but not the destination field. (Same as Src) - */ - public static final TripletFields Src = new TripletFields(true, false, true); - - /** - * Expose the destination and edge fields but not the source field. (Same as Dst) - */ - public static final TripletFields Dst = new TripletFields(false, true, true); - - /** - * Expose all the fields (source, edge, and destination). - */ - public static final TripletFields All = new TripletFields(true, true, true); -} diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeActiveness.java b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeActiveness.java deleted file mode 100644 index 377ae849f0..0000000000 --- a/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeActiveness.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.spark.graphx.impl; - -/** - * Criteria for filtering edges based on activeness. For internal use only. - */ -public enum EdgeActiveness { - /** Neither the source vertex nor the destination vertex need be active. */ - Neither, - /** The source vertex must be active. */ - SrcOnly, - /** The destination vertex must be active. */ - DstOnly, - /** Both vertices must be active. */ - Both, - /** At least one vertex must be active. */ - Either -} -- cgit v1.2.3