Skip to content

Commit 89bfc14

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents a53e562 + 8242fab commit 89bfc14

File tree

22 files changed

+76
-415
lines changed

22 files changed

+76
-415
lines changed

docs/_layouts/case-study.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h3>
9393

9494
<div class="case-studies">
9595

96-
<div class="case-studies-list js-flickity" data-flickity-options='{ "wrapAround": true, "autoPlay": 1500 }'>
96+
<div class="case-studies-list">
9797

9898
{% assign case-studies_sorted = site.case-studies | sort: 'priority' %}
9999
{% for study in case-studies_sorted %}
@@ -124,8 +124,6 @@ <h3>
124124

125125
{% include footer.html %}
126126

127-
<script type="text/javascript" src="/js/flickity.js"></script>
128-
129127
</body>
130128

131129
</html>

docs/_layouts/default.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ <h3>Latest from our blog</h3>
196196
Case Studies
197197
</div>
198198

199-
<div class="section__items js-flickity" data-flickity-options='{ "wrapAround": true, "autoPlay": 1500 }'>
199+
<div class="section__items" >
200200
{% assign case-studies_sorted = site.case-studies | sort: 'priority' %}
201201
{% for study in case-studies_sorted %}
202202

@@ -220,8 +220,6 @@ <h3>Latest from our blog</h3>
220220

221221
{% include footer.html %}
222222

223-
<script type="text/javascript" src="/js/flickity.js"></script>
224-
225223
</body>
226224

227225
</html>

docs/css/main.new.css

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -750,72 +750,6 @@ footer .side-by-side > * {
750750
border: none;
751751
}
752752

753-
.flickity-page-dots {
754-
display: none;
755-
}
756-
757-
.js-flickity {
758-
position: relative;
759-
display: block;
760-
margin: auto;
761-
width: 80%;
762-
width: calc(100% - 100px);
763-
margin-top: 40px;
764-
outline: none;
765-
}
766-
767-
.js-flickity::after {
768-
content: '';
769-
position: absolute;
770-
top: 0;
771-
right: 0;
772-
width: 30%;
773-
height: 100%;
774-
background-image: linear-gradient(to right, rgba(255,255,255,0) 0%, transparent 20%, white 100%);
775-
pointer-events: none;
776-
}
777-
778-
.js-flickity::before {
779-
content: '';
780-
position: absolute;
781-
top: 0;
782-
left: 0;
783-
width: 30%;
784-
height: 100%;
785-
background-image: linear-gradient(to left, rgba(255,255,255,0) 0%, transparent 20%, white 100%);
786-
pointer-events: none;
787-
z-index: 1;
788-
}
789-
790-
.flickity-viewport {
791-
overflow: hidden;
792-
}
793-
794-
.flickity-button {
795-
background: transparent;
796-
position: absolute;
797-
width: 50px;
798-
height: 50px;
799-
top: 50%;
800-
border: none;
801-
color: #333;
802-
transform: translateY(-50%);
803-
transition: fill .3s ease 0s;
804-
cursor: pointer;
805-
}
806-
807-
.flickity-button:hover {
808-
fill: #eb1c23;
809-
}
810-
811-
.flickity-button.previous {
812-
left: -50px;
813-
}
814-
815-
.flickity-button.next {
816-
right: -50px;
817-
}
818-
819753
/********************************************************************
820754
*
821755
* WEIRD MESH NODE CSS THING
@@ -900,7 +834,6 @@ footer .side-by-side > * {
900834
}
901835

902836

903-
904837
.page .section {
905838
box-sizing: border-box;
906839
padding: 20px;
@@ -1539,10 +1472,6 @@ ul.case-studies {
15391472
justify-content: center;
15401473
}
15411474

1542-
.case-studies-list.js-flickity {
1543-
display: block;
1544-
}
1545-
15461475
@media only screen and (min-width: 768px) {
15471476
.case-studies-list {
15481477
justify-content: start;

docs/js/flickity.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/learn/documentation/versioned/connectors/kafka.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class PageViewFilterTask implements TaskApplication {
8181
appDesc.addOutputStream(osd);
8282
appDesc.addTable(td);
8383

84-
appDesc.setTaskFactory((StreamTaskFactory) () -> new MyStreamTask());
84+
appDesc.withTaskFactory((StreamTaskFactory) () -> new MyStreamTask());
8585
}
8686
}
8787
{% endhighlight %}

docs/learn/documentation/versioned/core-concepts/core-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.png
1+
---
22
layout: page
33
title: Core concepts
44
---

samza-api/src/main/java/org/apache/samza/application/TaskApplication.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* {@link org.apache.samza.task.AsyncStreamTask} that operates on each
3737
* {@link org.apache.samza.system.IncomingMessageEnvelope} one at a time.
3838
* <li>Setting a {@link org.apache.samza.task.TaskFactory} using
39-
* {@link TaskApplicationDescriptor#setTaskFactory(org.apache.samza.task.TaskFactory)} that creates instances of the
39+
* {@link TaskApplicationDescriptor#withTaskFactory(org.apache.samza.task.TaskFactory)} that creates instances of the
4040
* task above. The {@link org.apache.samza.task.TaskFactory} implementation must be {@link java.io.Serializable}.
4141
* </ol>
4242
* <p>
@@ -50,9 +50,10 @@
5050
* KafkaOutputDescriptor<PageViewEvent>> outputStreamDescriptor =
5151
* trackingSystemDescriptor.getOutputDescriptor("recentPageViewEvent", new JsonSerdeV2<>(PageViewEvent.class)));
5252
*
53-
* appDescriptor.addInputStream(inputStreamDescriptor);
54-
* appDescriptor.addOutputStream(outputStreamDescriptor);
55-
* appDescriptor.setTaskFactory((StreamTaskFactory) () -> new PageViewTask());
53+
* appDescriptor
54+
* .withInputStream(inputStreamDescriptor)
55+
* .withOutputStream(outputStreamDescriptor)
56+
* .withTaskFactory((StreamTaskFactory) () -> new PageViewTask());
5657
* }
5758
* }
5859
*

samza-api/src/main/java/org/apache/samza/application/descriptors/TaskApplicationDescriptor.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* to add the {@link InputDescriptor}s, {@link OutputDescriptor}s and {@link TableDescriptor}s for streams and
3434
* tables to be used in the task implementation.
3535
* <p>
36-
* Use {@link #setTaskFactory} to set the factory for the {@link org.apache.samza.task.StreamTask} or
36+
* Use {@link #withTaskFactory} to set the factory for the {@link org.apache.samza.task.StreamTask} or
3737
* {@link org.apache.samza.task.AsyncStreamTask} implementation that contains the processing logic for
3838
* the {@link org.apache.samza.application.TaskApplication}.
3939
*/
@@ -48,28 +48,32 @@ public interface TaskApplicationDescriptor extends ApplicationDescriptor<TaskApp
4848
* The provided {@code taskFactory} instance must be serializable.
4949
*
5050
* @param factory the {@link TaskFactory} for the Low Level API Task implementation
51+
* @return this {@link TaskApplicationDescriptor}
5152
*/
52-
void setTaskFactory(TaskFactory factory);
53+
TaskApplicationDescriptor withTaskFactory(TaskFactory factory);
5354

5455
/**
5556
* Adds the input stream to the application.
5657
*
5758
* @param isd the {@link InputDescriptor}
59+
* @return this {@link TaskApplicationDescriptor}
5860
*/
59-
void addInputStream(InputDescriptor isd);
61+
TaskApplicationDescriptor withInputStream(InputDescriptor isd);
6062

6163
/**
6264
* Adds the output stream to the application.
6365
*
6466
* @param osd the {@link OutputDescriptor} of the output stream
67+
* @return this {@link TaskApplicationDescriptor}
6568
*/
66-
void addOutputStream(OutputDescriptor osd);
69+
TaskApplicationDescriptor withOutputStream(OutputDescriptor osd);
6770

6871
/**
6972
* Adds the {@link TableDescriptor} used in the application
7073
*
7174
* @param table {@link TableDescriptor}
75+
* @return this {@link TaskApplicationDescriptor}
7276
*/
73-
void addTable(TableDescriptor table);
77+
TaskApplicationDescriptor withTable(TableDescriptor table);
7478

7579
}

samza-api/src/main/java/org/apache/samza/table/TableDescriptorsProvider.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

samza-core/src/main/java/org/apache/samza/application/LegacyTaskApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public LegacyTaskApplication(String taskClassName) {
3333

3434
@Override
3535
public void describe(TaskApplicationDescriptor appDescriptor) {
36-
appDescriptor.setTaskFactory(TaskFactoryUtil.getTaskFactory(taskClassName));
36+
appDescriptor.withTaskFactory(TaskFactoryUtil.getTaskFactory(taskClassName));
3737
}
3838
}

0 commit comments

Comments
 (0)